Commit c33e0fca authored by Nick Piggin's avatar Nick Piggin Committed by Linus Torvalds

[PATCH] oom: don't kill unkillable children or siblings

Abort the kill if any of our threads have OOM_DISABLE set.  Having this
test here also prevents any OOM_DISABLE child of the "selected" process
from being killed.
Signed-off-by: default avatarNick Piggin <npiggin@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7253f4ef
...@@ -313,15 +313,24 @@ static int oom_kill_task(struct task_struct *p, const char *message) ...@@ -313,15 +313,24 @@ static int oom_kill_task(struct task_struct *p, const char *message)
if (mm == NULL) if (mm == NULL)
return 1; return 1;
/*
* Don't kill the process if any threads are set to OOM_DISABLE
*/
do_each_thread(g, q) {
if (q->mm == mm && p->oomkilladj == OOM_DISABLE)
return 1;
} while_each_thread(g, q);
__oom_kill_task(p, message); __oom_kill_task(p, message);
/* /*
* kill all processes that share the ->mm (i.e. all threads), * 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
*/ */
do_each_thread(g, q) do_each_thread(g, q) {
if (q->mm == mm && q->tgid != p->tgid) if (q->mm == mm && q->tgid != p->tgid)
__oom_kill_task(q, message); __oom_kill_task(q, message);
while_each_thread(g, q); } while_each_thread(g, q);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment