From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756744Ab0EaJhc (ORCPT ); Mon, 31 May 2010 05:37:32 -0400 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:48686 "EHLO fgwmail6.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756608Ab0EaJhb (ORCPT ); Mon, 31 May 2010 05:37:31 -0400 X-SecurityPolicyCheck-FJ: OK by FujitsuOutboundMailChecker v1.3.1 From: KOSAKI Motohiro To: LKML , linux-mm , Oleg Nesterov , David Rientjes , Andrew Morton , KAMEZAWA Hiroyuki , Nick Piggin Subject: [PATCH 4/5] oom: the points calculation of child processes must use find_lock_task_mm() too Cc: kosaki.motohiro@jp.fujitsu.com In-Reply-To: <20100531182526.1843.A69D9226@jp.fujitsu.com> References: <20100531182526.1843.A69D9226@jp.fujitsu.com> Message-Id: <20100531183636.184C.A69D9226@jp.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Mailer: Becky! ver. 2.50.07 [ja] Date: Mon, 31 May 2010 18:37:27 +0900 (JST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: KOSAKI Motohiro Subject: [PATCH 4/5] oom: the points calculation of child processes must use find_lock_task_mm() too child point calclation use find_lock_task_mm() too. Signed-off-by: KOSAKI Motohiro --- mm/oom_kill.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 162af2e..30d9da0 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -87,6 +87,7 @@ static struct task_struct *find_lock_task_mm(struct task_struct *p) unsigned long badness(struct task_struct *p, unsigned long uptime) { unsigned long points, cpu_time, run_time; + struct task_struct *c; struct task_struct *child; int oom_adj = p->signal->oom_adj; struct task_cputime task_time; @@ -124,11 +125,13 @@ 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(child, &p->children, sibling) { - task_lock(child); - if (child->mm != p->mm && child->mm) - points += child->mm->total_vm/2 + 1; - task_unlock(child); + 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); + } } /* -- 1.6.5.2 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 9CACA6B01C6 for ; Mon, 31 May 2010 05:37:31 -0400 (EDT) Received: from m2.gw.fujitsu.co.jp ([10.0.50.72]) by fgwmail5.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id o4V9bT9l030321 for (envelope-from kosaki.motohiro@jp.fujitsu.com); Mon, 31 May 2010 18:37:29 +0900 Received: from smail (m2 [127.0.0.1]) by outgoing.m2.gw.fujitsu.co.jp (Postfix) with ESMTP id 7614C45DE4F for ; Mon, 31 May 2010 18:37:29 +0900 (JST) Received: from s2.gw.fujitsu.co.jp (s2.gw.fujitsu.co.jp [10.0.50.92]) by m2.gw.fujitsu.co.jp (Postfix) with ESMTP id 57B7245DE4E for ; Mon, 31 May 2010 18:37:29 +0900 (JST) Received: from s2.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s2.gw.fujitsu.co.jp (Postfix) with ESMTP id 40F5A1DB803B for ; Mon, 31 May 2010 18:37:29 +0900 (JST) Received: from ml13.s.css.fujitsu.com (ml13.s.css.fujitsu.com [10.249.87.103]) by s2.gw.fujitsu.co.jp (Postfix) with ESMTP id EDA041DB8038 for ; Mon, 31 May 2010 18:37:28 +0900 (JST) From: KOSAKI Motohiro Subject: [PATCH 4/5] oom: the points calculation of child processes must use find_lock_task_mm() too In-Reply-To: <20100531182526.1843.A69D9226@jp.fujitsu.com> References: <20100531182526.1843.A69D9226@jp.fujitsu.com> Message-Id: <20100531183636.184C.A69D9226@jp.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit Date: Mon, 31 May 2010 18:37:27 +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: From: KOSAKI Motohiro Subject: [PATCH 4/5] oom: the points calculation of child processes must use find_lock_task_mm() too child point calclation use find_lock_task_mm() too. Signed-off-by: KOSAKI Motohiro --- mm/oom_kill.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 162af2e..30d9da0 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -87,6 +87,7 @@ static struct task_struct *find_lock_task_mm(struct task_struct *p) unsigned long badness(struct task_struct *p, unsigned long uptime) { unsigned long points, cpu_time, run_time; + struct task_struct *c; struct task_struct *child; int oom_adj = p->signal->oom_adj; struct task_cputime task_time; @@ -124,11 +125,13 @@ 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(child, &p->children, sibling) { - task_lock(child); - if (child->mm != p->mm && child->mm) - points += child->mm->total_vm/2 + 1; - task_unlock(child); + 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); + } } /* -- 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