summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Piggin <npiggin@suse.de>2006-12-06 20:31:52 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 08:39:20 -0800
commitf2a2a7108aa0039ba7a5fe7a0d2ecef2219a7584 (patch)
treea82338b774d680ca410830e94c1125fa3b9b693d
parentf3af38d30c18538d069a95e624a3db7c3d486a1e (diff)
downloadlinux-stable-f2a2a7108aa0039ba7a5fe7a0d2ecef2219a7584.tar.gz
linux-stable-f2a2a7108aa0039ba7a5fe7a0d2ecef2219a7584.tar.bz2
linux-stable-f2a2a7108aa0039ba7a5fe7a0d2ecef2219a7584.zip
[PATCH] oom: less memdie
Don't cause all threads in all other thread groups to gain TIF_MEMDIE otherwise we'll get a thundering herd eating our memory reserve. This may not be the optimal scheme, but it fits our policy of allowing just one TIF_MEMDIE in the system at once. Signed-off-by: Nick Piggin <npiggin@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--mm/oom_kill.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index a6879f22eb30..223d9ccb7d64 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -323,11 +323,12 @@ static int oom_kill_task(struct task_struct *p)
/*
* kill all processes that share the ->mm (i.e. all threads),
- * but are in a different thread group.
+ * but are in a different thread group. Don't let them have access
+ * to memory reserves though, otherwise we might deplete all memory.
*/
do_each_thread(g, q) {
if (q->mm == mm && q->tgid != p->tgid)
- __oom_kill_task(q, 1);
+ force_sig(SIGKILL, p);
} while_each_thread(g, q);
return 0;