Skip to contentSkip to conversation

FAILED: patch "[PATCH] KVM: arm/arm64: Check pagesize when allocating a hugepage at" failed to apply to 4.9-stable tree

PATCH [email protected] 2 participants 4 messages Jan 21, 2018 – Jan 24, 2018

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From c507babf10ead4d5c8cca704539b170752a8ac84 Mon Sep 17 00:00:00 2001

From: Punit Agrawal <[email protected]>
Date: Thu, 4 Jan 2018 18:24:33 +0000
Subject: [PATCH] KVM: arm/arm64: Check pagesize when allocating a hugepage at
Stage 2

KVM only supports PMD hugepages at stage 2 but doesn't actually check that the provided hugepage memory pagesize is PMD_SIZE before populating stage 2 entries.

In cases where the backing hugepage size is smaller than PMD_SIZE (such as when using contiguous hugepages), KVM can end up creating stage 2 mappings that extend beyond the supplied memory.

Fix this by checking for the pagesize of userspace vma before creating PMD hugepage at stage 2.

Fixes 66b3923a1a0f77a ("arm64: hugetlb: add support for PTE contiguous bit")
Cc Marc Zyngier <[email protected]>
Cc <[email protected]> # v4.5+
virt/kvm/arm/mmu.c +1 -1
index b4b69c2d1012..9dea96380339 100644
@@ -1310,7 +1310,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
 		return -EFAULT;
 	}
 
-	if (is_vm_hugetlb_page(vma) && !logging_active) {
+	if (vma_kernel_pagesize(vma) == PMD_SIZE && !logging_active) {
 		hugetlb = true;
 		gfn = (fault_ipa & PMD_MASK) >> PAGE_SHIFT;
 	} else {
Reviewed-by Christoffer Dall
#1 lore raw
Quoted 4 lines · <[email protected]> writes:

The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

The fix didn't apply as the file has moved recently. I am including the backport below.

I left the tags from the original commit intact as there's no real change - hope that's ok.

Apologies for the trouble.

Thanks,
Punit

------->8------

Quoted 1 line

From db0a288ba58478461d53a5f98878f59e65a9345f Mon Sep 17 00:00:00 2001

From: Punit Agrawal <[email protected]>
Date: Mon, 22 Jan 2018 11:11:05 +0000
Subject: [PATCH] KVM: arm/arm64: Check pagesize when allocating a hugepage at
Stage 2

Backport of commit c507babf10ead4d5c8cca704539b170752a8ac84 upstream.

KVM only supports PMD hugepages at stage 2 but doesn't actually check that the provided hugepage memory pagesize is PMD_SIZE before populating stage 2 entries.

In cases where the backing hugepage size is smaller than PMD_SIZE (such as when using contiguous hugepages), KVM can end up creating stage 2 mappings that extend beyond the supplied memory.

Fix this by checking for the pagesize of userspace vma before creating PMD hugepage at stage 2.

Fixes 66b3923a1a0f77a ("arm64: hugetlb: add support for PTE contiguous bit")
Cc Marc Zyngier <[email protected]>
---
 arch/arm/kvm/mmu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/kvm/mmu.c +1 -1
index 2206e0e00934..2a35c1963f6d 100644
@@ -1284,7 +1284,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
 		return -EFAULT;
 	}
 
-	if (is_vm_hugetlb_page(vma) && !logging_active) {
+	if (vma_kernel_pagesize(vma) && !logging_active) {
 		hugetlb = true;
 		gfn = (fault_ipa & PMD_MASK) >> PAGE_SHIFT;
 	} else {
Signature · 1 line
2.15.1
Reviewed-by Christoffer Dall
#2 lore raw
In reply to [email protected]
Quoted 4 lines · <[email protected]> writes:

The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

The fix didn't apply as the file has moved recently. I am including the backport below.

I left the tags from the original commit intact as there's no real change - hope that's ok.

Apologies for the trouble.

Thanks,
Punit

------->8------

Quoted 1 line

From db0a288ba58478461d53a5f98878f59e65a9345f Mon Sep 17 00:00:00 2001

From: Punit Agrawal <[email protected]>
Date: Mon, 22 Jan 2018 11:11:05 +0000
Subject: [PATCH] KVM: arm/arm64: Check pagesize when allocating a hugepage at
Stage 2

Backport of commit c507babf10ead4d5c8cca704539b170752a8ac84 upstream.

KVM only supports PMD hugepages at stage 2 but doesn't actually check that the provided hugepage memory pagesize is PMD_SIZE before populating stage 2 entries.

In cases where the backing hugepage size is smaller than PMD_SIZE (such as when using contiguous hugepages), KVM can end up creating stage 2 mappings that extend beyond the supplied memory.

Fix this by checking for the pagesize of userspace vma before creating PMD hugepage at stage 2.

Fixes 66b3923a1a0f77a ("arm64: hugetlb: add support for PTE contiguous bit")
Cc Marc Zyngier <[email protected]>
---
 arch/arm/kvm/mmu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/kvm/mmu.c +1 -1
index 2206e0e00934..2a35c1963f6d 100644
@@ -1284,7 +1284,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
 		return -EFAULT;
 	}
 
-	if (is_vm_hugetlb_page(vma) && !logging_active) {
+	if (vma_kernel_pagesize(vma) && !logging_active) {
 		hugetlb = true;
 		gfn = (fault_ipa & PMD_MASK) >> PAGE_SHIFT;
 	} else {
Signature · 1 line
2.15.1
author maintainer
#3 lore raw
Quoted 7 lines · Punit Agrawal
Quoted 4 lines · <[email protected]> writes:

The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Quoted 7 lines

The fix didn't apply as the file has moved recently. I am including the backport below.

I left the tags from the original commit intact as there's no real change - hope that's ok.

Apologies for the trouble.

Not a problem, thanks for the patch, now queued up.

greg k-h