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

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
...@@ -429,7 +429,7 @@ static int oom_kill_task(struct task_struct *p) ...@@ -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, static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
unsigned long points, struct mem_cgroup *mem, unsigned long points, struct mem_cgroup *mem,
const char *message) nodemask_t *nodemask, const char *message)
{ {
struct task_struct *victim = p; struct task_struct *victim = p;
struct task_struct *child; struct task_struct *child;
...@@ -469,6 +469,8 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order, ...@@ -469,6 +469,8 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
continue; continue;
if (mem && !task_in_mem_cgroup(child, mem)) if (mem && !task_in_mem_cgroup(child, mem))
continue; continue;
if (!has_intersects_mems_allowed(child, nodemask))
continue;
/* badness() returns 0 if the thread is unkillable */ /* badness() returns 0 if the thread is unkillable */
child_points = badness(child, uptime.tv_sec); 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) ...@@ -519,7 +521,7 @@ void mem_cgroup_out_of_memory(struct mem_cgroup *mem, gfp_t gfp_mask)
if (!p || PTR_ERR(p) == -1UL) if (!p || PTR_ERR(p) == -1UL)
goto out; 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")) "Memory cgroup out of memory"))
goto retry; goto retry;
out: out:
...@@ -679,6 +681,7 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, ...@@ -679,6 +681,7 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask,
* the tasklist scan. * the tasklist scan.
*/ */
if (!oom_kill_process(current, gfp_mask, order, 0, NULL, if (!oom_kill_process(current, gfp_mask, order, 0, NULL,
nodemask,
"Out of memory (oom_kill_allocating_task)")) "Out of memory (oom_kill_allocating_task)"))
return; return;
} }
...@@ -697,7 +700,7 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask, ...@@ -697,7 +700,7 @@ void out_of_memory(struct zonelist *zonelist, gfp_t gfp_mask,
panic("Out of memory and no killable processes...\n"); 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")) "Out of memory"))
goto retry; goto retry;
read_unlock(&tasklist_lock); read_unlock(&tasklist_lock);
......
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