Hi James,
On Wed, 14 May 2025 at 23:26, James Houghton <jthoughton@xxxxxxxxxx> wrote:
>
> On Tue, May 13, 2025 at 9:35 AM Fuad Tabba <tabba@xxxxxxxxxx> wrote:
> >
> > Add arm64 support for handling guest page faults on guest_memfd
> > backed memslots.
> >
> > For now, the fault granule is restricted to PAGE_SIZE.
> >
> > Signed-off-by: Fuad Tabba <tabba@xxxxxxxxxx>
> > ---
> > arch/arm64/kvm/mmu.c | 94 +++++++++++++++++++++++++---------------
> > include/linux/kvm_host.h | 5 +++
> > virt/kvm/kvm_main.c | 5 ---
> > 3 files changed, 64 insertions(+), 40 deletions(-)
> >
> > diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c
> > index d756c2b5913f..9a48ef08491d 100644
> > --- a/arch/arm64/kvm/mmu.c
> > +++ b/arch/arm64/kvm/mmu.c
> > @@ -1466,6 +1466,30 @@ static bool kvm_vma_mte_allowed(struct vm_area_struct *vma)
> > return vma->vm_flags & VM_MTE_ALLOWED;
> > }
> >
> > +static kvm_pfn_t faultin_pfn(struct kvm *kvm, struct kvm_memory_slot *slot,
> > + gfn_t gfn, bool write_fault, bool *writable,
> > + struct page **page, bool is_gmem)
> > +{
> > + kvm_pfn_t pfn;
> > + int ret;
> > +
> > + if (!is_gmem)
> > + return __kvm_faultin_pfn(slot, gfn, write_fault ? FOLL_WRITE : 0, writable, page);
> > +
> > + *writable = false;
> > +
> > + ret = kvm_gmem_get_pfn(kvm, slot, gfn, &pfn, page, NULL);
> > + if (!ret) {
> > + *writable = !memslot_is_readonly(slot);
> > + return pfn;
> > + }
> > +
> > + if (ret == -EHWPOISON)
> > + return KVM_PFN_ERR_HWPOISON;
> > +
> > + return KVM_PFN_ERR_NOSLOT_MASK;
>
> I don't think the above handling for the `ret != 0` case is correct. I think
> we should just be returning `ret` out to userspace.
Ack.
>
> The diff I have below is closer to what I think we must do.
>
> > +}
> > +
> > static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
> > struct kvm_s2_trans *nested,
> > struct kvm_memory_slot *memslot, unsigned long hva,
> > @@ -1473,19 +1497,20 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
> > {
> > int ret = 0;
> > bool write_fault, writable;
> > - bool exec_fault, mte_allowed;
> > + bool exec_fault, mte_allowed = false;
> > bool device = false, vfio_allow_any_uc = false;
> > unsigned long mmu_seq;
> > phys_addr_t ipa = fault_ipa;
> > struct kvm *kvm = vcpu->kvm;
> > - struct vm_area_struct *vma;
> > - short page_shift;
> > + struct vm_area_struct *vma = NULL;
> > + short page_shift = PAGE_SHIFT;
> > void *memcache;
> > - gfn_t gfn;
> > + gfn_t gfn = ipa >> PAGE_SHIFT;
> > kvm_pfn_t pfn;
> > bool logging_active = memslot_is_logging(memslot);
> > - bool force_pte = logging_active || is_protected_kvm_enabled();
> > - long page_size, fault_granule;
> > + bool is_gmem = kvm_slot_has_gmem(memslot);
> > + bool force_pte = logging_active || is_gmem || is_protected_kvm_enabled();
> > + long page_size, fault_granule = PAGE_SIZE;
> > enum kvm_pgtable_prot prot = KVM_PGTABLE_PROT_R;
> > struct kvm_pgtable *pgt;
> > struct page *page;
> > @@ -1529,17 +1554,20 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
> > * Let's check if we will get back a huge page backed by hugetlbfs, or
> > * get block mapping for device MMIO region.
> > */
> > - mmap_read_lock(current->mm);
> > - vma = vma_lookup(current->mm, hva);
> > - if (unlikely(!vma)) {
> > - kvm_err("Failed to find VMA for hva 0x%lx\n", hva);
> > - mmap_read_unlock(current->mm);
> > - return -EFAULT;
> > + if (!is_gmem) {
> > + mmap_read_lock(current->mm);
> > + vma = vma_lookup(current->mm, hva);
> > + if (unlikely(!vma)) {
> > + kvm_err("Failed to find VMA for hva 0x%lx\n", hva);
> > + mmap_read_unlock(current->mm);
> > + return -EFAULT;
> > + }
> > +
> > + vfio_allow_any_uc = vma->vm_flags & VM_ALLOW_ANY_UNCACHED;
> > + mte_allowed = kvm_vma_mte_allowed(vma);
> > }
> >
> > - if (force_pte)
> > - page_shift = PAGE_SHIFT;
> > - else
> > + if (!force_pte)
> > page_shift = get_vma_page_shift(vma, hva);
> >
> > switch (page_shift) {
> > @@ -1605,27 +1633,23 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
> > ipa &= ~(page_size - 1);
> > }
> >
> > - gfn = ipa >> PAGE_SHIFT;
> > - mte_allowed = kvm_vma_mte_allowed(vma);
> > -
> > - vfio_allow_any_uc = vma->vm_flags & VM_ALLOW_ANY_UNCACHED;
> > -
> > - /* Don't use the VMA after the unlock -- it may have vanished */
> > - vma = NULL;
> > + if (!is_gmem) {
> > + /* Don't use the VMA after the unlock -- it may have vanished */
> > + vma = NULL;
>
> I think we can just move the vma declaration inside the earlier `if (is_gmem)`
> bit above. It should be really hard to accidentally attempt to use `vma` or
> `hva` in the is_gmem case. `vma` we can easily make it impossible; `hva` is
> harder.
To be honest, I think we need to refactor user_mem_abort(). It's
already a bit messy, and with the guest_memfd code, and in the
(hopefully) soon, pkvm code, it's going to get messier. Some of the
things things to keep in mind are, like you suggest, ensuring that vma
and hva aren't in scope where they're not needed.
>
> See below for what I think this should look like.
>
> >
> > - /*
> > - * Read mmu_invalidate_seq so that KVM can detect if the results of
> > - * vma_lookup() or __kvm_faultin_pfn() become stale prior to
> > - * acquiring kvm->mmu_lock.
> > - *
> > - * Rely on mmap_read_unlock() for an implicit smp_rmb(), which pairs
> > - * with the smp_wmb() in kvm_mmu_invalidate_end().
> > - */
> > - mmu_seq = vcpu->kvm->mmu_invalidate_seq;
> > - mmap_read_unlock(current->mm);
> > + /*
> > + * Read mmu_invalidate_seq so that KVM can detect if the results
> > + * of vma_lookup() or faultin_pfn() become stale prior to
> > + * acquiring kvm->mmu_lock.
> > + *
> > + * Rely on mmap_read_unlock() for an implicit smp_rmb(), which
> > + * pairs with the smp_wmb() in kvm_mmu_invalidate_end().
> > + */
> > + mmu_seq = vcpu->kvm->mmu_invalidate_seq;
> > + mmap_read_unlock(current->mm);
> > + }
> >
> > - pfn = __kvm_faultin_pfn(memslot, gfn, write_fault ? FOLL_WRITE : 0,
> > - &writable, &page);
> > + pfn = faultin_pfn(kvm, memslot, gfn, write_fault, &writable, &page, is_gmem);
> > if (pfn == KVM_PFN_ERR_HWPOISON) {
> > kvm_send_hwpoison_signal(hva, page_shift);
>
> `hva` is used here even for the is_gmem case, and that should be slightly
> concerning. And indeed it is, this is not the appropriate way to handle
> hwpoison for gmem (and it is different than the behavior you have for x86). x86
> handles this by returning a KVM_MEMORY_FAULT_EXIT to userspace; we should do
> the same.
You're right. My initial thought was that by having a best-effort
check that that would be enough, and not change the arm64 behavior all
that much. Exiting to userspace is cleaner.
> I've put what I think is more appropriate in the diff below.
>
> And just to be clear, IMO, we *cannot* do what you have written now, especially
> given that we are getting rid of the userspace_addr sanity check (but that
> check was best-effort anyway).
>
> > return 0;
> > @@ -1677,7 +1701,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
> >
> > kvm_fault_lock(kvm);
> > pgt = vcpu->arch.hw_mmu->pgt;
> > - if (mmu_invalidate_retry(kvm, mmu_seq)) {
> > + if (!is_gmem && mmu_invalidate_retry(kvm, mmu_seq)) {
> > ret = -EAGAIN;
> > goto out_unlock;
> > }
> > diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
> > index f9bb025327c3..b317392453a5 100644
> > --- a/include/linux/kvm_host.h
> > +++ b/include/linux/kvm_host.h
> > @@ -1884,6 +1884,11 @@ static inline int memslot_id(struct kvm *kvm, gfn_t gfn)
> > return gfn_to_memslot(kvm, gfn)->id;
> > }
> >
> > +static inline bool memslot_is_readonly(const struct kvm_memory_slot *slot)
> > +{
> > + return slot->flags & KVM_MEM_READONLY;
> > +}
>
> I think if you're going to move this helper to include/linux/kvm_host.h, you
> might want to do so in its own patch and change all of the existing places
> where we check KVM_MEM_READONLY directly. *shrug*
It's a tough job, but someone's gotta do it :)
>
> > +
> > static inline gfn_t
> > hva_to_gfn_memslot(unsigned long hva, struct kvm_memory_slot *slot)
> > {
> > diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
> > index 6289ea1685dd..6261d8638cd2 100644
> > --- a/virt/kvm/kvm_main.c
> > +++ b/virt/kvm/kvm_main.c
> > @@ -2640,11 +2640,6 @@ unsigned long kvm_host_page_size(struct kvm_vcpu *vcpu, gfn_t gfn)
> > return size;
> > }
> >
> > -static bool memslot_is_readonly(const struct kvm_memory_slot *slot)
> > -{
> > - return slot->flags & KVM_MEM_READONLY;
> > -}
> > -
> > static unsigned long __gfn_to_hva_many(const struct kvm_memory_slot *slot, gfn_t gfn,
> > gfn_t *nr_pages, bool write)
> > {
> > --
> > 2.49.0.1045.g170613ef41-goog
> >
>
> Alright, here's the diff I have in mind:
Thank you James.
Cheers,
/fuad
>
> diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c
> index 9a48ef08491db..74eae19792373 100644
> --- a/arch/arm64/kvm/mmu.c
> +++ b/arch/arm64/kvm/mmu.c
> @@ -1466,28 +1466,30 @@ static bool kvm_vma_mte_allowed(struct vm_area_struct *vma)
> return vma->vm_flags & VM_MTE_ALLOWED;
> }
>
> -static kvm_pfn_t faultin_pfn(struct kvm *kvm, struct kvm_memory_slot *slot,
> - gfn_t gfn, bool write_fault, bool *writable,
> - struct page **page, bool is_gmem)
> +static kvm_pfn_t faultin_pfn(struct kvm *kvm, struct kvm_vcpu *vcpu,
> + struct kvm_memory_slot *slot, gfn_t gfn,
> + bool exec_fault, bool write_fault, bool *writable,
> + struct page **page, bool is_gmem, kvm_pfn_t *pfn)
> {
> - kvm_pfn_t pfn;
> int ret;
>
> - if (!is_gmem)
> - return __kvm_faultin_pfn(slot, gfn, write_fault ? FOLL_WRITE : 0, writable, page);
> + if (!is_gmem) {
> + *pfn = __kvm_faultin_pfn(slot, gfn, write_fault ? FOLL_WRITE : 0, writable, page);
> + return 0;
> + }
>
> *writable = false;
>
> - ret = kvm_gmem_get_pfn(kvm, slot, gfn, &pfn, page, NULL);
> - if (!ret) {
> - *writable = !memslot_is_readonly(slot);
> - return pfn;
> + ret = kvm_gmem_get_pfn(kvm, slot, gfn, pfn, page, NULL);
> + if (ret) {
> + kvm_prepare_memory_fault_exit(vcpu, gfn << PAGE_SHIFT,
> + PAGE_SIZE, write_fault,
> + exec_fault, false);
> + return ret;
> }
>
> - if (ret == -EHWPOISON)
> - return KVM_PFN_ERR_HWPOISON;
> -
> - return KVM_PFN_ERR_NOSLOT_MASK;
> + *writable = !memslot_is_readonly(slot);
> + return 0;
> }
>
> static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
> @@ -1502,7 +1504,6 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
> unsigned long mmu_seq;
> phys_addr_t ipa = fault_ipa;
> struct kvm *kvm = vcpu->kvm;
> - struct vm_area_struct *vma = NULL;
> short page_shift = PAGE_SHIFT;
> void *memcache;
> gfn_t gfn = ipa >> PAGE_SHIFT;
> @@ -1555,6 +1556,8 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
> * get block mapping for device MMIO region.
> */
> if (!is_gmem) {
> + struct vm_area_struct *vma = NULL;
> +
> mmap_read_lock(current->mm);
> vma = vma_lookup(current->mm, hva);
> if (unlikely(!vma)) {
> @@ -1565,33 +1568,44 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
>
> vfio_allow_any_uc = vma->vm_flags & VM_ALLOW_ANY_UNCACHED;
> mte_allowed = kvm_vma_mte_allowed(vma);
> - }
>
> - if (!force_pte)
> - page_shift = get_vma_page_shift(vma, hva);
> + if (!force_pte)
> + page_shift = get_vma_page_shift(vma, hva);
> +
> + /*
> + * Read mmu_invalidate_seq so that KVM can detect if the results
> + * of vma_lookup() or faultin_pfn() become stale prior to
> + * acquiring kvm->mmu_lock.
> + *
> + * Rely on mmap_read_unlock() for an implicit smp_rmb(), which
> + * pairs with the smp_wmb() in kvm_mmu_invalidate_end().
> + */
> + mmu_seq = vcpu->kvm->mmu_invalidate_seq;
> + mmap_read_unlock(current->mm);
>
> - switch (page_shift) {
> + switch (page_shift) {
> #ifndef __PAGETABLE_PMD_FOLDED
> - case PUD_SHIFT:
> - if (fault_supports_stage2_huge_mapping(memslot, hva, PUD_SIZE))
> - break;
> - fallthrough;
> + case PUD_SHIFT:
> + if (fault_supports_stage2_huge_mapping(memslot, hva, PUD_SIZE))
> + break;
> + fallthrough;
> #endif
> - case CONT_PMD_SHIFT:
> - page_shift = PMD_SHIFT;
> - fallthrough;
> - case PMD_SHIFT:
> - if (fault_supports_stage2_huge_mapping(memslot, hva, PMD_SIZE))
> + case CONT_PMD_SHIFT:
> + page_shift = PMD_SHIFT;
> + fallthrough;
> + case PMD_SHIFT:
> + if (fault_supports_stage2_huge_mapping(memslot, hva, PMD_SIZE))
> + break;
> + fallthrough;
> + case CONT_PTE_SHIFT:
> + page_shift = PAGE_SHIFT;
> + force_pte = true;
> + fallthrough;
> + case PAGE_SHIFT:
> break;
> - fallthrough;
> - case CONT_PTE_SHIFT:
> - page_shift = PAGE_SHIFT;
> - force_pte = true;
> - fallthrough;
> - case PAGE_SHIFT:
> - break;
> - default:
> - WARN_ONCE(1, "Unknown page_shift %d", page_shift);
> + default:
> + WARN_ONCE(1, "Unknown page_shift %d", page_shift);
> + }
> }
>
> page_size = 1UL << page_shift;
> @@ -1633,24 +1647,16 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
> ipa &= ~(page_size - 1);
> }
>
> - if (!is_gmem) {
> - /* Don't use the VMA after the unlock -- it may have vanished */
> - vma = NULL;
> -
> + ret = faultin_pfn(kvm, vcpu, memslot, gfn, exec_fault, write_fault,
> + &writable, &page, is_gmem, &pfn);
> + if (ret)
> + return ret;
> + if (pfn == KVM_PFN_ERR_HWPOISON) {
> /*
> - * Read mmu_invalidate_seq so that KVM can detect if the results
> - * of vma_lookup() or faultin_pfn() become stale prior to
> - * acquiring kvm->mmu_lock.
> - *
> - * Rely on mmap_read_unlock() for an implicit smp_rmb(), which
> - * pairs with the smp_wmb() in kvm_mmu_invalidate_end().
> + * For gmem, hwpoison should be communicated via a memory fault
> + * exit, not via a SIGBUS.
> */
> - mmu_seq = vcpu->kvm->mmu_invalidate_seq;
> - mmap_read_unlock(current->mm);
> - }
> -
> - pfn = faultin_pfn(kvm, memslot, gfn, write_fault, &writable, &page, is_gmem);
> - if (pfn == KVM_PFN_ERR_HWPOISON) {
> + WARN_ON_ONCE(is_gmem);
> kvm_send_hwpoison_signal(hva, page_shift);
> return 0;
> }
