Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25039c13 authored by Punit Agrawal's avatar Punit Agrawal Committed by Greg Kroah-Hartman
Browse files

KVM: arm/arm64: Fix check for hugepage size when allocating at Stage 2 



Commit 45ee9d5e ("KVM: arm/arm64: Check pagesize when allocating a
hugepage at Stage 2") lost the check for PMD_SIZE during the backport
to 4.9.

Fix this by correcting the condition to detect hugepages during stage
2 allocation.

Fixes: 45ee9d5e ("KVM: arm/arm64: Check pagesize when allocating a hugepage at Stage 2")
Reported-by: default avatarIoana Ciornei <ioana.ciornei@nxp.com>
Signed-off-by: default avatarPunit Agrawal <punit.agrawal@arm.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3eb22217

arch/arm/kvm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -1284,7 +1284,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, 
		return -EFAULT;

	}



	if (vma_kernel_pagesize(vma) && !logging_active) {

	if (vma_kernel_pagesize(vma) == PMD_SIZE && !logging_active) {

		hugetlb = true;

		gfn = (fault_ipa & PMD_MASK) >> PAGE_SHIFT;

	} else {