From: Glauber Costa <glommer@parallels.com>
To: linux-kernel@vger.kernel.org
Cc: linux-mm@kvack.org, cgroups@vger.kernel.org, devel@openvz.org,
Michal Hocko <mhocko@suse.cz>,
Johannes Weiner <hannes@cmpxchg.org>,
Andrew Morton <akpm@linux-foundation.org>,
kamezawa.hiroyu@jp.fujitsu.com, Christoph Lameter <cl@linux.com>,
David Rientjes <rientjes@google.com>,
Pekka Enberg <penberg@kernel.org>,
Glauber Costa <glommer@parallels.com>,
Pekka Enberg <penberg@cs.helsinki.fi>,
Suleiman Souhlal <suleiman@google.com>
Subject: [PATCH v2 11/11] protect architectures where THREAD_SIZE >= PAGE_SIZE against fork bombs
Date: Thu, 9 Aug 2012 17:01:19 +0400 [thread overview]
Message-ID: <1344517279-30646-12-git-send-email-glommer@parallels.com> (raw)
In-Reply-To: <1344517279-30646-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>
Acked-by: Frederic Weisbecker <fweisbec@redhat.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>
---
include/linux/thread_info.h | 2 ++
kernel/fork.c | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
index ccc1899..e7e0473 100644
--- a/include/linux/thread_info.h
+++ b/include/linux/thread_info.h
@@ -61,6 +61,8 @@ extern long do_no_restart_syscall(struct restart_block *parm);
# define THREADINFO_GFP (GFP_KERNEL | __GFP_NOTRACK)
#endif
+#define THREADINFO_GFP_ACCOUNTED (THREADINFO_GFP | __GFP_KMEMCG)
+
/*
* flag set/clear/test wrappers
* - pass TIF_xxxx constants to these functions
diff --git a/kernel/fork.c b/kernel/fork.c
index dc3ff16..b0b90c3 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.11.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>
next prev parent reply other threads:[~2012-08-09 13:02 UTC|newest]
Thread overview: 135+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-09 13:01 [PATCH v2 00/11] Request for Inclusion: kmem controller for memcg Glauber Costa
2012-08-09 13:01 ` [PATCH v2 01/11] memcg: Make it possible to use the stock for more than one page Glauber Costa
2012-08-10 15:12 ` Michal Hocko
2012-08-09 13:01 ` [PATCH v2 02/11] memcg: Reclaim when more than one page needed Glauber Costa
2012-08-10 15:42 ` Michal Hocko
2012-08-10 16:49 ` Kamezawa Hiroyuki
2012-08-10 17:28 ` Michal Hocko
2012-08-10 17:56 ` Kamezawa Hiroyuki
2012-08-10 17:30 ` Michal Hocko
2012-08-10 18:52 ` Michal Hocko
2012-08-10 18:54 ` Michal Hocko
2012-08-13 8:05 ` Glauber Costa
2012-08-13 13:10 ` Michal Hocko
2012-08-09 13:01 ` [PATCH v2 03/11] memcg: change defines to an enum Glauber Costa
2012-08-10 15:43 ` Michal Hocko
2012-08-09 13:01 ` [PATCH v2 04/11] kmem accounting basic infrastructure Glauber Costa
2012-08-10 17:02 ` Kamezawa Hiroyuki
2012-08-13 8:36 ` Glauber Costa
2012-08-17 2:38 ` Kamezawa Hiroyuki
2012-08-14 16:21 ` Michal Hocko
2012-08-15 9:33 ` Glauber Costa
2012-08-15 11:12 ` James Bottomley
2012-08-15 12:55 ` Michal Hocko
2012-08-15 13:29 ` James Bottomley
2012-08-15 12:39 ` Michal Hocko
2012-08-15 12:53 ` Glauber Costa
2012-08-15 13:02 ` Michal Hocko
2012-08-15 13:04 ` Glauber Costa
2012-08-15 13:26 ` Michal Hocko
2012-08-15 13:31 ` Glauber Costa
2012-08-15 14:10 ` Michal Hocko
2012-08-15 14:11 ` Glauber Costa
2012-08-15 14:47 ` Christoph Lameter
2012-08-15 15:11 ` Glauber Costa
2012-08-15 15:34 ` Christoph Lameter
2012-08-15 15:35 ` Glauber Costa
2012-08-15 17:26 ` Christoph Lameter
2012-08-15 18:11 ` Ying Han
2012-08-15 18:25 ` Christoph Lameter
2012-08-15 19:22 ` Glauber Costa
2012-08-15 18:07 ` Ying Han
2012-08-15 15:19 ` Greg Thelen
2012-08-15 15:36 ` Christoph Lameter
2012-08-15 18:01 ` Ying Han
2012-08-15 18:00 ` Glauber Costa
2012-08-15 19:50 ` Ying Han
2012-08-16 15:25 ` Michal Hocko
2012-08-17 5:58 ` Ying Han
2012-08-09 13:01 ` [PATCH v2 05/11] Add a __GFP_KMEMCG flag Glauber Costa
2012-08-10 17:07 ` Kamezawa Hiroyuki
2012-08-09 13:01 ` [PATCH v2 06/11] memcg: kmem controller infrastructure Glauber Costa
2012-08-10 17:27 ` Kamezawa Hiroyuki
2012-08-13 8:28 ` Glauber Costa
2012-08-14 18:58 ` Greg Thelen
2012-08-15 9:18 ` Glauber Costa
2012-08-15 16:38 ` Greg Thelen
2012-08-15 17:00 ` Glauber Costa
2012-08-15 17:12 ` Greg Thelen
2012-08-15 19:31 ` Glauber Costa
2012-08-16 3:37 ` Greg Thelen
2012-08-16 7:47 ` Glauber Costa
2012-08-20 13:36 ` Kamezawa Hiroyuki
2012-08-20 15:29 ` Glauber Costa
2012-08-17 2:36 ` Kamezawa Hiroyuki
2012-08-17 7:04 ` Glauber Costa
2012-08-14 11:00 ` Glauber Costa
2012-08-11 5:11 ` Greg Thelen
2012-08-13 8:07 ` Glauber Costa
2012-08-13 9:59 ` Glauber Costa
2012-08-13 21:21 ` Greg Thelen
2012-08-14 17:25 ` Michal Hocko
2012-08-15 9:42 ` Glauber Costa
2012-08-15 10:44 ` Glauber Costa
2012-08-15 13:09 ` Michal Hocko
2012-08-15 14:01 ` Glauber Costa
2012-08-15 14:23 ` Michal Hocko
2012-08-15 14:27 ` Glauber Costa
2012-08-16 9:53 ` Michal Hocko
2012-08-16 9:57 ` Glauber Costa
2012-08-16 15:05 ` Michal Hocko
2012-08-16 15:22 ` Glauber Costa
2012-08-21 21:50 ` Greg Thelen
2012-08-22 8:35 ` Glauber Costa
2012-08-23 0:07 ` Greg Thelen
2012-08-23 7:51 ` Glauber Costa
2012-08-09 13:01 ` [PATCH v2 07/11] mm: Allocate kernel pages to the right memcg Glauber Costa
2012-08-09 16:33 ` Greg Thelen
2012-08-09 16:42 ` Glauber Costa
2012-08-10 17:33 ` Kamezawa Hiroyuki
2012-08-13 8:03 ` Glauber Costa
2012-08-13 8:57 ` Mel Gorman
2012-08-10 17:36 ` Greg Thelen
2012-08-13 8:02 ` Glauber Costa
2012-08-14 15:16 ` Mel Gorman
2012-08-15 9:08 ` Glauber Costa
2012-08-15 13:22 ` Mel Gorman
2012-08-15 13:39 ` Glauber Costa
2012-08-15 13:51 ` Glauber Costa
2012-08-15 9:24 ` Michal Hocko
2012-08-09 13:01 ` [PATCH v2 08/11] memcg: disable kmem code when not in use Glauber Costa
2012-08-17 7:02 ` Michal Hocko
2012-08-17 7:01 ` Glauber Costa
2012-08-17 8:04 ` Michal Hocko
2012-08-09 13:01 ` [PATCH v2 09/11] memcg: propagate kmem limiting information to children Glauber Costa
2012-08-10 17:51 ` Kamezawa Hiroyuki
2012-08-13 8:01 ` Glauber Costa
2012-08-17 9:00 ` Michal Hocko
2012-08-17 9:15 ` Glauber Costa
2012-08-17 9:35 ` Michal Hocko
2012-08-17 10:07 ` Glauber Costa
2012-08-17 10:35 ` Michal Hocko
2012-08-17 10:36 ` Glauber Costa
2012-08-21 7:54 ` Michal Hocko
2012-08-21 8:35 ` Michal Hocko
2012-08-21 9:17 ` Glauber Costa
2012-08-21 9:22 ` Glauber Costa
2012-08-21 10:00 ` Michal Hocko
2012-08-21 10:01 ` Glauber Costa
2012-08-22 1:09 ` Greg Thelen
2012-08-22 8:22 ` Glauber Costa
2012-08-22 23:23 ` Greg Thelen
2012-08-23 7:55 ` Glauber Costa
2012-08-24 5:06 ` Greg Thelen
2012-08-24 5:23 ` Glauber Costa
2012-08-17 10:39 ` Glauber Costa
2012-08-09 13:01 ` [PATCH v2 10/11] memcg: allow a memcg with kmem charges to be destructed Glauber Costa
2012-08-21 8:22 ` Michal Hocko
2012-08-22 8:36 ` Glauber Costa
2012-08-09 13:01 ` Glauber Costa [this message]
2012-08-10 17:54 ` [PATCH v2 11/11] protect architectures where THREAD_SIZE >= PAGE_SIZE against fork bombs Kamezawa Hiroyuki
2012-08-21 9:35 ` Michal Hocko
2012-08-21 9:40 ` Glauber Costa
2012-08-21 10:57 ` Michal Hocko
2012-08-17 21:37 ` [PATCH v2 00/11] Request for Inclusion: kmem controller for memcg Ying Han
2012-08-20 7:51 ` 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=1344517279-30646-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=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 \
/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