linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Glauber Costa <glommer@parallels.com>
To: cgroups@vger.kernel.org
Cc: linux-mm@kvack.org, Andrew Morton <akpm@linux-foundation.org>,
	linux-kernel@vger.kernel.org,
	Frederic Weisbecker <fweisbec@gmail.com>,
	David Rientjes <rientjes@google.com>,
	Pekka Enberg <penberg@kernel.org>, Michal Hocko <mhocko@suse.cz>,
	Johannes Weiner <hannes@cmpxchg.org>,
	Christoph Lameter <cl@linux.com>,
	devel@openvz.org, kamezawa.hiroyu@jp.fujitsu.com,
	Tejun Heo <tj@kernel.org>, Glauber Costa <glommer@parallels.com>,
	Pekka Enberg <penberg@cs.helsinki.fi>,
	Suleiman Souhlal <suleiman@google.com>,
	Frederic Weisbecker <fweisbec@redhat.com>
Subject: [PATCH 11/11] protect architectures where THREAD_SIZE >= PAGE_SIZE against fork bombs
Date: Mon, 25 Jun 2012 18:15:28 +0400	[thread overview]
Message-ID: <1340633728-12785-12-git-send-email-glommer@parallels.com> (raw)
In-Reply-To: <1340633728-12785-1-git-send-email-glommer@parallels.com>

Because those architectures will draw their stacks directly from
the page allocator, rather than the slab cache, we can directly
pass __GFP_KMEMCG flag, and issue the corresponding free_pages.

This code path is taken when the architecture doesn't define
CONFIG_ARCH_THREAD_INFO_ALLOCATOR (only ia64 seems to), and has
THREAD_SIZE >= PAGE_SIZE. Luckily, most - if not all - of the
remaining architectures fall in this category.

This will guarantee that every stack page is accounted to the memcg
the process currently lives on, and will have the allocations to fail
if they go over limit.

For the time being, I am defining a new variant of THREADINFO_GFP, not
to mess with the other path. Once the slab is also tracked by memcg,
we can get rid of that flag.

Tested to successfully protect against :(){ :|:& };:

Signed-off-by: Glauber Costa <glommer@parallels.com>
CC: Christoph Lameter <cl@linux.com>
CC: Pekka Enberg <penberg@cs.helsinki.fi>
CC: Michal Hocko <mhocko@suse.cz>
CC: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
CC: Johannes Weiner <hannes@cmpxchg.org>
CC: Suleiman Souhlal <suleiman@google.com>
CC: Frederic Weisbecker <fweisbec@redhat.com>
---
 include/linux/thread_info.h |    6 ++++++
 kernel/fork.c               |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
index ccc1899..914ec07 100644
--- a/include/linux/thread_info.h
+++ b/include/linux/thread_info.h
@@ -61,6 +61,12 @@ extern long do_no_restart_syscall(struct restart_block *parm);
 # define THREADINFO_GFP		(GFP_KERNEL | __GFP_NOTRACK)
 #endif
 
