On Fri, Aug 09, 2024, Anish Moorthy wrote:
> diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c
> index 6981b1bc0946..c97199d1feac 100644
> --- a/arch/arm64/kvm/mmu.c
> +++ b/arch/arm64/kvm/mmu.c
> @@ -1448,6 +1448,8 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
>
> if (fault_is_perm && !write_fault && !exec_fault) {
> kvm_err("Unexpected L2 read permission error\n");
> + kvm_prepare_memory_fault_exit(vcpu, fault_ipa, 0,
In this case, KVM has the fault granule, can't we just use that instead of
reporting '0'?
> + write_fault, exec_fault, false);
> return -EFAULT;
> }
>
> @@ -1473,6 +1475,8 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
> if (unlikely(!vma)) {
> kvm_err("Failed to find VMA for hva 0x%lx\n", hva);
> mmap_read_unlock(current->mm);
> + kvm_prepare_memory_fault_exit(vcpu, fault_ipa, 0,
Why can't KVM use the minimum possible page (granule?) size. It's _always_ legal
for KVM to map at a smaller granularity than the primary MMU, thus it's always
accurate to report KVM's minimum size.
In fact, I would argue that it's inaccurate to report anything larger, because
there's no way for KVM to know if the badness extends to an entire hugepage.
E.g. even in the MTE case below, reporting the vma _page size_ is weird. IIUC,
the problem exists with the entire vma, not some random (huge)page in the vma.
> + write_fault, exec_fault, false);
> return -EFAULT;
> }
>
> @@ -1568,8 +1572,11 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
> kvm_send_hwpoison_signal(hva, vma_shift);
> return 0;
> }
> - if (is_error_noslot_pfn(pfn))
> + if (is_error_noslot_pfn(pfn)) {
> + kvm_prepare_memory_fault_exit(vcpu, fault_ipa, vma_pagesize,
> + write_fault, exec_fault, false);
> return -EFAULT;
Shouldn't this be:
if (KVM_BUG_ON(is_error_noslot_pfn(pfn), vcpu->kvm))
return -EIO;
Emulated MMIO is suppposed to be handled in kvm_handle_guest_abort():
if (kvm_is_error_hva(hva) || (write_fault && !writable)) {o
...
/*
* The IPA is reported as [MAX:12], so we need to
* complement it with the bottom 12 bits from the
* faulting VA. This is always 12 bits, irrespective
* of the page size.
*/
ipa |= kvm_vcpu_get_hfar(vcpu) & GENMASK(11, 0);
ret = io_mem_abort(vcpu, ipa);
goto out_unlock;
}
And the memslot itself is stable, e.g. it can't disappear, and it can't have its
flags toggled. KVM specifically does all modifications to memslots on unreachable
structures so that a memslot cannot change once it has been retrieved from the
memslots tree.
/*
* Mark the current slot INVALID. As with all memslot modifications,
* this must be done on an unreachable slot to avoid modifying the
* current slot in the active tree.
*/
kvm_copy_memslot(invalid_slot, old);
invalid_slot->flags |= KVM_MEMSLOT_INVALID;
kvm_replace_memslot(kvm, old, invalid_slot);
And if KVM were indeed re-retrieving the memslot from kvm->memslots, then the
appropriate behavior would be
if (is_error_noslot_pfn(pfn))
return -EAGAIN;
so that KVM retries the fault. It's perfectly legal to delete a memslot at any
time, with the rather large caveat that if bad things happen to the guest, it's
userspace responsibility to deal with the fallout.
