hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Reviewed-by: Minchan 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
KOSAKI Motohiro 2010-08-09 17:19:33 -07:00 committed by Linus Torvalds
parent 1489fa14cb
commit 7c59aec830
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mm/oom_kill.c
View File

@ -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,
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 @@ retry:
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,
* 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 @@ retry:
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);