Commit 2e8010bb authored Apr 10, 2019 by Suzuki K Poulose Committed by Marc Zyngier Apr 25, 2019

kvm: arm: Skip stage2 huge mappings for unaligned ipa backed by THP



With commit a80868f3, we no longer ensure that the
THP page is properly aligned in the guest IPA. Skip the stage2
huge mapping for unaligned IPA backed by transparent hugepages.

Fixes: a80868f3 ("KVM: arm/arm64: Enforce PTE mappings at stage2 when needed")
Reported-by: Eric Auger <eric.auger@redhat.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Chirstoffer Dall <christoffer.dall@arm.com>
Cc: Zenghui Yu <yuzenghui@huawei.com>
Cc: Zheng Xiang <zhengxiang9@huawei.com>
Cc: Andrew Murray <andrew.murray@arm.com>
Cc: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

parent 811328fc

virt/kvm/arm/mmu.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -1781,8 +1781,12 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
		* Only PMD_SIZE transparent hugepages(THP) are
		* currently supported. This code will need to be
		* updated to support other THP sizes.
		*
		* Make sure the host VA and the guest IPA are sufficiently
		* aligned and that the block is contained within the memslot.
		*/
		if (transparent_hugepage_adjust(&pfn, &fault_ipa))
		if (fault_supports_stage2_huge_mapping(memslot, hva, PMD_SIZE) &&
		transparent_hugepage_adjust(&pfn, &fault_ipa))
		vma_pagesize = PMD_SIZE;
		}

Admin message