aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>2010-08-09 20:19:35 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-09 23:45:01 -0400
commitab290adbaf8f46770f014ea87968de5baca29c30 (patch)
treee6d9673a76ed7804d0b3ff858c2ac401971c1560 /mm
parent2c5ea53ce46ebb232e0d9a475fdd2b166d2a516b (diff)
oom: make oom_unkillable_task() helper function
Presently we have the same task check in two places. Unify it. Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Reviewed-by: 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>
Diffstat (limited to 'mm')
-rw-r--r--mm/oom_kill.c33
1 files changed, 22 insertions, 11 deletions
diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index b9816ea2eb8f..2c993e47487f 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -101,6 +101,26 @@ static struct task_struct *find_lock_task_mm(struct task_struct *p)
101 return NULL; 101 return NULL;
102} 102}
103 103
104/* return true if the task is not adequate as candidate victim task. */
105static bool oom_unkillable_task(struct task_struct *p, struct mem_cgroup *mem,
106 const nodemask_t *nodemask)
107{
108 if (is_global_init(p))
109 return true;
110 if (p->flags & PF_KTHREAD)
111 return true;
112
113 /* When mem_cgroup_out_of_memory() and p is not member of the group */
114 if (mem && !task_in_mem_cgroup(p, mem))
115 return true;
116
117 /* p may not have freeable memory in nodemask */
118 if (!has_intersects_mems_allowed(p, nodemask))
119 return true;
120
121 return false;
122}
123
104/** 124/**
105 * badness - calculate a numeric value for how bad this task has been 125 * badness - calculate a numeric value for how bad this task has been
106 * @p: task struct of which task we should calculate 126 * @p: task struct of which task we should calculate
@@ -295,12 +315,7 @@ static struct task_struct *select_bad_process(unsigned long *ppoints,
295 for_each_process(p) { 315 for_each_process(p) {
296 unsigned long points; 316 unsigned long points;
297 317
298 /* skip the init task and kthreads */ 318 if (oom_unkillable_task(p, mem, nodemask))
299 if (is_global_init(p) || (p->flags & PF_KTHREAD))
300 continue;
301 if (mem && !task_in_mem_cgroup(p, mem))
302 continue;
303 if (!has_intersects_mems_allowed(p, nodemask))
304 continue; 319 continue;
305 320
306 /* 321 /*
@@ -467,11 +482,7 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
467 482
468 if (child->mm == p->mm) 483 if (child->mm == p->mm)
469 continue; 484 continue;
470 if (child->flags & PF_KTHREAD) 485 if (oom_unkillable_task(p, mem, nodemask))
471 continue;
472 if (mem && !task_in_mem_cgroup(child, mem))
473 continue;
474 if (!has_intersects_mems_allowed(child, nodemask))
475 continue; 486 continue;
476 487
477 /* badness() returns 0 if the thread is unkillable */ 488 /* badness() returns 0 if the thread is unkillable */