From: Nick Piggin Date: Thu, 7 Dec 2006 04:31:52 +0000 (-0800) Subject: [PATCH] oom: less memdie X-Git-Tag: v2.6.20-rc1~145^2^2~351 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f2a2a7108aa0039ba7a5fe7a0d2ecef2219a7584;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/mm/oom_kill.c b/mm/oom_kill.c index a6879f22eb3..223d9ccb7d6 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;