Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

mm/oom_kill.c

+11 −2
Original line number Diff line number Diff line
@@ -313,15 +313,24 @@ static int oom_kill_task(struct task_struct *p, const char *message) 
	if (mm == NULL)

		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);



	/*

	 * kill all processes that share the ->mm (i.e. all threads),

	 * 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)

			__oom_kill_task(q, message);

	while_each_thread(g, q);

	} while_each_thread(g, q);



	return 0;

}