(sorry for the spam, I screwed up the stable@ address).
BTW, thanks to Kirill for doing this patch! He posted it to LKML
but we need to ensure it is picked up for 4.2 and any -stable
kernels where this commit is applied:
6b7339f4: mm: avoid setting up anonymous pages into file mapping
That broke MPX support because MPX sets a vma->vm_ops on an
anonymous VMA. We need this patch to make it work again,
basically removing MPX's use of ->vm_ops. Kirill made me aware
of this long ago, but I didn't double-check that his fix got
submitted and merged.
I (Dave) fixed up a minor merge conflict and added the
try_unmap_single_bt() use of is_mpx_vma() (which were added
post-4.1).
Note for -stable: The first hunk may not apply cleanly because of
other activity in arch/x86/mm/mmap.c, but should be trivial to
apply by hand. Hunk #5 on mpx.c is only present on 4.2-rc kernels.
--
From: Kirill A. Shutemov <[email protected]>
MPX setups private anonymous mapping, but uses vma->vm_ops too.
This can confuse core VM, as it relies on vm->vm_ops to distinguish
file VMAs from anonymous.
As result we will get SIGBUS, because handle_pte_fault() thinks it's
file VMA without vm_ops->fault and it doesn't know how to handle the
situation properly.
Let's fix that by not setting ->vm_ops.
We don't really need ->vm_ops here: MPX VMA can be detected with VM_MPX
flag. And vma_merge() will not merge MPX VMA with non-MPX VMA, because
->vm_flags won't match.
The only thing left is name of VMA. I'm not sure if it's part of ABI, or
we can just drop it. The patch keep it by providing arch_vma_name() on x86.
Build tested only. (by Kirill)
Build, boot and MPX tested (by Dave)
Signed-off-by: Kirill A. Shutemov <[email protected]>
Signed-off-by: Dave Hansen <[email protected]>
Cc: Andy Lutomirski <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: [email protected]
Cc: <[email protected]> # 6b7339f4: mm: avoid setting up anonymous pages into file mapping
Cc: [email protected]
---
b/arch/x86/mm/mmap.c | 7 +++++++
b/arch/x86/mm/mpx.c | 24 +++---------------------
2 files changed, 10 insertions(+), 21 deletions(-)
diff -puN arch/x86/mm/mmap.c~2_5-x86-mpx-do-not-set-vm-ops-on-mpx-VMAs arch/x86/mm/mmap.c
--- a/arch/x86/mm/mmap.c~2_5-x86-mpx-do-not-set-vm-ops-on-mpx-VMAs 2015-07-20 13:25:31.012370827 -0700
+++ b/arch/x86/mm/mmap.c 2015-07-20 13:25:31.017371052 -0700
@@ -126,3 +126,10 @@ void arch_pick_mmap_layout(struct mm_str
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
}
}
+
+const char *arch_vma_name(struct vm_area_struct *vma)
+{
+ if (vma->vm_flags & VM_MPX)
+ return "[mpx]";
+ return NULL;
+}
diff -puN arch/x86/mm/mpx.c~2_5-x86-mpx-do-not-set-vm-ops-on-mpx-VMAs arch/x86/mm/mpx.c
--- a/arch/x86/mm/mpx.c~2_5-x86-mpx-do-not-set-vm-ops-on-mpx-VMAs 2015-07-20 13:25:31.014370917 -0700
+++ b/arch/x86/mm/mpx.c 2015-07-20 13:25:31.017371052 -0700
@@ -20,20 +20,6 @@
#define CREATE_TRACE_POINTS
#include <asm/trace/mpx.h>
-static const char *mpx_mapping_name(struct vm_area_struct *vma)
-{
- return "[mpx]";
-}
-
-static struct vm_operations_struct mpx_vma_ops = {
- .name = mpx_mapping_name,
-};
-
-static int is_mpx_vma(struct vm_area_struct *vma)
-{
- return (vma->vm_ops == &mpx_vma_ops);
-}
-
static inline unsigned long mpx_bd_size_bytes(struct mm_struct *mm)
{
if (is_64bit_mm(mm))
@@ -53,9 +39,6 @@ static inline unsigned long mpx_bt_size_
/*
* This is really a simplified "vm_mmap". it only handles MPX
* bounds tables (the bounds directory is user-allocated).
- *
- * Later on, we use the vma->vm_ops to uniquely identify these
- * VMAs.
*/
static unsigned long mpx_mmap(unsigned long len)
{
@@ -101,7 +84,6 @@ static unsigned long mpx_mmap(unsigned l
ret = -ENOMEM;
goto out;
}
- vma->vm_ops = &mpx_vma_ops;
if (vm_flags & VM_LOCKED) {
up_write(&mm->mmap_sem);
@@ -812,7 +794,7 @@ static noinline int zap_bt_entries_mappi
* so stop immediately and return an error. This
* probably results in a SIGSEGV.
*/
- if (!is_mpx_vma(vma))
+ if (!(vma->vm_flags & VM_MPX))
return -EINVAL;
len = min(vma->vm_end, end) - addr;
@@ -945,9 +927,9 @@ static int try_unmap_single_bt(struct mm
* lots of tables even though we have no actual table
* entries in use.
*/
- while (next && is_mpx_vma(next))
+ while (next && (next->vm_flags & VM_MPX))
next = next->vm_next;
- while (prev && is_mpx_vma(prev))
+ while (prev && (prev->vm_flags & VM_MPX))
prev = prev->vm_prev;
/*
* We know 'start' and 'end' lie within an area controlled
_
Commit-ID: a89652769470d12cd484ee3d3f7bde0742be8d96
Gitweb: http://git.kernel.org/tip/a89652769470d12cd484ee3d3f7bde0742be8d96
Author: Kirill A. Shutemov <[email protected]>
AuthorDate: Mon, 20 Jul 2015 14:29:58 -0700
Committer: Ingo Molnar <[email protected]>
CommitDate: Tue, 21 Jul 2015 07:57:16 +0200
x86/mpx: Do not set ->vm_ops on MPX VMAs
MPX setups private anonymous mapping, but uses vma->vm_ops too.
This can confuse core VM, as it relies on vm->vm_ops to
distinguish file VMAs from anonymous.
As result we will get SIGBUS, because handle_pte_fault() thinks
it's file VMA without vm_ops->fault and it doesn't know how to
handle the situation properly.
Let's fix that by not setting ->vm_ops.
We don't really need ->vm_ops here: MPX VMA can be detected with
VM_MPX flag. And vma_merge() will not merge MPX VMA with non-MPX
VMA, because ->vm_flags won't match.
The only thing left is name of VMA. I'm not sure if it's part of
ABI, or we can just drop it. The patch keep it by providing
arch_vma_name() on x86.
Signed-off-by: Kirill A. Shutemov <[email protected]>
Signed-off-by: Dave Hansen <[email protected]>
Cc: <[email protected]> # Fixes: 6b7339f4 (mm: avoid setting up anonymous pages into file mapping)
Cc: Andy Lutomirski <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: [email protected]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
arch/x86/mm/mmap.c | 7 +++++++
arch/x86/mm/mpx.c | 24 +++---------------------
2 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
index 9d518d6..844b06d 100644
--- a/arch/x86/mm/mmap.c
+++ b/arch/x86/mm/mmap.c
@@ -126,3 +126,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
}
}
+
+const char *arch_vma_name(struct vm_area_struct *vma)
+{
+ if (vma->vm_flags & VM_MPX)
+ return "[mpx]";
+ return NULL;
+}
diff --git a/arch/x86/mm/mpx.c b/arch/x86/mm/mpx.c
index 7a657f5..db1b0bc 100644
--- a/arch/x86/mm/mpx.c
+++ b/arch/x86/mm/mpx.c
@@ -20,20 +20,6 @@
#define CREATE_TRACE_POINTS
#include <asm/trace/mpx.h>
-static const char *mpx_mapping_name(struct vm_area_struct *vma)
-{
- return "[mpx]";
-}
-
-static struct vm_operations_struct mpx_vma_ops = {
- .name = mpx_mapping_name,
-};
-
-static int is_mpx_vma(struct vm_area_struct *vma)
-{
- return (vma->vm_ops == &mpx_vma_ops);
-}
-
static inline unsigned long mpx_bd_size_bytes(struct mm_struct *mm)
{
if (is_64bit_mm(mm))
@@ -53,9 +39,6 @@ static inline unsigned long mpx_bt_size_bytes(struct mm_struct *mm)
/*
* This is really a simplified "vm_mmap". it only handles MPX
* bounds tables (the bounds directory is user-allocated).
- *
- * Later on, we use the vma->vm_ops to uniquely identify these
- * VMAs.
*/
static unsigned long mpx_mmap(unsigned long len)
{
@@ -101,7 +84,6 @@ static unsigned long mpx_mmap(unsigned long len)
ret = -ENOMEM;
goto out;
}
- vma->vm_ops = &mpx_vma_ops;
if (vm_flags & VM_LOCKED) {
up_write(&mm->mmap_sem);
@@ -812,7 +794,7 @@ static noinline int zap_bt_entries_mapping(struct mm_struct *mm,
* so stop immediately and return an error. This
* probably results in a SIGSEGV.
*/
- if (!is_mpx_vma(vma))
+ if (!(vma->vm_flags & VM_MPX))
return -EINVAL;
len = min(vma->vm_end, end) - addr;
@@ -945,9 +927,9 @@ static int try_unmap_single_bt(struct mm_struct *mm,
* lots of tables even though we have no actual table
* entries in use.
*/
- while (next && is_mpx_vma(next))
+ while (next && (next->vm_flags & VM_MPX))
next = next->vm_next;
- while (prev && is_mpx_vma(prev))
+ while (prev && (prev->vm_flags & VM_MPX))
prev = prev->vm_prev;
/*
* We know 'start' and 'end' lie within an area controlled
On Mon, Jul 20, 2015 at 02:29:58PM -0700, Dave Hansen wrote:
>
> (sorry for the spam, I screwed up the stable@ address).
>
> BTW, thanks to Kirill for doing this patch! He posted it to LKML
> but we need to ensure it is picked up for 4.2 and any -stable
> kernels where this commit is applied:
>
> 6b7339f4: mm: avoid setting up anonymous pages into file mapping
>
> That broke MPX support because MPX sets a vma->vm_ops on an
> anonymous VMA. We need this patch to make it work again,
> basically removing MPX's use of ->vm_ops. Kirill made me aware
> of this long ago, but I didn't double-check that his fix got
> submitted and merged.
>
> I (Dave) fixed up a minor merge conflict and added the
> try_unmap_single_bt() use of is_mpx_vma() (which were added
> post-4.1).
>
> Note for -stable: The first hunk may not apply cleanly because of
> other activity in arch/x86/mm/mmap.c, but should be trivial to
> apply by hand. Hunk #5 on mpx.c is only present on 4.2-rc kernels.
Can someone send a version that is known to apply, you don't want to
rely on me to get it right :)
thanks,
greg k-h
Greg KH wrote:
> On Mon, Jul 20, 2015 at 02:29:58PM -0700, Dave Hansen wrote:
> >
> > (sorry for the spam, I screwed up the stable@ address).
> >
> > BTW, thanks to Kirill for doing this patch! He posted it to LKML
> > but we need to ensure it is picked up for 4.2 and any -stable
> > kernels where this commit is applied:
> >
> > 6b7339f4: mm: avoid setting up anonymous pages into file mapping
> >
> > That broke MPX support because MPX sets a vma->vm_ops on an
> > anonymous VMA. We need this patch to make it work again,
> > basically removing MPX's use of ->vm_ops. Kirill made me aware
> > of this long ago, but I didn't double-check that his fix got
> > submitted and merged.
> >
> > I (Dave) fixed up a minor merge conflict and added the
> > try_unmap_single_bt() use of is_mpx_vma() (which were added
> > post-4.1).
> >
> > Note for -stable: The first hunk may not apply cleanly because of
> > other activity in arch/x86/mm/mmap.c, but should be trivial to
> > apply by hand. Hunk #5 on mpx.c is only present on 4.2-rc kernels.
>
> Can someone send a version that is known to apply, you don't want to
> rely on me to get it right :)
Here it is.
MPX support was introduced in 3.19, so it only need to be applied to
4.1-stable.
>From 62d8093f0bfd79eff2c87e8924cb9276116aaabe Mon Sep 17 00:00:00 2001
From: "Kirill A. Shutemov" <[email protected]>
Date: Mon, 20 Jul 2015 14:29:58 -0700
Subject: [PATCH] x86/mpx: Do not set ->vm_ops on MPX VMAs
MPX setups private anonymous mapping, but uses vma->vm_ops too.
This can confuse core VM, as it relies on vm->vm_ops to
distinguish file VMAs from anonymous.
As result we will get SIGBUS, because handle_pte_fault() thinks
it's file VMA without vm_ops->fault and it doesn't know how to
handle the situation properly.
Let's fix that by not setting ->vm_ops.
We don't really need ->vm_ops here: MPX VMA can be detected with
VM_MPX flag. And vma_merge() will not merge MPX VMA with non-MPX
VMA, because ->vm_flags won't match.
The only thing left is name of VMA. I'm not sure if it's part of
ABI, or we can just drop it. The patch keep it by providing
arch_vma_name() on x86.
Signed-off-by: Kirill A. Shutemov <[email protected]>
Signed-off-by: Dave Hansen <[email protected]>
Cc: <[email protected]> # Fixes: 6b7339f4 (mm: avoid setting up anonymous pages into file mapping)
Cc: Andy Lutomirski <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: [email protected]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
arch/x86/mm/mmap.c | 7 +++++++
arch/x86/mm/mpx.c | 20 +-------------------
2 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
index 9d518d693b4b..844b06d67df4 100644
--- a/arch/x86/mm/mmap.c
+++ b/arch/x86/mm/mmap.c
@@ -126,3 +126,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
mm->get_unmapped_area = arch_get_unmapped_area_topdown;
}
}
+
+const char *arch_vma_name(struct vm_area_struct *vma)
+{
+ if (vma->vm_flags & VM_MPX)
+ return "[mpx]";
+ return NULL;
+}
diff --git a/arch/x86/mm/mpx.c b/arch/x86/mm/mpx.c
index c439ec478216..4d1c11c07fe1 100644
--- a/arch/x86/mm/mpx.c
+++ b/arch/x86/mm/mpx.c
@@ -18,26 +18,9 @@
#include <asm/processor.h>
#include <asm/fpu-internal.h>
-static const char *mpx_mapping_name(struct vm_area_struct *vma)
-{
- return "[mpx]";
-}
-
-static struct vm_operations_struct mpx_vma_ops = {
- .name = mpx_mapping_name,
-};
-
-static int is_mpx_vma(struct vm_area_struct *vma)
-{
- return (vma->vm_ops == &mpx_vma_ops);
-}
-
/*
* This is really a simplified "vm_mmap". it only handles MPX
* bounds tables (the bounds directory is user-allocated).
- *
- * Later on, we use the vma->vm_ops to uniquely identify these
- * VMAs.
*/
static unsigned long mpx_mmap(unsigned long len)
{
@@ -83,7 +66,6 @@ static unsigned long mpx_mmap(unsigned long len)
ret = -ENOMEM;
goto out;
}
- vma->vm_ops = &mpx_vma_ops;
if (vm_flags & VM_LOCKED) {
up_write(&mm->mmap_sem);
@@ -661,7 +643,7 @@ static int zap_bt_entries(struct mm_struct *mm,
* so stop immediately and return an error. This
* probably results in a SIGSEGV.
*/
- if (!is_mpx_vma(vma))
+ if (!(vma->vm_flags & VM_MPX))
return -EINVAL;
len = min(vma->vm_end, end) - addr;
--
2.4.6
On Mon, Aug 03, 2015 at 01:34:28PM +0300, Kirill A. Shutemov wrote:
> Greg KH wrote:
> > On Mon, Jul 20, 2015 at 02:29:58PM -0700, Dave Hansen wrote:
> > >
> > > (sorry for the spam, I screwed up the stable@ address).
> > >
> > > BTW, thanks to Kirill for doing this patch! He posted it to LKML
> > > but we need to ensure it is picked up for 4.2 and any -stable
> > > kernels where this commit is applied:
> > >
> > > 6b7339f4: mm: avoid setting up anonymous pages into file mapping
> > >
> > > That broke MPX support because MPX sets a vma->vm_ops on an
> > > anonymous VMA. We need this patch to make it work again,
> > > basically removing MPX's use of ->vm_ops. Kirill made me aware
> > > of this long ago, but I didn't double-check that his fix got
> > > submitted and merged.
> > >
> > > I (Dave) fixed up a minor merge conflict and added the
> > > try_unmap_single_bt() use of is_mpx_vma() (which were added
> > > post-4.1).
> > >
> > > Note for -stable: The first hunk may not apply cleanly because of
> > > other activity in arch/x86/mm/mmap.c, but should be trivial to
> > > apply by hand. Hunk #5 on mpx.c is only present on 4.2-rc kernels.
> >
> > Can someone send a version that is known to apply, you don't want to
> > rely on me to get it right :)
>
> Here it is.
>
> MPX support was introduced in 3.19, so it only need to be applied to
> 4.1-stable.
Thanks, now applied.
greg k-h
On Mon, Aug 03, 2015 at 09:19:14AM -0700, Greg KH wrote:
> On Mon, Aug 03, 2015 at 01:34:28PM +0300, Kirill A. Shutemov wrote:
> > Greg KH wrote:
> > > On Mon, Jul 20, 2015 at 02:29:58PM -0700, Dave Hansen wrote:
> > > >
> > > > (sorry for the spam, I screwed up the stable@ address).
> > > >
> > > > BTW, thanks to Kirill for doing this patch! He posted it to LKML
> > > > but we need to ensure it is picked up for 4.2 and any -stable
> > > > kernels where this commit is applied:
> > > >
> > > > 6b7339f4: mm: avoid setting up anonymous pages into file mapping
> > > >
> > > > That broke MPX support because MPX sets a vma->vm_ops on an
> > > > anonymous VMA. We need this patch to make it work again,
> > > > basically removing MPX's use of ->vm_ops. Kirill made me aware
> > > > of this long ago, but I didn't double-check that his fix got
> > > > submitted and merged.
> > > >
> > > > I (Dave) fixed up a minor merge conflict and added the
> > > > try_unmap_single_bt() use of is_mpx_vma() (which were added
> > > > post-4.1).
> > > >
> > > > Note for -stable: The first hunk may not apply cleanly because of
> > > > other activity in arch/x86/mm/mmap.c, but should be trivial to
> > > > apply by hand. Hunk #5 on mpx.c is only present on 4.2-rc kernels.
> > >
> > > Can someone send a version that is known to apply, you don't want to
> > > rely on me to get it right :)
> >
> > Here it is.
> >
> > MPX support was introduced in 3.19, so it only need to be applied to
> > 4.1-stable.
>
> Thanks, now applied.
Just to make clear: we don't need MPX patch for older stables, but we
*do* need 6b7339f4 (mm: avoid setting up anonymous pages into file
mapping) to be ported into all stables.
--
Kirill A. Shutemov
On Mon, Aug 03, 2015 at 10:40:55PM +0300, Kirill A. Shutemov wrote:
> On Mon, Aug 03, 2015 at 09:19:14AM -0700, Greg KH wrote:
> > On Mon, Aug 03, 2015 at 01:34:28PM +0300, Kirill A. Shutemov wrote:
> > > Greg KH wrote:
> > > > On Mon, Jul 20, 2015 at 02:29:58PM -0700, Dave Hansen wrote:
> > > > >
> > > > > (sorry for the spam, I screwed up the stable@ address).
> > > > >
> > > > > BTW, thanks to Kirill for doing this patch! He posted it to LKML
> > > > > but we need to ensure it is picked up for 4.2 and any -stable
> > > > > kernels where this commit is applied:
> > > > >
> > > > > 6b7339f4: mm: avoid setting up anonymous pages into file mapping
> > > > >
> > > > > That broke MPX support because MPX sets a vma->vm_ops on an
> > > > > anonymous VMA. We need this patch to make it work again,
> > > > > basically removing MPX's use of ->vm_ops. Kirill made me aware
> > > > > of this long ago, but I didn't double-check that his fix got
> > > > > submitted and merged.
> > > > >
> > > > > I (Dave) fixed up a minor merge conflict and added the
> > > > > try_unmap_single_bt() use of is_mpx_vma() (which were added
> > > > > post-4.1).
> > > > >
> > > > > Note for -stable: The first hunk may not apply cleanly because of
> > > > > other activity in arch/x86/mm/mmap.c, but should be trivial to
> > > > > apply by hand. Hunk #5 on mpx.c is only present on 4.2-rc kernels.
> > > >
> > > > Can someone send a version that is known to apply, you don't want to
> > > > rely on me to get it right :)
> > >
> > > Here it is.
> > >
> > > MPX support was introduced in 3.19, so it only need to be applied to
> > > 4.1-stable.
> >
> > Thanks, now applied.
>
> Just to make clear: we don't need MPX patch for older stables, but we
> *do* need 6b7339f4 (mm: avoid setting up anonymous pages into file
> mapping) to be ported into all stables.
Can you provide that backport, it isn't a direct cherry-pick.
thanks,
greg k-h
On Mon, Aug 03, 2015 at 01:36:23PM -0700, Greg KH wrote:
> On Mon, Aug 03, 2015 at 10:40:55PM +0300, Kirill A. Shutemov wrote:
> > On Mon, Aug 03, 2015 at 09:19:14AM -0700, Greg KH wrote:
> > > On Mon, Aug 03, 2015 at 01:34:28PM +0300, Kirill A. Shutemov wrote:
> > > > Greg KH wrote:
> > > > > On Mon, Jul 20, 2015 at 02:29:58PM -0700, Dave Hansen wrote:
> > > > > >
> > > > > > (sorry for the spam, I screwed up the stable@ address).
> > > > > >
> > > > > > BTW, thanks to Kirill for doing this patch! He posted it to LKML
> > > > > > but we need to ensure it is picked up for 4.2 and any -stable
> > > > > > kernels where this commit is applied:
> > > > > >
> > > > > > 6b7339f4: mm: avoid setting up anonymous pages into file mapping
> > > > > >
> > > > > > That broke MPX support because MPX sets a vma->vm_ops on an
> > > > > > anonymous VMA. We need this patch to make it work again,
> > > > > > basically removing MPX's use of ->vm_ops. Kirill made me aware
> > > > > > of this long ago, but I didn't double-check that his fix got
> > > > > > submitted and merged.
> > > > > >
> > > > > > I (Dave) fixed up a minor merge conflict and added the
> > > > > > try_unmap_single_bt() use of is_mpx_vma() (which were added
> > > > > > post-4.1).
> > > > > >
> > > > > > Note for -stable: The first hunk may not apply cleanly because of
> > > > > > other activity in arch/x86/mm/mmap.c, but should be trivial to
> > > > > > apply by hand. Hunk #5 on mpx.c is only present on 4.2-rc kernels.
> > > > >
> > > > > Can someone send a version that is known to apply, you don't want to
> > > > > rely on me to get it right :)
> > > >
> > > > Here it is.
> > > >
> > > > MPX support was introduced in 3.19, so it only need to be applied to
> > > > 4.1-stable.
> > >
> > > Thanks, now applied.
> >
> > Just to make clear: we don't need MPX patch for older stables, but we
> > *do* need 6b7339f4 (mm: avoid setting up anonymous pages into file
> > mapping) to be ported into all stables.
>
> Can you provide that backport, it isn't a direct cherry-pick.
Patches are in attach.
0001-mm-avoid-setting-up-anonymous-pages-3.18.patch is rebased onto v3.18.
0001-mm-avoid-setting-up-anonymous-pages-3.14.patch is rebased onto v3.14,
also applies cleanly to v3.12, v3.10, v3.4, v3.2.
0001-mm-avoid-setting-up-anonymous-pages-2.6.32.patch is rebased onto
v2.6.32.
Build tested for all these versions.
--
Kirill A. Shutemov
On Tue, Aug 04, 2015 at 12:39:13AM +0300, Kirill A. Shutemov wrote:
> On Mon, Aug 03, 2015 at 01:36:23PM -0700, Greg KH wrote:
> > On Mon, Aug 03, 2015 at 10:40:55PM +0300, Kirill A. Shutemov wrote:
> > > On Mon, Aug 03, 2015 at 09:19:14AM -0700, Greg KH wrote:
> > > > On Mon, Aug 03, 2015 at 01:34:28PM +0300, Kirill A. Shutemov wrote:
> > > > > Greg KH wrote:
> > > > > > On Mon, Jul 20, 2015 at 02:29:58PM -0700, Dave Hansen wrote:
> > > > > > >
> > > > > > > (sorry for the spam, I screwed up the stable@ address).
> > > > > > >
> > > > > > > BTW, thanks to Kirill for doing this patch! He posted it to LKML
> > > > > > > but we need to ensure it is picked up for 4.2 and any -stable
> > > > > > > kernels where this commit is applied:
> > > > > > >
> > > > > > > 6b7339f4: mm: avoid setting up anonymous pages into file mapping
> > > > > > >
> > > > > > > That broke MPX support because MPX sets a vma->vm_ops on an
> > > > > > > anonymous VMA. We need this patch to make it work again,
> > > > > > > basically removing MPX's use of ->vm_ops. Kirill made me aware
> > > > > > > of this long ago, but I didn't double-check that his fix got
> > > > > > > submitted and merged.
> > > > > > >
> > > > > > > I (Dave) fixed up a minor merge conflict and added the
> > > > > > > try_unmap_single_bt() use of is_mpx_vma() (which were added
> > > > > > > post-4.1).
> > > > > > >
> > > > > > > Note for -stable: The first hunk may not apply cleanly because of
> > > > > > > other activity in arch/x86/mm/mmap.c, but should be trivial to
> > > > > > > apply by hand. Hunk #5 on mpx.c is only present on 4.2-rc kernels.
> > > > > >
> > > > > > Can someone send a version that is known to apply, you don't want to
> > > > > > rely on me to get it right :)
> > > > >
> > > > > Here it is.
> > > > >
> > > > > MPX support was introduced in 3.19, so it only need to be applied to
> > > > > 4.1-stable.
> > > >
> > > > Thanks, now applied.
> > >
> > > Just to make clear: we don't need MPX patch for older stables, but we
> > > *do* need 6b7339f4 (mm: avoid setting up anonymous pages into file
> > > mapping) to be ported into all stables.
> >
> > Can you provide that backport, it isn't a direct cherry-pick.
>
> Patches are in attach.
>
> 0001-mm-avoid-setting-up-anonymous-pages-3.18.patch is rebased onto v3.18.
>
> 0001-mm-avoid-setting-up-anonymous-pages-3.14.patch is rebased onto v3.14,
> also applies cleanly to v3.12, v3.10, v3.4, v3.2.
Thanks, I've taken this patch now for 3.10 and 3.14.
greg k-h
On Tue, Aug 04, 2015 at 12:39:13AM +0300, Kirill A. Shutemov wrote:
> On Mon, Aug 03, 2015 at 01:36:23PM -0700, Greg KH wrote:
> > On Mon, Aug 03, 2015 at 10:40:55PM +0300, Kirill A. Shutemov wrote:
> > > On Mon, Aug 03, 2015 at 09:19:14AM -0700, Greg KH wrote:
> > > > On Mon, Aug 03, 2015 at 01:34:28PM +0300, Kirill A. Shutemov wrote:
> > > > > Greg KH wrote:
> > > > > > On Mon, Jul 20, 2015 at 02:29:58PM -0700, Dave Hansen wrote:
> > > > > > >
> > > > > > > (sorry for the spam, I screwed up the stable@ address).
> > > > > > >
> > > > > > > BTW, thanks to Kirill for doing this patch! He posted it to LKML
> > > > > > > but we need to ensure it is picked up for 4.2 and any -stable
> > > > > > > kernels where this commit is applied:
> > > > > > >
> > > > > > > 6b7339f4: mm: avoid setting up anonymous pages into file mapping
> > > > > > >
> > > > > > > That broke MPX support because MPX sets a vma->vm_ops on an
> > > > > > > anonymous VMA. We need this patch to make it work again,
> > > > > > > basically removing MPX's use of ->vm_ops. Kirill made me aware
> > > > > > > of this long ago, but I didn't double-check that his fix got
> > > > > > > submitted and merged.
> > > > > > >
> > > > > > > I (Dave) fixed up a minor merge conflict and added the
> > > > > > > try_unmap_single_bt() use of is_mpx_vma() (which were added
> > > > > > > post-4.1).
> > > > > > >
> > > > > > > Note for -stable: The first hunk may not apply cleanly because of
> > > > > > > other activity in arch/x86/mm/mmap.c, but should be trivial to
> > > > > > > apply by hand. Hunk #5 on mpx.c is only present on 4.2-rc kernels.
> > > > > >
> > > > > > Can someone send a version that is known to apply, you don't want to
> > > > > > rely on me to get it right :)
> > > > >
> > > > > Here it is.
> > > > >
> > > > > MPX support was introduced in 3.19, so it only need to be applied to
> > > > > 4.1-stable.
> > > >
> > > > Thanks, now applied.
> > >
> > > Just to make clear: we don't need MPX patch for older stables, but we
> > > *do* need 6b7339f4 (mm: avoid setting up anonymous pages into file
> > > mapping) to be ported into all stables.
> >
> > Can you provide that backport, it isn't a direct cherry-pick.
>
> Patches are in attach.
>
> 0001-mm-avoid-setting-up-anonymous-pages-3.18.patch is rebased onto v3.18.
>
Thanks, I'm queuing this for the 3.16 kernel as well.
Cheers,
--
Lu?s
> 0001-mm-avoid-setting-up-anonymous-pages-3.14.patch is rebased onto v3.14,
> also applies cleanly to v3.12, v3.10, v3.4, v3.2.
>
> 0001-mm-avoid-setting-up-anonymous-pages-2.6.32.patch is rebased onto
> v2.6.32.
>
> Build tested for all these versions.
>
> --
> Kirill A. Shutemov