* FAILED: patch "[PATCH] KVM: arm/arm64: Check pagesize when allocating a hugepage at" failed to apply to 4.9-stable tree
@ 2018-01-21 12:29 gregkh
2018-01-22 11:45 ` Punit Agrawal
2018-01-22 11:47 ` Punit Agrawal
0 siblings, 2 replies; 4+ messages in thread
From: gregkh @ 2018-01-21 12:29 UTC (permalink / raw)
To: punit.agrawal, christoffer.dall, marc.zyngier, stable; +Cc: stable
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 <stable@vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
>From c507babf10ead4d5c8cca704539b170752a8ac84 Mon Sep 17 00:00:00 2001
From: Punit Agrawal <punit.agrawal@arm.com>
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")
Signed-off-by: Punit Agrawal <punit.agrawal@arm.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: <stable@vger.kernel.org> # v4.5+
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
diff --git a/virt/kvm/arm/mmu.c b/virt/kvm/arm/mmu.c
index b4b69c2d1012..9dea96380339 100644
--- a/virt/kvm/arm/mmu.c
+++ b/virt/kvm/arm/mmu.c
@@ -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 {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: FAILED: patch "[PATCH] KVM: arm/arm64: Check pagesize when allocating a hugepage at" failed to apply to 4.9-stable tree
2018-01-21 12:29 FAILED: patch "[PATCH] KVM: arm/arm64: Check pagesize when allocating a hugepage at" failed to apply to 4.9-stable tree gregkh
@ 2018-01-22 11:45 ` Punit Agrawal
2018-01-22 11:47 ` Punit Agrawal
1 sibling, 0 replies; 4+ messages in thread
From: Punit Agrawal @ 2018-01-22 11:45 UTC (permalink / raw)
To: gregkh; +Cc: christoffer.dall, marc.zyngier, stable
<gregkh@linuxfoundation.org> 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 <stable@vger.kernel.org>.
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------
>From db0a288ba58478461d53a5f98878f59e65a9345f Mon Sep 17 00:00:00 2001
From: Punit Agrawal <punit.agrawal@arm.com>
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")
Signed-off-by: Punit Agrawal <punit.agrawal@arm.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
---
arch/arm/kvm/mmu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c
index 2206e0e00934..2a35c1963f6d 100644
--- a/arch/arm/kvm/mmu.c
+++ b/arch/arm/kvm/mmu.c
@@ -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 {
--
2.15.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: FAILED: patch "[PATCH] KVM: arm/arm64: Check pagesize when allocating a hugepage at" failed to apply to 4.9-stable tree
2018-01-21 12:29 FAILED: patch "[PATCH] KVM: arm/arm64: Check pagesize when allocating a hugepage at" failed to apply to 4.9-stable tree gregkh
2018-01-22 11:45 ` Punit Agrawal
@ 2018-01-22 11:47 ` Punit Agrawal
2018-01-24 9:39 ` Greg KH
1 sibling, 1 reply; 4+ messages in thread
From: Punit Agrawal @ 2018-01-22 11:47 UTC (permalink / raw)
To: gregkh; +Cc: christoffer.dall, marc.zyngier, stable
<gregkh@linuxfoundation.org> 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 <stable@vger.kernel.org>.
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------
>From db0a288ba58478461d53a5f98878f59e65a9345f Mon Sep 17 00:00:00 2001
From: Punit Agrawal <punit.agrawal@arm.com>
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")
Signed-off-by: Punit Agrawal <punit.agrawal@arm.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
---
arch/arm/kvm/mmu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c
index 2206e0e00934..2a35c1963f6d 100644
--- a/arch/arm/kvm/mmu.c
+++ b/arch/arm/kvm/mmu.c
@@ -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 {
--
2.15.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: FAILED: patch "[PATCH] KVM: arm/arm64: Check pagesize when allocating a hugepage at" failed to apply to 4.9-stable tree
2018-01-22 11:47 ` Punit Agrawal
@ 2018-01-24 9:39 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2018-01-24 9:39 UTC (permalink / raw)
To: Punit Agrawal; +Cc: christoffer.dall, marc.zyngier, stable
On Mon, Jan 22, 2018 at 11:47:13AM +0000, Punit Agrawal wrote:
> <gregkh@linuxfoundation.org> 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 <stable@vger.kernel.org>.
>
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-01-24 9:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-21 12:29 FAILED: patch "[PATCH] KVM: arm/arm64: Check pagesize when allocating a hugepage at" failed to apply to 4.9-stable tree gregkh
2018-01-22 11:45 ` Punit Agrawal
2018-01-22 11:47 ` Punit Agrawal
2018-01-24 9:39 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.