[PATCH 4.9 55/56] KVM: arm/arm64: Fix check for hugepage size when allocating at Stage 2

[Greg Kroah-Hartman]

4.9-stable review patch.  If anyone has any objections, please let me know.

--

From: Punit Agrawal 

Commit 45ee9d5e97a4 ("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: 45ee9d5e97a4 ("KVM: arm/arm64: Check pagesize when allocating a hugepage 
at Stage 2")
Reported-by: Ioana Ciornei 
Signed-off-by: Punit Agrawal 
Cc: Marc Zyngier 
Cc: Christoffer Dall 
Signed-off-by: Greg Kroah-Hartman 
---
 arch/arm/kvm/mmu.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/arm/kvm/mmu.c
+++ b/arch/arm/kvm/mmu.c
@@ -1284,7 +1284,7 @@ static int user_mem_abort(struct kvm_vcp
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 {

[PATCH 4.9 55/56] KVM: arm/arm64: Fix check for hugepage size when allocating at Stage 2

[Greg Kroah-Hartman]

4.9-stable review patch.  If anyone has any objections, please let me know.

--

From: Punit Agrawal 

Commit 45ee9d5e97a4 ("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: 45ee9d5e97a4 ("KVM: arm/arm64: Check pagesize when allocating a hugepage 
at Stage 2")
Reported-by: Ioana Ciornei 
Signed-off-by: Punit Agrawal 
Cc: Marc Zyngier 
Cc: Christoffer Dall 
Signed-off-by: Greg Kroah-Hartman 
---
 arch/arm/kvm/mmu.c |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/arm/kvm/mmu.c
+++ b/arch/arm/kvm/mmu.c
@@ -1284,7 +1284,7 @@ static int user_mem_abort(struct kvm_vcp
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 {