From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail190.messagelabs.com (mail190.messagelabs.com [216.82.249.51]) by kanga.kvack.org (Postfix) with SMTP id 1A8216B01C1 for ; Tue, 1 Jun 2010 01:49:22 -0400 (EDT) Received: from m1.gw.fujitsu.co.jp ([10.0.50.71]) by fgwmail7.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id o515nILI000993 for (envelope-from kosaki.motohiro@jp.fujitsu.com); Tue, 1 Jun 2010 14:49:19 +0900 Received: from smail (m1 [127.0.0.1]) by outgoing.m1.gw.fujitsu.co.jp (Postfix) with ESMTP id B34BA45DE51 for ; Tue, 1 Jun 2010 14:49:18 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (s1.gw.fujitsu.co.jp [10.0.50.91]) by m1.gw.fujitsu.co.jp (Postfix) with ESMTP id 894E345DE4F for ; Tue, 1 Jun 2010 14:49:18 +0900 (JST) Received: from s1.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id 67CEE1DB804E for ; Tue, 1 Jun 2010 14:49:18 +0900 (JST) Received: from m108.s.css.fujitsu.com (m108.s.css.fujitsu.com [10.249.87.108]) by s1.gw.fujitsu.co.jp (Postfix) with ESMTP id 22CDD1DB8045 for ; Tue, 1 Jun 2010 14:49:18 +0900 (JST) From: KOSAKI Motohiro Subject: [PATCH 3/5] oom: Fix child process iteration properly In-Reply-To: <20100601144238.243A.A69D9226@jp.fujitsu.com> References: <20100601144238.243A.A69D9226@jp.fujitsu.com> Message-Id: <20100601144810.2440.A69D9226@jp.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit Date: Tue, 1 Jun 2010 14:49:17 +0900 (JST) Sender: owner-linux-mm@kvack.org To: LKML , linux-mm , Oleg Nesterov , David Rientjes , Andrew Morton , KAMEZAWA Hiroyuki , Nick Piggin Cc: kosaki.motohiro@jp.fujitsu.com List-ID: Oleg pointed out that current oom child process iterating logic is wrong. > list_for_each_entry(p->children) can only see the tasks forked > by p, it can't see other children forked by its sub-threads. This patch fixes it. Reported-by: Oleg Nesterov Signed-off-by: KOSAKI Motohiro --- mm/oom_kill.c | 34 ++++++++++++++++++++-------------- 1 files changed, 20 insertions(+), 14 deletions(-) diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 70e1a85..1bdf27d 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -88,6 +88,7 @@ unsigned long badness(struct task_struct *p, unsigned long uptime) { unsigned long points, cpu_time, run_time; struct task_struct *c; + struct task_struct *t = p; struct task_struct *child; int oom_adj = p->signal->oom_adj; struct task_cputime task_time; @@ -125,14 +126,16 @@ unsigned long badness(struct task_struct *p, unsigned long uptime) * child is eating the vast majority of memory, adding only half * to the parents will make the child our kill candidate of choice. */ - list_for_each_entry(c, &p->children, sibling) { - child = find_lock_task_mm(c); - if (child) { - if (child->mm != p->mm) - points += child->mm->total_vm/2 + 1; - task_unlock(child); + do { + list_for_each_entry(c, &t->children, sibling) { + child = find_lock_task_mm(c); + if (child) { + if (child->mm != p->mm) + points += child->mm->total_vm/2 + 1; + task_unlock(child); + } } - } + } while_each_thread(p, t); /* * CPU time is in tens of seconds and run time is in thousands @@ -432,6 +435,7 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order, const char *message) { struct task_struct *c; + struct task_struct *t = p; if (printk_ratelimit()) dump_header(p, gfp_mask, order, mem); @@ -449,14 +453,16 @@ static int oom_kill_process(struct task_struct *p, gfp_t gfp_mask, int order, message, task_pid_nr(p), p->comm, points); /* Try to kill a child first */ - list_for_each_entry(c, &p->children, sibling) { - if (c->mm == p->mm) - continue; + do { + list_for_each_entry(c, &t->children, sibling) { + if (c->mm == p->mm) + continue; - /* Ok, Kill the child */ - if (!__oom_kill_process(c, mem, 1)) - return 0; - } + /* Ok, Kill the child */ + if (!__oom_kill_process(c, mem, 1)) + return 0; + } + } while_each_thread(p, t); return __oom_kill_process(p, mem, 1); } -- 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: email@kvack.org