[PATCH 4/9] oom: oom_kill_process() need to check p is unkillable

[KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>]

When oom_kill_allocating_task is enabled, an argument of
oom_kill_process is not selected by select_bad_process(), but
just out_of_memory() caller task. It mean the task can be
unkillable. check it first.

Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
---
 mm/oom_kill.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 6ca6cb8..3e48023 100644
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -436,6 +436,17 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order,
 	unsigned long victim_points = 0;
 	struct timespec uptime;
 
+	/*
+	 * When oom_kill_allocating_task is enabled, p can be
+	 * unkillable. check it first.
+	 */
+	if (is_global_init(p) || (p->flags & PF_KTHREAD))
+		return 1;
+	if (mem && !task_in_mem_cgroup(p, mem))
+		return 1;
+	if (!has_intersects_mems_allowed(p, nodemask))
+		return 1;
+
 	if (printk_ratelimit())
 		dump_header(p, gfp_mask, order, mem);
 
-- 
1.6.5.2



--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>