* [PATCHv2 0/6] Make vma_is_anonymous() reliable
@ 2015-07-17 11:53 Kirill A. Shutemov
2015-07-17 11:53 ` [PATCHv2 1/6] mm: mark most vm_operations_struct const Kirill A. Shutemov
` (6 more replies)
0 siblings, 7 replies; 15+ messages in thread
From: Kirill A. Shutemov @ 2015-07-17 11:53 UTC (permalink / raw
To: Andrew Morton; +Cc: Oleg Nesterov, linux-mm, linux-kernel, Kirill A. Shutemov
We rely on ->vm_ops == NULL to detect anonymous VMA but this check is not
always reliable:
- MPX sets ->vm_ops on anonymous VMA;
- many drivers don't set ->vm_ops. See for instance hpet_mmap().
This patchset makes vma_is_anonymous() more reliable and makes few
cleanups around the code.
v2:
- drop broken patch;
- more cleanup for mpx code (Oleg);
- vma_is_anonymous() in create_huge_pmd() and wp_huge_pmd();
Kirill A. Shutemov (5):
mm: mark most vm_operations_struct const
x86, mpx: do not set ->vm_ops on mpx VMAs
mm: make sure all file VMAs have ->vm_ops set
mm: use vma_is_anonymous() in create_huge_pmd() and wp_huge_pmd()
mm, madvise: use vma_is_anonymous() to check for anon VMA
Oleg Nesterov (1):
mm, mpx: add "vm_flags_t vm_flags" arg to do_mmap_pgoff()
arch/x86/kernel/vsyscall_64.c | 2 +-
arch/x86/mm/mmap.c | 7 +++
arch/x86/mm/mpx.c | 71 +++-----------------------
drivers/android/binder.c | 2 +-
drivers/gpu/drm/vgem/vgem_drv.c | 2 +-
drivers/hsi/clients/cmt_speech.c | 2 +-
drivers/infiniband/hw/qib/qib_file_ops.c | 2 +-
drivers/infiniband/hw/qib/qib_mmap.c | 2 +-
drivers/media/platform/omap/omap_vout.c | 2 +-
drivers/misc/genwqe/card_dev.c | 2 +-
drivers/staging/android/ion/ion.c | 2 +-
drivers/staging/comedi/comedi_fops.c | 2 +-
drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 2 +-
drivers/xen/gntalloc.c | 2 +-
drivers/xen/gntdev.c | 2 +-
drivers/xen/privcmd.c | 4 +-
fs/ceph/addr.c | 2 +-
fs/cifs/file.c | 2 +-
include/linux/mm.h | 12 ++++-
mm/madvise.c | 2 +-
mm/memory.c | 4 +-
mm/mmap.c | 18 ++++---
mm/nommu.c | 15 +++---
security/selinux/selinuxfs.c | 2 +-
24 files changed, 66 insertions(+), 99 deletions(-)
--
2.1.4
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCHv2 1/6] mm: mark most vm_operations_struct const
2015-07-17 11:53 [PATCHv2 0/6] Make vma_is_anonymous() reliable Kirill A. Shutemov
@ 2015-07-17 11:53 ` Kirill A. Shutemov
2015-07-17 12:16 ` Christoph Hellwig
2015-07-17 11:53 ` [PATCHv2 2/6] x86, mpx: do not set ->vm_ops on mpx VMAs Kirill A. Shutemov
` (5 subsequent siblings)
6 siblings, 1 reply; 15+ messages in thread
From: Kirill A. Shutemov @ 2015-07-17 11:53 UTC (permalink / raw
To: Andrew Morton; +Cc: Oleg Nesterov, linux-mm, linux-kernel, Kirill A. Shutemov
With two excetions (drm/qxl and drm/radeon) all vm_operations_struct
structs should be constant.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
---
arch/x86/kernel/vsyscall_64.c | 2 +-
drivers/android/binder.c | 2 +-
drivers/gpu/drm/vgem/vgem_drv.c | 2 +-
drivers/hsi/clients/cmt_speech.c | 2 +-
drivers/infiniband/hw/qib/qib_file_ops.c | 2 +-
drivers/infiniband/hw/qib/qib_mmap.c | 2 +-
drivers/media/platform/omap/omap_vout.c | 2 +-
drivers/misc/genwqe/card_dev.c | 2 +-
drivers/staging/android/ion/ion.c | 2 +-
drivers/staging/comedi/comedi_fops.c | 2 +-
drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 2 +-
drivers/xen/gntalloc.c | 2 +-
drivers/xen/gntdev.c | 2 +-
drivers/xen/privcmd.c | 4 ++--
fs/ceph/addr.c | 2 +-
fs/cifs/file.c | 2 +-
security/selinux/selinuxfs.c | 2 +-
17 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
index 2dcc6ff6fdcc..30f3a83291ad 100644
--- a/arch/x86/kernel/vsyscall_64.c
+++ b/arch/x86/kernel/vsyscall_64.c
@@ -277,7 +277,7 @@ static const char *gate_vma_name(struct vm_area_struct *vma)
{
return "[vsyscall]";
}
-static struct vm_operations_struct gate_vma_ops = {
+static const struct vm_operations_struct gate_vma_ops = {
.name = gate_vma_name,
};
static struct vm_area_struct gate_vma = {
diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 6607f3c6ace1..a39e85f9efa9 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -2834,7 +2834,7 @@ static int binder_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
return VM_FAULT_SIGBUS;
}
-static struct vm_operations_struct binder_vm_ops = {
+static const struct vm_operations_struct binder_vm_ops = {
.open = binder_vma_open,
.close = binder_vma_close,
.fault = binder_vm_fault,
diff --git a/drivers/gpu/drm/vgem/vgem_drv.c b/drivers/gpu/drm/vgem/vgem_drv.c
index 7a207ca547be..27c2c473d9d3 100644
--- a/drivers/gpu/drm/vgem/vgem_drv.c
+++ b/drivers/gpu/drm/vgem/vgem_drv.c
@@ -125,7 +125,7 @@ static int vgem_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
}
}
-static struct vm_operations_struct vgem_gem_vm_ops = {
+static const struct vm_operations_struct vgem_gem_vm_ops = {
.fault = vgem_gem_fault,
.open = drm_gem_vm_open,
.close = drm_gem_vm_close,
diff --git a/drivers/hsi/clients/cmt_speech.c b/drivers/hsi/clients/cmt_speech.c
index 4983529a9c6c..914b2c2d1f2d 100644
--- a/drivers/hsi/clients/cmt_speech.c
+++ b/drivers/hsi/clients/cmt_speech.c
@@ -1105,7 +1105,7 @@ static int cs_char_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
return 0;
}
-static struct vm_operations_struct cs_char_vm_ops = {
+static const struct vm_operations_struct cs_char_vm_ops = {
.fault = cs_char_vma_fault,
};
diff --git a/drivers/infiniband/hw/qib/qib_file_ops.c b/drivers/infiniband/hw/qib/qib_file_ops.c
index 725881890c4a..e449e394963f 100644
--- a/drivers/infiniband/hw/qib/qib_file_ops.c
+++ b/drivers/infiniband/hw/qib/qib_file_ops.c
@@ -908,7 +908,7 @@ static int qib_file_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
return 0;
}
-static struct vm_operations_struct qib_file_vm_ops = {
+static const struct vm_operations_struct qib_file_vm_ops = {
.fault = qib_file_vma_fault,
};
diff --git a/drivers/infiniband/hw/qib/qib_mmap.c b/drivers/infiniband/hw/qib/qib_mmap.c
index 146cf29a2e1d..34927b700b0e 100644
--- a/drivers/infiniband/hw/qib/qib_mmap.c
+++ b/drivers/infiniband/hw/qib/qib_mmap.c
@@ -75,7 +75,7 @@ static void qib_vma_close(struct vm_area_struct *vma)
kref_put(&ip->ref, qib_release_mmap_info);
}
-static struct vm_operations_struct qib_vm_ops = {
+static const struct vm_operations_struct qib_vm_ops = {
.open = qib_vma_open,
.close = qib_vma_close,
};
diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
index 17b189a81ec5..38a50df8d629 100644
--- a/drivers/media/platform/omap/omap_vout.c
+++ b/drivers/media/platform/omap/omap_vout.c
@@ -876,7 +876,7 @@ static void omap_vout_vm_close(struct vm_area_struct *vma)
vout->mmap_count--;
}
-static struct vm_operations_struct omap_vout_vm_ops = {
+static const struct vm_operations_struct omap_vout_vm_ops = {
.open = omap_vout_vm_open,
.close = omap_vout_vm_close,
};
diff --git a/drivers/misc/genwqe/card_dev.c b/drivers/misc/genwqe/card_dev.c
index c49d244265ec..70e62d6a3231 100644
--- a/drivers/misc/genwqe/card_dev.c
+++ b/drivers/misc/genwqe/card_dev.c
@@ -418,7 +418,7 @@ static void genwqe_vma_close(struct vm_area_struct *vma)
kfree(dma_map);
}
-static struct vm_operations_struct genwqe_vma_ops = {
+static const struct vm_operations_struct genwqe_vma_ops = {
.open = genwqe_vma_open,
.close = genwqe_vma_close,
};
diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index b0b96ab31954..2bbfed9acf19 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -997,7 +997,7 @@ static void ion_vm_close(struct vm_area_struct *vma)
mutex_unlock(&buffer->lock);
}
-static struct vm_operations_struct ion_vma_ops = {
+static const struct vm_operations_struct ion_vma_ops = {
.open = ion_vm_open,
.close = ion_vm_close,
.fault = ion_vm_fault,
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index e78ddbe5a954..1649665eb633 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -2127,7 +2127,7 @@ static void comedi_vm_close(struct vm_area_struct *area)
comedi_buf_map_put(bm);
}
-static struct vm_operations_struct comedi_vm_ops = {
+static const struct vm_operations_struct comedi_vm_ops = {
.open = comedi_vm_open,
.close = comedi_vm_close,
};
diff --git a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
index 4f0cbb54d4db..d3af01c94a58 100644
--- a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
@@ -1091,7 +1091,7 @@ static void mmap_user_close(struct vm_area_struct *vma)
omapfb_put_mem_region(rg);
}
-static struct vm_operations_struct mmap_user_ops = {
+static const struct vm_operations_struct mmap_user_ops = {
.open = mmap_user_open,
.close = mmap_user_close,
};
diff --git a/drivers/xen/gntalloc.c b/drivers/xen/gntalloc.c
index e53fe191738c..696301d9dc91 100644
--- a/drivers/xen/gntalloc.c
+++ b/drivers/xen/gntalloc.c
@@ -493,7 +493,7 @@ static void gntalloc_vma_close(struct vm_area_struct *vma)
mutex_unlock(&gref_mutex);
}
-static struct vm_operations_struct gntalloc_vmops = {
+static const struct vm_operations_struct gntalloc_vmops = {
.open = gntalloc_vma_open,
.close = gntalloc_vma_close,
};
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c
index 89274850741b..b112d529a2d1 100644
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@@ -433,7 +433,7 @@ static struct page *gntdev_vma_find_special_page(struct vm_area_struct *vma,
return map->pages[(addr - map->pages_vm_start) >> PAGE_SHIFT];
}
-static struct vm_operations_struct gntdev_vmops = {
+static const struct vm_operations_struct gntdev_vmops = {
.open = gntdev_vma_open,
.close = gntdev_vma_close,
.find_special_page = gntdev_vma_find_special_page,
diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c
index 5a296161d843..56cb13fcbd0e 100644
--- a/drivers/xen/privcmd.c
+++ b/drivers/xen/privcmd.c
@@ -414,7 +414,7 @@ static int alloc_empty_pages(struct vm_area_struct *vma, int numpgs)
return 0;
}
-static struct vm_operations_struct privcmd_vm_ops;
+static const struct vm_operations_struct privcmd_vm_ops;
static long privcmd_ioctl_mmap_batch(void __user *udata, int version)
{
@@ -605,7 +605,7 @@ static int privcmd_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
return VM_FAULT_SIGBUS;
}
-static struct vm_operations_struct privcmd_vm_ops = {
+static const struct vm_operations_struct privcmd_vm_ops = {
.close = privcmd_close,
.fault = privcmd_fault
};
diff --git a/fs/ceph/addr.c b/fs/ceph/addr.c
index e162bcd105ee..9fa7b3812851 100644
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
@@ -1582,7 +1582,7 @@ out:
return err;
}
-static struct vm_operations_struct ceph_vmops = {
+static const struct vm_operations_struct ceph_vmops = {
.fault = ceph_filemap_fault,
.page_mkwrite = ceph_page_mkwrite,
};
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 2ac2d8471393..94f81962368c 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -3216,7 +3216,7 @@ cifs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
return VM_FAULT_LOCKED;
}
-static struct vm_operations_struct cifs_file_vm_ops = {
+static const struct vm_operations_struct cifs_file_vm_ops = {
.fault = filemap_fault,
.map_pages = filemap_map_pages,
.page_mkwrite = cifs_page_mkwrite,
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c
index d2787cca1fcb..0538f7034ef2 100644
--- a/security/selinux/selinuxfs.c
+++ b/security/selinux/selinuxfs.c
@@ -472,7 +472,7 @@ static int sel_mmap_policy_fault(struct vm_area_struct *vma,
return 0;
}
-static struct vm_operations_struct sel_mmap_policy_ops = {
+static const struct vm_operations_struct sel_mmap_policy_ops = {
.fault = sel_mmap_policy_fault,
.page_mkwrite = sel_mmap_policy_fault,
};
--
2.1.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCHv2 2/6] x86, mpx: do not set ->vm_ops on mpx VMAs
2015-07-17 11:53 [PATCHv2 0/6] Make vma_is_anonymous() reliable Kirill A. Shutemov
2015-07-17 11:53 ` [PATCHv2 1/6] mm: mark most vm_operations_struct const Kirill A. Shutemov
@ 2015-07-17 11:53 ` Kirill A. Shutemov
2015-07-23 20:59 ` Andrew Morton
2015-07-17 11:53 ` [PATCHv2 3/6] mm, mpx: add "vm_flags_t vm_flags" arg to do_mmap_pgoff() Kirill A. Shutemov
` (4 subsequent siblings)
6 siblings, 1 reply; 15+ messages in thread
From: Kirill A. Shutemov @ 2015-07-17 11:53 UTC (permalink / raw
To: Andrew Morton
Cc: Oleg Nesterov, linux-mm, linux-kernel, Kirill A. Shutemov,
Andy Lutomirski, Thomas Gleixner
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.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Tested-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
---
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.1.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCHv2 3/6] mm, mpx: add "vm_flags_t vm_flags" arg to do_mmap_pgoff()
2015-07-17 11:53 [PATCHv2 0/6] Make vma_is_anonymous() reliable Kirill A. Shutemov
2015-07-17 11:53 ` [PATCHv2 1/6] mm: mark most vm_operations_struct const Kirill A. Shutemov
2015-07-17 11:53 ` [PATCHv2 2/6] x86, mpx: do not set ->vm_ops on mpx VMAs Kirill A. Shutemov
@ 2015-07-17 11:53 ` Kirill A. Shutemov
2015-07-17 11:53 ` [PATCHv2 4/6] mm: make sure all file VMAs have ->vm_ops set Kirill A. Shutemov
` (3 subsequent siblings)
6 siblings, 0 replies; 15+ messages in thread
From: Kirill A. Shutemov @ 2015-07-17 11:53 UTC (permalink / raw
To: Andrew Morton; +Cc: Oleg Nesterov, linux-mm, linux-kernel, Kirill A. Shutemov
From: Oleg Nesterov <oleg@redhat.com>
Add the additional "vm_flags_t vm_flags" argument to do_mmap_pgoff(),
rename it to do_mmap(), and re-introduce do_mmap_pgoff() as a simple
wrapper on top of do_mmap(). Perhaps we should update the callers of
do_mmap_pgoff() and kill it later.
This way mpx_mmap() can simply call do_mmap(vm_flags => VM_MPX) and
do not play with vm internals.
After this change mmap_region() has a single user outside of mmap.c,
arch/tile/mm/elf.c:arch_setup_additional_pages(). It would be nice
to change arch/tile/ and unexport mmap_region().
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Dave Hansen <dave.hansen@linux.intel.com>
Tested-by: Dave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
---
arch/x86/mm/mpx.c | 51 +++++++--------------------------------------------
include/linux/mm.h | 12 ++++++++++--
mm/mmap.c | 10 ++++------
mm/nommu.c | 15 ++++++++-------
4 files changed, 29 insertions(+), 59 deletions(-)
diff --git a/arch/x86/mm/mpx.c b/arch/x86/mm/mpx.c
index 4d1c11c07fe1..fdbd3e0b1dad 100644
--- a/arch/x86/mm/mpx.c
+++ b/arch/x86/mm/mpx.c
@@ -24,58 +24,21 @@
*/
static unsigned long mpx_mmap(unsigned long len)
{
- unsigned long ret;
- unsigned long addr, pgoff;
struct mm_struct *mm = current->mm;
- vm_flags_t vm_flags;
- struct vm_area_struct *vma;
+ unsigned long addr, populate;
/* Only bounds table and bounds directory can be allocated here */
if (len != MPX_BD_SIZE_BYTES && len != MPX_BT_SIZE_BYTES)
return -EINVAL;
down_write(&mm->mmap_sem);
-
- /* Too many mappings? */
- if (mm->map_count > sysctl_max_map_count) {
- ret = -ENOMEM;
- goto out;
- }
-
- /* Obtain the address to map to. we verify (or select) it and ensure
- * that it represents a valid section of the address space.
- */
- addr = get_unmapped_area(NULL, 0, len, 0, MAP_ANONYMOUS | MAP_PRIVATE);
- if (addr & ~PAGE_MASK) {
- ret = addr;
- goto out;
- }
-
- vm_flags = VM_READ | VM_WRITE | VM_MPX |
- mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
-
- /* Set pgoff according to addr for anon_vma */
- pgoff = addr >> PAGE_SHIFT;
-
- ret = mmap_region(NULL, addr, len, vm_flags, pgoff);
- if (IS_ERR_VALUE(ret))
- goto out;
-
- vma = find_vma(mm, ret);
- if (!vma) {
- ret = -ENOMEM;
- goto out;
- }
-
- if (vm_flags & VM_LOCKED) {
- up_write(&mm->mmap_sem);
- mm_populate(ret, len);
- return ret;
- }
-
-out:
+ addr = do_mmap(NULL, 0, len, PROT_READ | PROT_WRITE,
+ MAP_ANONYMOUS | MAP_PRIVATE, VM_MPX, 0, &populate);
up_write(&mm->mmap_sem);
- return ret;
+ if (populate)
+ mm_populate(addr, populate);
+
+ return addr;
}
enum reg_type {
diff --git a/include/linux/mm.h b/include/linux/mm.h
index c3a2b37365f6..fcf255a78b1f 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1811,11 +1811,19 @@ extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned lo
extern unsigned long mmap_region(struct file *file, unsigned long addr,
unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
-extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+extern unsigned long do_mmap(struct file *file, unsigned long addr,
unsigned long len, unsigned long prot, unsigned long flags,
- unsigned long pgoff, unsigned long *populate);
+ vm_flags_t vm_flags, unsigned long pgoff, unsigned long *populate);
extern int do_munmap(struct mm_struct *, unsigned long, size_t);
+static inline unsigned long
+do_mmap_pgoff(struct file *file, unsigned long addr,
+ unsigned long len, unsigned long prot, unsigned long flags,
+ unsigned long pgoff, unsigned long *populate)
+{
+ return do_mmap(file, addr, len, prot, flags, 0, pgoff, populate);
+}
+
#ifdef CONFIG_MMU
extern int __mm_populate(unsigned long addr, unsigned long len,
int ignore_errors);
diff --git a/mm/mmap.c b/mm/mmap.c
index 4f2fb700a2e5..2e98784d5b7c 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1260,14 +1260,12 @@ static inline int mlock_future_check(struct mm_struct *mm,
/*
* The caller must hold down_write(¤t->mm->mmap_sem).
*/
-
-unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
+unsigned long do_mmap(struct file *file, unsigned long addr,
unsigned long len, unsigned long prot,
- unsigned long flags, unsigned long pgoff,
- unsigned long *populate)
+ unsigned long flags, vm_flags_t vm_flags,
+ unsigned long pgoff, unsigned long *populate)
{
struct mm_struct *mm = current->mm;
- vm_flags_t vm_flags;
*populate = 0;
@@ -1311,7 +1309,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
* to. we assume access permissions have been handled by the open
* of the memory object, so we don't do any here.
*/
- vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
+ vm_flags |= calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
if (flags & (MAP_LOCKED | MAP_LOCKONFAULT))
diff --git a/mm/nommu.c b/mm/nommu.c
index 05e7447d960b..18dcf48883dc 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1233,13 +1233,14 @@ enomem:
/*
* handle mapping creation for uClinux
*/
-unsigned long do_mmap_pgoff(struct file *file,
- unsigned long addr,
- unsigned long len,
- unsigned long prot,
- unsigned long flags,
- unsigned long pgoff,
- unsigned long *populate)
+unsigned long do_mmap(struct file *file,
+ unsigned long addr,
+ unsigned long len,
+ unsigned long prot,
+ unsigned long flags,
+ vm_flags_t vm_flags,
+ unsigned long pgoff,
+ unsigned long *populate)
{
struct vm_area_struct *vma;
struct vm_region *region;
--
2.1.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCHv2 4/6] mm: make sure all file VMAs have ->vm_ops set
2015-07-17 11:53 [PATCHv2 0/6] Make vma_is_anonymous() reliable Kirill A. Shutemov
` (2 preceding siblings ...)
2015-07-17 11:53 ` [PATCHv2 3/6] mm, mpx: add "vm_flags_t vm_flags" arg to do_mmap_pgoff() Kirill A. Shutemov
@ 2015-07-17 11:53 ` Kirill A. Shutemov
2015-07-17 11:53 ` [PATCHv2 5/6] mm: use vma_is_anonymous() in create_huge_pmd() and wp_huge_pmd() Kirill A. Shutemov
` (2 subsequent siblings)
6 siblings, 0 replies; 15+ messages in thread
From: Kirill A. Shutemov @ 2015-07-17 11:53 UTC (permalink / raw
To: Andrew Morton; +Cc: Oleg Nesterov, linux-mm, linux-kernel, Kirill A. Shutemov
We rely on vma->vm_ops == NULL to detect anonymous VMA: see
vma_is_anonymous(), but some drivers doesn't set ->vm_ops.
As result we can end up with anonymous page in private file mapping.
That's should not lead to serious misbehaviour, but nevertheless is
wrong.
Let's fix by setting up dummy ->vm_ops for file mmapping if f_op->mmap()
didn't set its own.
The patch also adds sanity check into __vma_link_rb(). It will help
catch broken VMAs which inserted directly into mm_struct via
insert_vm_struct().
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
---
mm/mmap.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/mm/mmap.c b/mm/mmap.c
index 2e98784d5b7c..a82a02853cbc 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -612,6 +612,8 @@ static unsigned long count_vma_pages_range(struct mm_struct *mm,
void __vma_link_rb(struct mm_struct *mm, struct vm_area_struct *vma,
struct rb_node **rb_link, struct rb_node *rb_parent)
{
+ WARN_ONCE(vma->vm_file && !vma->vm_ops, "missing vma->vm_ops");
+
/* Update tracking information for the gap following the new vma. */
if (vma->vm_next)
vma_gap_update(vma->vm_next);
@@ -1636,6 +1638,12 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
*/
WARN_ON_ONCE(addr != vma->vm_start);
+ /* All file mapping must have ->vm_ops set */
+ if (!vma->vm_ops) {
+ static const struct vm_operations_struct dummy_ops = {};
+ vma->vm_ops = &dummy_ops;
+ }
+
addr = vma->vm_start;
vm_flags = vma->vm_flags;
} else if (vm_flags & VM_SHARED) {
--
2.1.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCHv2 5/6] mm: use vma_is_anonymous() in create_huge_pmd() and wp_huge_pmd()
2015-07-17 11:53 [PATCHv2 0/6] Make vma_is_anonymous() reliable Kirill A. Shutemov
` (3 preceding siblings ...)
2015-07-17 11:53 ` [PATCHv2 4/6] mm: make sure all file VMAs have ->vm_ops set Kirill A. Shutemov
@ 2015-07-17 11:53 ` Kirill A. Shutemov
2015-07-17 11:53 ` [PATCHv2 6/6] mm, madvise: use vma_is_anonymous() to check for anon VMA Kirill A. Shutemov
2015-07-21 22:14 ` [PATCHv2 0/6] Make vma_is_anonymous() reliable Kirill A. Shutemov
6 siblings, 0 replies; 15+ messages in thread
From: Kirill A. Shutemov @ 2015-07-17 11:53 UTC (permalink / raw
To: Andrew Morton; +Cc: Oleg Nesterov, linux-mm, linux-kernel, Kirill A. Shutemov
Let's use helper rather than direct check of vma->vm_ops to distinguish
anonymous VMA.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
---
mm/memory.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mm/memory.c b/mm/memory.c
index c70252ca9ef9..1c139aa94aff 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3235,7 +3235,7 @@ out:
static int create_huge_pmd(struct mm_struct *mm, struct vm_area_struct *vma,
unsigned long address, pmd_t *pmd, unsigned int flags)
{
- if (!vma->vm_ops)
+ if (vma_is_anonymous(vma))
return do_huge_pmd_anonymous_page(mm, vma, address, pmd, flags);
if (vma->vm_ops->pmd_fault)
return vma->vm_ops->pmd_fault(vma, address, pmd, flags);
@@ -3246,7 +3246,7 @@ static int wp_huge_pmd(struct mm_struct *mm, struct vm_area_struct *vma,
unsigned long address, pmd_t *pmd, pmd_t orig_pmd,
unsigned int flags)
{
- if (!vma->vm_ops)
+ if (vma_is_anonymous(vma))
return do_huge_pmd_wp_page(mm, vma, address, pmd, orig_pmd);
if (vma->vm_ops->pmd_fault)
return vma->vm_ops->pmd_fault(vma, address, pmd, flags);
--
2.1.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCHv2 6/6] mm, madvise: use vma_is_anonymous() to check for anon VMA
2015-07-17 11:53 [PATCHv2 0/6] Make vma_is_anonymous() reliable Kirill A. Shutemov
` (4 preceding siblings ...)
2015-07-17 11:53 ` [PATCHv2 5/6] mm: use vma_is_anonymous() in create_huge_pmd() and wp_huge_pmd() Kirill A. Shutemov
@ 2015-07-17 11:53 ` Kirill A. Shutemov
2015-07-21 22:14 ` [PATCHv2 0/6] Make vma_is_anonymous() reliable Kirill A. Shutemov
6 siblings, 0 replies; 15+ messages in thread
From: Kirill A. Shutemov @ 2015-07-17 11:53 UTC (permalink / raw
To: Andrew Morton; +Cc: Oleg Nesterov, linux-mm, linux-kernel, Kirill A. Shutemov
!vma->vm_file is not reliable to detect anon VMA, because not all
drivers bother set it. Let's use vma_is_anonymous() instead.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Minchan Kim <minchan@kernel.org>
---
mm/madvise.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mm/madvise.c b/mm/madvise.c
index 67d5fe74ffdf..00fb14ff98dd 100644
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -393,7 +393,7 @@ static int madvise_free_single_vma(struct vm_area_struct *vma,
return -EINVAL;
/* MADV_FREE works for only anon vma at the moment */
- if (vma->vm_file)
+ if (!vma_is_anonymous(vma))
return -EINVAL;
start = max(vma->vm_start, start_addr);
--
2.1.4
^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCHv2 1/6] mm: mark most vm_operations_struct const
2015-07-17 11:53 ` [PATCHv2 1/6] mm: mark most vm_operations_struct const Kirill A. Shutemov
@ 2015-07-17 12:16 ` Christoph Hellwig
2015-07-17 12:17 ` Kirill A. Shutemov
0 siblings, 1 reply; 15+ messages in thread
From: Christoph Hellwig @ 2015-07-17 12:16 UTC (permalink / raw
To: Kirill A. Shutemov; +Cc: Andrew Morton, Oleg Nesterov, linux-mm, linux-kernel
On Fri, Jul 17, 2015 at 02:53:08PM +0300, Kirill A. Shutemov wrote:
> With two excetions (drm/qxl and drm/radeon) all vm_operations_struct
> structs should be constant.
Actually those two really need to be const as well, and the horrible
copy and overwrite hacks badly need to go away.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCHv2 1/6] mm: mark most vm_operations_struct const
2015-07-17 12:16 ` Christoph Hellwig
@ 2015-07-17 12:17 ` Kirill A. Shutemov
0 siblings, 0 replies; 15+ messages in thread
From: Kirill A. Shutemov @ 2015-07-17 12:17 UTC (permalink / raw
To: Christoph Hellwig
Cc: Kirill A. Shutemov, Andrew Morton, Oleg Nesterov, linux-mm,
linux-kernel
Christoph Hellwig wrote:
> On Fri, Jul 17, 2015 at 02:53:08PM +0300, Kirill A. Shutemov wrote:
> > With two excetions (drm/qxl and drm/radeon) all vm_operations_struct
> > structs should be constant.
>
> Actually those two really need to be const as well, and the horrible
> copy and overwrite hacks badly need to go away.
Patches are welcome ;)
--
Kirill A. Shutemov
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCHv2 0/6] Make vma_is_anonymous() reliable
2015-07-17 11:53 [PATCHv2 0/6] Make vma_is_anonymous() reliable Kirill A. Shutemov
` (5 preceding siblings ...)
2015-07-17 11:53 ` [PATCHv2 6/6] mm, madvise: use vma_is_anonymous() to check for anon VMA Kirill A. Shutemov
@ 2015-07-21 22:14 ` Kirill A. Shutemov
2015-07-21 23:39 ` Andrew Morton
6 siblings, 1 reply; 15+ messages in thread
From: Kirill A. Shutemov @ 2015-07-21 22:14 UTC (permalink / raw
To: Andrew Morton; +Cc: Kirill A. Shutemov, Oleg Nesterov, linux-mm, linux-kernel
On Fri, Jul 17, 2015 at 02:53:07PM +0300, Kirill A. Shutemov wrote:
> We rely on ->vm_ops == NULL to detect anonymous VMA but this check is not
> always reliable:
>
> - MPX sets ->vm_ops on anonymous VMA;
>
> - many drivers don't set ->vm_ops. See for instance hpet_mmap().
>
> This patchset makes vma_is_anonymous() more reliable and makes few
> cleanups around the code.
>
> v2:
> - drop broken patch;
> - more cleanup for mpx code (Oleg);
> - vma_is_anonymous() in create_huge_pmd() and wp_huge_pmd();
>
> Kirill A. Shutemov (5):
> mm: mark most vm_operations_struct const
> x86, mpx: do not set ->vm_ops on mpx VMAs
> mm: make sure all file VMAs have ->vm_ops set
> mm: use vma_is_anonymous() in create_huge_pmd() and wp_huge_pmd()
> mm, madvise: use vma_is_anonymous() to check for anon VMA
>
> Oleg Nesterov (1):
> mm, mpx: add "vm_flags_t vm_flags" arg to do_mmap_pgoff()
ping?
--
Kirill A. Shutemov
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCHv2 0/6] Make vma_is_anonymous() reliable
2015-07-21 22:14 ` [PATCHv2 0/6] Make vma_is_anonymous() reliable Kirill A. Shutemov
@ 2015-07-21 23:39 ` Andrew Morton
2015-07-21 23:54 ` Kirill A. Shutemov
2015-07-22 21:41 ` Oleg Nesterov
0 siblings, 2 replies; 15+ messages in thread
From: Andrew Morton @ 2015-07-21 23:39 UTC (permalink / raw
To: Kirill A. Shutemov
Cc: Kirill A. Shutemov, Oleg Nesterov, linux-mm, linux-kernel
On Wed, 22 Jul 2015 01:14:29 +0300 "Kirill A. Shutemov" <kirill@shutemov.name> wrote:
> ping?
Oleg, he's pinging you.
(It's only been 4 days, two of which were weekend. Go review someone's
20-patch series if you want to speed things up ;))
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCHv2 0/6] Make vma_is_anonymous() reliable
2015-07-21 23:39 ` Andrew Morton
@ 2015-07-21 23:54 ` Kirill A. Shutemov
2015-07-22 21:41 ` Oleg Nesterov
1 sibling, 0 replies; 15+ messages in thread
From: Kirill A. Shutemov @ 2015-07-21 23:54 UTC (permalink / raw
To: Andrew Morton; +Cc: Kirill A. Shutemov, Oleg Nesterov, linux-mm, linux-kernel
On Tue, Jul 21, 2015 at 04:39:57PM -0700, Andrew Morton wrote:
> On Wed, 22 Jul 2015 01:14:29 +0300 "Kirill A. Shutemov" <kirill@shutemov.name> wrote:
>
> > ping?
>
> Oleg, he's pinging you.
>
> (It's only been 4 days, two of which were weekend.
I thought the patchset is trivial enough to hit fast-track...
But, fair enough.
> Go review someone's 20-patch series if you want to speed things up ;))
Which one? ;)
--
Kirill A. Shutemov
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCHv2 0/6] Make vma_is_anonymous() reliable
2015-07-21 23:39 ` Andrew Morton
2015-07-21 23:54 ` Kirill A. Shutemov
@ 2015-07-22 21:41 ` Oleg Nesterov
1 sibling, 0 replies; 15+ messages in thread
From: Oleg Nesterov @ 2015-07-22 21:41 UTC (permalink / raw
To: Andrew Morton
Cc: Kirill A. Shutemov, Kirill A. Shutemov, linux-mm, linux-kernel
On 07/21, Andrew Morton wrote:
>
> On Wed, 22 Jul 2015 01:14:29 +0300 "Kirill A. Shutemov" <kirill@shutemov.name> wrote:
>
> > ping?
>
> Oleg, he's pinging you.
Me? ;)
I think this series is fine. I was silent because I think my
opinion is not importand when it comes to changes in mm/.
FWIW,
Reviewed-by: Oleg Nesterov <oleg@redhat.com>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCHv2 2/6] x86, mpx: do not set ->vm_ops on mpx VMAs
2015-07-17 11:53 ` [PATCHv2 2/6] x86, mpx: do not set ->vm_ops on mpx VMAs Kirill A. Shutemov
@ 2015-07-23 20:59 ` Andrew Morton
2015-07-23 21:08 ` Kirill A. Shutemov
0 siblings, 1 reply; 15+ messages in thread
From: Andrew Morton @ 2015-07-23 20:59 UTC (permalink / raw
To: Kirill A. Shutemov
Cc: Oleg Nesterov, linux-mm, linux-kernel, Andy Lutomirski,
Thomas Gleixner
On Fri, 17 Jul 2015 14:53:09 +0300 "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> wrote:
> 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.
mpx.c has changed.
arch/x86/mm/mpx.c: In function 'try_unmap_single_bt':
arch/x86/mm/mpx.c:930: error: implicit declaration of function 'is_mpx_vma'
I'll drop this patch and see what happens.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCHv2 2/6] x86, mpx: do not set ->vm_ops on mpx VMAs
2015-07-23 20:59 ` Andrew Morton
@ 2015-07-23 21:08 ` Kirill A. Shutemov
0 siblings, 0 replies; 15+ messages in thread
From: Kirill A. Shutemov @ 2015-07-23 21:08 UTC (permalink / raw
To: Andrew Morton
Cc: Kirill A. Shutemov, Oleg Nesterov, linux-mm, linux-kernel,
Andy Lutomirski, Thomas Gleixner, Ingo Molnar
On Thu, Jul 23, 2015 at 01:59:11PM -0700, Andrew Morton wrote:
> On Fri, 17 Jul 2015 14:53:09 +0300 "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> wrote:
>
> > 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.
>
> mpx.c has changed.
>
> arch/x86/mm/mpx.c: In function 'try_unmap_single_bt':
> arch/x86/mm/mpx.c:930: error: implicit declaration of function 'is_mpx_vma'
>
> I'll drop this patch and see what happens.
Ingo has applied an updated version to x86/urgent:
https://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/commit/?h=x86/urgent&id=a89652769470d12cd484ee3d3f7bde0742be8d96
--
Kirill A. Shutemov
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2015-07-23 21:09 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-17 11:53 [PATCHv2 0/6] Make vma_is_anonymous() reliable Kirill A. Shutemov
2015-07-17 11:53 ` [PATCHv2 1/6] mm: mark most vm_operations_struct const Kirill A. Shutemov
2015-07-17 12:16 ` Christoph Hellwig
2015-07-17 12:17 ` Kirill A. Shutemov
2015-07-17 11:53 ` [PATCHv2 2/6] x86, mpx: do not set ->vm_ops on mpx VMAs Kirill A. Shutemov
2015-07-23 20:59 ` Andrew Morton
2015-07-23 21:08 ` Kirill A. Shutemov
2015-07-17 11:53 ` [PATCHv2 3/6] mm, mpx: add "vm_flags_t vm_flags" arg to do_mmap_pgoff() Kirill A. Shutemov
2015-07-17 11:53 ` [PATCHv2 4/6] mm: make sure all file VMAs have ->vm_ops set Kirill A. Shutemov
2015-07-17 11:53 ` [PATCHv2 5/6] mm: use vma_is_anonymous() in create_huge_pmd() and wp_huge_pmd() Kirill A. Shutemov
2015-07-17 11:53 ` [PATCHv2 6/6] mm, madvise: use vma_is_anonymous() to check for anon VMA Kirill A. Shutemov
2015-07-21 22:14 ` [PATCHv2 0/6] Make vma_is_anonymous() reliable Kirill A. Shutemov
2015-07-21 23:39 ` Andrew Morton
2015-07-21 23:54 ` Kirill A. Shutemov
2015-07-22 21:41 ` Oleg Nesterov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).