From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756660Ab0EaJdO (ORCPT ); Mon, 31 May 2010 05:33:14 -0400 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:38174 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756071Ab0EaJdM (ORCPT ); Mon, 31 May 2010 05:33:12 -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 1/5] oom: select_bad_process: check PF_KTHREAD instead of !mm to skip kthreads Cc: kosaki.motohiro@jp.fujitsu.com Message-Id: <20100531182526.1843.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:33:06 +0900 (JST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Oleg Nesterov Subject: oom: select_bad_process: check PF_KTHREAD instead of !mm to skip kthreads select_bad_process() thinks a kernel thread can't have ->mm != NULL, this is not true due to use_mm(). Change the code to check PF_KTHREAD. Signed-off-by: Oleg Nesterov Acked-by: David Rientjes Signed-off-by: KOSAKI Motohiro --- mm/oom_kill.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 709aedf..070b713 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -256,14 +256,11 @@ static struct task_struct *select_bad_process(unsigned long *ppoints, for_each_process(p) { unsigned long points; - /* - * skip kernel threads and tasks which have already released - * their mm. - */ + /* skip the tasks which have already released their mm. */ if (!p->mm) continue; - /* skip the init task */ - if (is_global_init(p)) + /* skip the init task and kthreads */ + if (is_global_init(p) || (p->flags & PF_KTHREAD)) continue; if (mem && !task_in_mem_cgroup(p, mem)) continue; -- 1.6.5.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail191.messagelabs.com (mail191.messagelabs.com [216.82.242.19]) by kanga.kvack.org (Postfix) with SMTP id EC1D26B01C3 for ; Mon, 31 May 2010 05:33:10 -0400 (EDT) Received: from m6.gw.fujitsu.co.jp ([10.0.50.76]) by fgwmail5.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id o4V9X8pT028229 for (envelope-from kosaki.motohiro@jp.fujitsu.com); Mon, 31 May 2010 18:33:08 +0900 Received: from smail (m6 [127.0.0.1]) by outgoing.m6.gw.fujitsu.co.jp (Postfix) with ESMTP id ECC4F45DE52 for ; Mon, 31 May 2010 18:33:07 +0900 (JST) Received: from s6.gw.fujitsu.co.jp (s6.gw.fujitsu.co.jp [10.0.50.96]) by m6.gw.fujitsu.co.jp (Postfix) with ESMTP id A8D9C45DE4C for ; Mon, 31 May 2010 18:33:07 +0900 (JST) Received: from s6.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s6.gw.fujitsu.co.jp (Postfix) with ESMTP id 8E16BE08003 for ; Mon, 31 May 2010 18:33:07 +0900 (JST) Received: from m105.s.css.fujitsu.com (m105.s.css.fujitsu.com [10.249.87.105]) by s6.gw.fujitsu.co.jp (Postfix) with ESMTP id 41BBB1DB8013 for ; Mon, 31 May 2010 18:33:07 +0900 (JST) From: KOSAKI Motohiro Subject: [PATCH 1/5] oom: select_bad_process: check PF_KTHREAD instead of !mm to skip kthreads Message-Id: <20100531182526.1843.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:33:06 +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: Oleg Nesterov Subject: oom: select_bad_process: check PF_KTHREAD instead of !mm to skip kthreads select_bad_process() thinks a kernel thread can't have ->mm != NULL, this is not true due to use_mm(). Change the code to check PF_KTHREAD. Signed-off-by: Oleg Nesterov Acked-by: David Rientjes Signed-off-by: KOSAKI Motohiro --- mm/oom_kill.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 709aedf..070b713 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -256,14 +256,11 @@ static struct task_struct *select_bad_process(unsigned long *ppoints, for_each_process(p) { unsigned long points; - /* - * skip kernel threads and tasks which have already released - * their mm. - */ + /* skip the tasks which have already released their mm. */ if (!p->mm) continue; - /* skip the init task */ - if (is_global_init(p)) + /* skip the init task and kthreads */ + if (is_global_init(p) || (p->flags & PF_KTHREAD)) continue; if (mem && !task_in_mem_cgroup(p, mem)) continue; -- 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