+#ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM
+# define THREADINFO_GFP_ACCOUNTED (THREADINFO_GFP | __GFP_KMEMCG)
+#else
+# define THREADINFO_GFP_ACCOUNTED (THREADINFO_GFP)
+#endif
+
 /*
  * flag set/clear/test wrappers
  * - pass TIF_xxxx constants to these functions
diff --git a/kernel/fork.c b/kernel/fork.c
index ab5211b..06b414f 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -142,7 +142,7 @@ void __weak arch_release_thread_info(struct thread_info *ti) { }
 static struct thread_info *alloc_thread_info_node(struct task_struct *tsk,
 						  int node)
 {
-	struct page *page = alloc_pages_node(node, THREADINFO_GFP,
+	struct page *page = alloc_pages_node(node, THREADINFO_GFP_ACCOUNTED,
 					     THREAD_SIZE_ORDER);
 
 	return page ? page_address(page) : NULL;
@@ -151,7 +151,7 @@ static struct thread_info *alloc_thread_info_node(struct task_struct *tsk,
 static inline void free_thread_info(struct thread_info *ti)
 {
 	arch_release_thread_info(ti);
-	free_pages((unsigned long)ti, THREAD_SIZE_ORDER);
+	free_accounted_pages((unsigned long)ti, THREAD_SIZE_ORDER);
 }
 # else
 static struct kmem_cache *thread_info_cache;
-- 
1.7.10.2

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

  parent reply	other threads:[~2012-06-25 14:20 UTC|newest]

Thread overview: 96+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-25 14:15 [PATCH 00/11] kmem controller for memcg: stripped down version Glauber Costa
2012-06-25 14:15 ` [PATCH 01/11] memcg: Make it possible to use the stock for more than one page Glauber Costa
2012-06-25 17:44   ` Tejun Heo
2012-06-25 22:29     ` Glauber Costa
2012-06-25 22:33       ` Tejun Heo
2012-06-26  4:01   ` David Rientjes
2012-06-25 14:15 ` [PATCH 02/11] memcg: Reclaim when more than one page needed Glauber Costa
2012-06-25 23:33   ` Suleiman Souhlal
2012-06-26  8:39     ` Glauber Costa
2012-06-27 16:16       ` Suleiman Souhlal
2012-06-26  4:09   ` David Rientjes
2012-06-26  7:12     ` Glauber Costa
2012-06-26  8:54       ` David Rientjes
2012-06-26  9:08         ` Glauber Costa
2012-06-26  9:17           ` David Rientjes
2012-06-26  9:23             ` Glauber Costa
2012-06-27 10:03     ` Glauber Costa
2012-06-27 19:48       ` David Rientjes
2012-06-27 20:47         ` Glauber Costa
2012-06-25 14:15 ` [PATCH 03/11] memcg: change defines to an enum Glauber Costa
2012-06-26  4:11   ` David Rientjes
2012-06-26  8:28     ` Glauber Costa
2012-06-26  9:01       ` David Rientjes
2012-06-25 14:15 ` [PATCH 04/11] kmem slab accounting basic infrastructure Glauber Costa
2012-06-26  4:22   ` David Rientjes
2012-06-26  7:09     ` Glauber Costa
2012-06-25 14:15 ` [PATCH 05/11] Add a __GFP_KMEMCG flag Glauber Costa
2012-06-26  4:25   ` David Rientjes
2012-06-26  7:08     ` Glauber Costa
2012-06-26  9:03       ` David Rientjes
2012-06-25 14:15 ` [PATCH 06/11] memcg: kmem controller infrastructure Glauber Costa
2012-06-25 18:06   ` Tejun Heo
2012-06-25 22:28     ` Glauber Costa
2012-06-25 23:17   ` Andrew Morton
2012-06-26 14:40     ` Glauber Costa
2012-06-26 15:01     ` Glauber Costa
2012-06-26 18:01       ` Andrew Morton
2012-06-26 18:08         ` Tejun Heo
2012-06-26 18:14         ` Glauber Costa
2012-06-26 19:20           ` Andrew Morton
2012-06-26 15:29     ` Glauber Costa
2012-06-26  9:12   ` David Rientjes
2012-06-26  9:17     ` Glauber Costa
2012-06-27  4:01       ` David Rientjes
2012-06-27  9:33         ` Glauber Costa
2012-06-27 19:46           ` David Rientjes
2012-06-25 14:15 ` [PATCH 07/11] mm: Allocate kernel pages to the right memcg Glauber Costa
2012-06-25 18:07   ` Tejun Heo
2012-06-25 22:27     ` Glauber Costa
2012-06-25 14:15 ` [PATCH 08/11] memcg: disable kmem code when not in use Glauber Costa
2012-06-26  5:51   ` Kamezawa Hiroyuki
2012-06-25 14:15 ` [PATCH 09/11] memcg: propagate kmem limiting information to children Glauber Costa
2012-06-25 18:29   ` Tejun Heo
2012-06-25 22:36     ` Glauber Costa
2012-06-25 22:49       ` Tejun Heo
2012-06-25 23:21       ` Andrew Morton
2012-06-26  5:23         ` David Rientjes
2012-06-25 23:23   ` Andrew Morton
2012-06-26  5:24     ` David Rientjes
2012-06-26  5:31       ` Andrew Morton
2012-06-26  7:23         ` Glauber Costa
2012-06-25 14:15 ` [PATCH 10/11] memcg: allow a memcg with kmem charges to be destructed Glauber Costa
2012-06-25 18:34   ` Tejun Heo
2012-06-25 22:25     ` Glauber Costa
2012-06-26  5:59   ` Kamezawa Hiroyuki
2012-06-26  7:21     ` Glauber Costa
2012-06-25 14:15 ` Glauber Costa [this message]
2012-06-25 16:55   ` [PATCH 11/11] protect architectures where THREAD_SIZE >= PAGE_SIZE against fork bombs Frederic Weisbecker
2012-06-25 18:38     ` Tejun Heo
2012-06-25 20:57       ` Frederic Weisbecker
2012-06-26 12:48       ` Glauber Costa
2012-06-26 13:38         ` Frederic Weisbecker
2012-06-26 13:37           ` Glauber Costa
2012-06-26 13:44             ` Frederic Weisbecker
2012-06-26  4:57   ` David Rientjes
2012-06-26  5:35     ` Kamezawa Hiroyuki
2012-06-26  7:23     ` Glauber Costa
2012-06-26  8:45       ` David Rientjes
2012-06-26  8:44         ` Glauber Costa
2012-06-26  9:05           ` David Rientjes
2012-06-25 23:27 ` [PATCH 00/11] kmem controller for memcg: stripped down version Andrew Morton
2012-06-26  7:17   ` Glauber Costa
2012-06-26 21:55     ` Andrew Morton
2012-06-27  1:08       ` David Rientjes
2012-06-27  8:39         ` Glauber Costa
2012-06-27  9:29       ` Fork bomb limitation in memcg WAS: " Glauber Costa
2012-06-27 12:29         ` Frederic Weisbecker
2012-06-27 12:28           ` Glauber Costa
2012-06-27 12:35             ` Frederic Weisbecker
2012-06-27 19:38         ` David Rientjes
2012-06-28  9:01           ` Glauber Costa
2012-06-28 22:25             ` Andrew Morton
2012-07-03 11:38               ` Glauber Costa
2012-07-12 15:40                 ` Frederic Weisbecker
2012-08-07 13:59               ` Glauber Costa
2012-08-08 14:15                 ` Glauber Costa

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=1340633728-12785-12-git-send-email-glommer@parallels.com \
    --to=glommer@parallels.com \
    --cc=akpm@linux-foundation.org \
    --cc=cgroups@vger.kernel.org \
    --cc=cl@linux.com \
    --cc=devel@openvz.org \
    --cc=fweisbec@gmail.com \
    --cc=fweisbec@redhat.com \
    --cc=hannes@cmpxchg.org \
    --cc=kamezawa.hiroyu@jp.fujitsu.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mhocko@suse.cz \
    --cc=penberg@cs.helsinki.fi \
    --cc=penberg@kernel.org \
    --cc=rientjes@google.com \
    --cc=suleiman@google.com \
    --cc=tj@kernel.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