From: Matthew Wilcox <willy@infradead.org>
To: linux-mm@kvack.org
Cc: kernel-hardening@lists.openwall.com,
linux-kernel@vger.kernel.org,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Subject: Re: [RFC] Handle mapcount overflows
Date: Fri, 2 Mar 2018 14:03:40 -0800 [thread overview]
Message-ID: <20180302220340.GC671@bombadil.infradead.org> (raw)
In-Reply-To: <20180302212637.GB671@bombadil.infradead.org>
On Fri, Mar 02, 2018 at 01:26:37PM -0800, Matthew Wilcox wrote:
> Here's my third effort to handle page->_mapcount overflows.
If you like this approach, but wonder if it works, here's a little forkbomb
of a program and a patch to add instrumentation.
In my dmesg, I never see the max mapcount getting above 65539. I see a mix
of unlucky, it him! and it me! messages.
#define _GNU_SOURCE
#include <sys/mman.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
#include <stdio.h>
int dummy;
int main(int argc, char **argv)
{
int fd = open(argv[1], O_RDWR);
int i;
if (fd < 0) {
perror(argv[1]);
return 1;
}
// Spawn 511 children
for (i = 0; i < 9; i++)
fork();
for (i = 0; i < 5000; i++)
dummy = *(int *)mmap(NULL, 4096, PROT_READ, MAP_SHARED, fd, 0);
}
diff --git a/mm/mmap.c b/mm/mmap.c
index 575766ec02f8..2b6187156db0 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -1325,7 +1325,7 @@ static inline int mlock_future_check(struct mm_struct *mm,
* Experimentally determined. gnome-shell currently uses fewer than
* 3000 mappings, so should have zero effect on desktop users.
*/
-#define mm_track_threshold 5000
+#define mm_track_threshold 50
static DEFINE_SPINLOCK(heavy_users_lock);
static DEFINE_IDR(heavy_users);
@@ -1377,9 +1377,11 @@ static void kill_abuser(struct mm_struct *mm)
break;
if (down_write_trylock(&mm->mmap_sem)) {
+ printk_ratelimited("it him!\n");
kill_mm(tsk);
up_write(&mm->mmap_sem);
} else {
+ printk_ratelimited("unlucky!\n");
do_send_sig_info(SIGKILL, SEND_SIG_FORCED, tsk, true);
}
}
@@ -1396,8 +1398,10 @@ void mm_mapcount_overflow(struct page *page)
vma_interval_tree_foreach(vma, &mapping->i_mmap, pgoff, pgoff + 1) {
if (vma->vm_mm == entry)
count++;
- if (count > 1000)
+ if (count > 1000) {
+ printk_ratelimited("it me!\n");
kill_mm(current);
+ }
}
rcu_read_lock();
@@ -1408,7 +1412,7 @@ void mm_mapcount_overflow(struct page *page)
pgoff, pgoff + 1) {
if (vma->vm_mm == entry)
count++;
- if (count > 1000) {
+ if (count > 10) {
kill_abuser(entry);
goto out;
}
diff --git a/mm/rmap.c b/mm/rmap.c
index d88acf5c98e9..3f0509f6f011 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -1190,6 +1190,7 @@ void page_add_file_rmap(struct page *page, bool compound)
VM_BUG_ON_PAGE(!PageSwapBacked(page), page);
__inc_node_page_state(page, NR_SHMEM_PMDMAPPED);
} else {
+ static int max = 0;
int v;
if (PageTransCompound(page) && page_mapping(page)) {
VM_WARN_ON_ONCE(!PageLocked(page));
@@ -1199,12 +1200,14 @@ void page_add_file_rmap(struct page *page, bool compound)
clear_page_mlock(compound_head(page));
}
v = atomic_inc_return(&page->_mapcount);
- if (likely(v > 0))
- goto out;
- if (unlikely(v < 0)) {
+ if (unlikely(v > 65535)) {
+ if (max < v) max = v;
+ printk_ratelimited("overflow %d max %d\n", v, max);
mm_mapcount_overflow(page);
goto out;
}
+ if (likely(v > 0))
+ goto out;
}
__mod_lruvec_page_state(page, NR_FILE_MAPPED, nr);
out:
next prev parent reply other threads:[~2018-03-02 22:03 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-08 2:11 [RFC] Warn the user when they could overflow mapcount Matthew Wilcox
2018-02-08 2:56 ` Jann Horn
2018-02-08 4:04 ` Matthew Wilcox
2018-02-08 17:58 ` valdis.kletnieks
2018-02-08 18:05 ` Daniel Micay
2018-02-08 18:56 ` Matthew Wilcox
2018-02-08 19:33 ` Daniel Micay
2018-02-08 19:42 ` Matthew Wilcox
2018-02-08 19:48 ` Daniel Micay
2018-02-08 20:21 ` Matthew Wilcox
2018-02-08 21:37 ` [RFC] Limit mappings to ten per page per process Matthew Wilcox
2018-02-09 4:26 ` Kirill A. Shutemov
2018-02-14 13:51 ` Matthew Wilcox
2018-02-14 14:05 ` Kirill A. Shutemov
2018-02-09 1:47 ` [RFC] Warn the user when they could overflow mapcount Daniel Micay
2018-02-08 3:18 ` Tobin C. Harding
2018-02-08 4:06 ` Matthew Wilcox
2018-03-02 21:26 ` [RFC] Handle mapcount overflows Matthew Wilcox
2018-03-02 22:03 ` Matthew Wilcox [this message]
2019-05-01 14:41 ` Jann Horn
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=20180302220340.GC671@bombadil.infradead.org \
--to=willy@infradead.org \
--cc=kernel-hardening@lists.openwall.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/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 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 NNTP newsgroup(s).