KVM: arm64: Ensure canonical IPA is hugepage-aligned when handling fault
PATCH 1/1 KVM: arm64: Ensure canonical IPA is hugepage-aligned when handling fault
Zenghui reports that VMs backed by hugetlb pages are no longer booting after commit fd276e71d1e7 ("KVM: arm64: nv: Handle shadow stage 2 page faults").
Support for shadow stage-2 MMUs introduced the concept of a fault IPA and canonical IPA to stage-2 fault handling. These are identical in the non-nested case, as the hardware stage-2 context is always that of the canonical IPA space.
Both addresses need to be hugepage-aligned when preparing to install a hugepage mapping to ensure that KVM uses the correct GFN->PFN translation and installs that at the correct IPA for the current stage-2.
And now I'm feeling thirsty after all this talk of IPAs...
---
Tested w/ non-nested and nested (well, protected mode) VMs backed using hugepages.
arch/arm64/kvm/mmu.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
arch/arm64/kvm/mmu.c +8 -1
@@ -1540,8 +1540,15 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, vma_pagesize =min (vma_pagesize, (long )max_map_size); } -if (vma_pagesize ==PMD_SIZE || vma_pagesize ==PUD_SIZE ) +/* +* Both the canonical IPA and fault IPA must be hugepage-aligned to +* ensure we find the right PFN and lay down the mapping in the right +* place. +*/ +if (vma_pagesize ==PMD_SIZE || vma_pagesize ==PUD_SIZE ) { fault_ipa &= ~(vma_pagesize -1 ); + ipa &= ~(vma_pagesize -1 ); + } gfn = ipa >>PAGE_SHIFT ; mte_allowed =kvm_vma_mte_allowed (vma);
Signature · 1 line
2.46.0.295.g3b9ea8a38a-goog
Quoted 38 lines · Oliver Upton
Zenghui reports that VMs backed by hugetlb pages are no longer booting after commit
fd276e71d1e7("KVM: arm64: nv: Handle shadow stage 2 page faults").Support for shadow stage-2 MMUs introduced the concept of a fault IPA and canonical IPA to stage-2 fault handling. These are identical in the non-nested case, as the hardware stage-2 context is always that of the canonical IPA space.
Both addresses need to be hugepage-aligned when preparing to install a hugepage mapping to ensure that KVM uses the correct
GFN->PFNtranslation and installs that at the correct IPA for the current stage-2.And now I'm feeling thirsty after all this talk of IPAs...
Fixes fd276e71d1e7 ("KVM: arm64: nv: Handle shadow stage 2 page faults")Reported-by Zenghui Yu <[email protected]>Signed-off-by Oliver Upton <[email protected]>---
Tested w/ non-nested and nested (well, protected mode) VMs backed using hugepages.
arch/arm64/kvm/mmu.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)arch/arm64/kvm/mmu.c +2
-1@@ -1540,8 +1540,15 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, vma_pagesize =min (vma_pagesize, (long )max_map_size); } -if (vma_pagesize ==PMD_SIZE || vma_pagesize ==PUD_SIZE ) +/* +* Both the canonical IPA and fault IPA must be hugepage-aligned to
arch/arm64/kvm/mmu.c static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, · line 1554
Quoted 10 lines
arch/arm64/kvm/mmu.c +6
-0+* ensure we find the right PFN and lay down the mapping in the right +* place. +*/ +if (vma_pagesize ==PMD_SIZE || vma_pagesize ==PUD_SIZE ) { fault_ipa &= ~(vma_pagesize -1 ); + ipa &= ~(vma_pagesize -1 ); + } gfn = ipa >>PAGE_SHIFT ; mte_allowed =kvm_vma_mte_allowed (vma);
Rather obvious in retrospect, and I should add some hugetlb-based testing to my setup. Thanks both for spotting and fixing it.
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Oliver Upton
AppliedQuoted 10 lines · Oliver Upton
Zenghui reports that VMs backed by hugetlb pages are no longer booting after commit
fd276e71d1e7("KVM: arm64: nv: Handle shadow stage 2 page faults").Support for shadow stage-2 MMUs introduced the concept of a fault IPA and canonical IPA to stage-2 fault handling. These are identical in the non-nested case, as the hardware stage-2 context is always that of the canonical IPA space.
[...]
Applied to kvmarm/fixes, thanks!
[1/1] KVM: arm64: Ensure canonical IPA is hugepage-aligned when handling fault
https://git.kernel.org/kvmarm/kvmarm/c/1d8c3c23a6bc
--
Best,
Oliver