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

Commit 7c59aec8 authored by KOSAKI Motohiro's avatar KOSAKI Motohiro Committed by Linus Torvalds
Browse files

oom: don't try to kill oom_unkillable child 



Presently, badness() doesn't care about either CPUSET nor mempolicy.  Then
if the victim child process have disjoint nodemask, OOM Killer might kill
innocent process.

This patch fixes it.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Reviewed-by: default avatarMinchan Kim <minchan.kim@gmail.com>
Cc: Minchan Kim <minchan.kim@gmail.com>
Cc: David Rientjes <rientjes@google.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1489fa14

mm/oom_kill.c

+6 −3
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static int oom_kill_task(struct task_struct *p) 


static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,

			    unsigned long points, struct mem_cgroup *mem,

			    const char *message)

			    nodemask_t *nodemask, const char *message)

{

	struct task_struct *victim = p;

	struct task_struct *child;
@@ -469,6 +469,8 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order, 
				continue;

			if (mem && !task_in_mem_cgroup(child, mem))

				continue;

			if (!has_intersects_mems_allowed(child, nodemask))

				continue;



			/* badness() returns 0 if the thread is unkillable */

			child_points = badness(child, uptime.tv_sec);
@@ -519,7 +521,7 @@ void mem_cgroup_out_of_memory(struct mem_cgroup *mem, gfp_t gfp_mask) 
	if (!p || PTR_ERR(p) == -1UL)

		goto out;



	if (oom_kill_process(p, gfp_mask, 0, points, mem,

	if (oom_kill_process(p, gfp_mask, 0, points, mem, NULL,

				"Memory cgroup out of memory"))

		goto retry;

out:
@@ -679,6 +681,7 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, 
		 * the tasklist scan.

		 */

		if (!oom_kill_process(current, gfp_mask, order, 0, NULL,

				nodemask,

				"Out of memory (oom_kill_allocating_task)"))

			return;

	}
@@ -697,7 +700,7 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, 
		panic("Out of memory and no killable processes...\n");

	}



	if (oom_kill_process(p, gfp_mask, order, points, NULL,

	if (oom_kill_process(p, gfp_mask, order, points, NULL, nodemask,

			     "Out of memory"))

		goto retry;

	read_unlock(&tasklist_lock);