From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
To: Will Deacon <will.deacon@arm.com>
Cc: kirill.shutemov@linux.intel.com, oleg@redhat.com, hpa@zytor.com,
luto@amacapital.net, dave.hansen@linux.intel.com, mingo@elte.hu,
minchan@kernel.org, tglx@linutronix.de, linux-mm@kvack.org,
linux-kernel@vger.kernel.org
Subject: RE: LTP regressions due to 6dc296e7df4c ("mm: make sure all file VMAs have ->vm_ops set")
Date: Mon, 14 Sep 2015 14:57:59 +0300 (EEST) [thread overview]
Message-ID: <20150914115800.06242CE@black.fi.intel.com> (raw)
In-Reply-To: <20150914105346.GB23878@arm.com>
Will Deacon wrote:
> Hi Kirill,
>
> Your patch 6dc296e7df4c ("mm: make sure all file VMAs have ->vm_ops set")
> causes some mmap regressions in LTP, which appears to use a MAP_PRIVATE
> mmap of /dev/zero as a way to get anonymous pages in some of its tests
> (specifically mmap10 [1]).
>
> Dead simple reproducer below. Is this change in behaviour intentional?
Ouch. Of couse it's a bug.
Fix is below. I don't really like it, but I cannot find any better
solution.
WARNING: multiple messages have this Message-ID (diff)
From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
To: Will Deacon <will.deacon@arm.com>
Cc: kirill.shutemov@linux.intel.com, oleg@redhat.com, hpa@zytor.com,
luto@amacapital.net, dave.hansen@linux.intel.com, mingo@elte.hu,
minchan@kernel.org, tglx@linutronix.de, linux-mm@kvack.org,
linux-kernel@vger.kernel.org
Subject: RE: LTP regressions due to 6dc296e7df4c ("mm: make sure all file VMAs have ->vm_ops set")
Date: Mon, 14 Sep 2015 14:57:59 +0300 (EEST) [thread overview]
Message-ID: <20150914115800.06242CE@black.fi.intel.com> (raw)
In-Reply-To: <20150914105346.GB23878@arm.com>
Will Deacon wrote:
> Hi Kirill,
>
> Your patch 6dc296e7df4c ("mm: make sure all file VMAs have ->vm_ops set")
> causes some mmap regressions in LTP, which appears to use a MAP_PRIVATE
> mmap of /dev/zero as a way to get anonymous pages in some of its tests
> (specifically mmap10 [1]).
>
> Dead simple reproducer below. Is this change in behaviour intentional?
Ouch. Of couse it's a bug.
Fix is below. I don't really like it, but I cannot find any better
solution.
>From 97be4458fd63758b0c233e528bf952d1cd26428e Mon Sep 17 00:00:00 2001
From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Date: Mon, 14 Sep 2015 14:44:32 +0300
Subject: [PATCH] mm: fix mmap(MAP_PRIVATE) on /dev/zero
In attempt to make mm less fragile I've screwed up setting up anonymous
mappings by mmap() on /dev/zero.
Here's the fix.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Fixes: 6dc296e7df4c ("mm: make sure all file VMAs have ->vm_ops set")
Reported-by: Will Deacon <will.deacon@arm.com>
---
drivers/char/mem.c | 2 +-
include/linux/mm.h | 1 +
mm/mmap.c | 6 ++++--
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 6b1721f978c2..c8fe3af4de29 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -651,7 +651,7 @@ static ssize_t read_iter_zero(struct kiocb *iocb, struct iov_iter *iter)
return written;
}
-static int mmap_zero(struct file *file, struct vm_area_struct *vma)
+int mmap_zero(struct file *file, struct vm_area_struct *vma)
{
#ifndef CONFIG_MMU
return -ENOSYS;
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 91c08f6f0dc9..5e152e9588ec 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -1066,6 +1066,7 @@ extern void pagefault_out_of_memory(void);
extern void show_free_areas(unsigned int flags);
extern bool skip_free_areas_node(unsigned int flags, int nid);
+int mmap_zero(struct file *file, struct vm_area_struct *vma);
int shmem_zero_setup(struct vm_area_struct *);
#ifdef CONFIG_SHMEM
bool shmem_mapping(struct address_space *mapping);
diff --git a/mm/mmap.c b/mm/mmap.c
index 971dd2cb77d2..7960fd206a2f 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -612,7 +612,9 @@ 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");
+ WARN_ONCE(vma->vm_file && !vma->vm_ops &&
+ vma->vm_file->f_op->mmap != mmap_zero,
+ "missing vma->vm_ops");
/* Update tracking information for the gap following the new vma. */
if (vma->vm_next)
@@ -1639,7 +1641,7 @@ 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) {
+ if (!vma->vm_ops && file->f_op->mmap != &mmap_zero) {
static const struct vm_operations_struct dummy_ops = {};
vma->vm_ops = &dummy_ops;
}
--
2.5.1
next prev parent reply other threads:[~2015-09-14 11:58 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-14 10:53 LTP regressions due to 6dc296e7df4c ("mm: make sure all file VMAs have ->vm_ops set") Will Deacon
2015-09-14 10:53 ` Will Deacon
2015-09-14 11:57 ` Kirill A. Shutemov [this message]
2015-09-14 11:57 ` Kirill A. Shutemov
2015-09-14 13:22 ` Will Deacon
2015-09-14 13:22 ` Will Deacon
2015-09-14 17:05 ` Oleg Nesterov
2015-09-14 17:05 ` Oleg Nesterov
2015-09-14 17:46 ` Oleg Nesterov
2015-09-14 17:46 ` Oleg Nesterov
2015-09-14 18:20 ` Kirill A. Shutemov
2015-09-14 18:20 ` Kirill A. Shutemov
2015-09-15 12:12 ` Oleg Nesterov
2015-09-15 12:12 ` Oleg Nesterov
2015-09-15 13:42 ` Kirill A. Shutemov
2015-09-15 13:42 ` Kirill A. Shutemov
2015-09-15 15:13 ` Oleg Nesterov
2015-09-15 15:13 ` Oleg Nesterov
2015-09-16 21:28 ` Andrew Morton
2015-09-16 21:28 ` Andrew Morton
2015-09-17 15:37 ` Kirill A. Shutemov
2015-09-17 15:37 ` Kirill A. Shutemov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150914115800.06242CE@black.fi.intel.com \
--to=kirill.shutemov@linux.intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=luto@amacapital.net \
--cc=minchan@kernel.org \
--cc=mingo@elte.hu \
--cc=oleg@redhat.com \
--cc=tglx@linutronix.de \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.