Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758923Ab0FQBvi (ORCPT ); Wed, 16 Jun 2010 21:51:38 -0400 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:34270 "EHLO fgwmail6.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756180Ab0FQBvh (ORCPT ); Wed, 16 Jun 2010 21:51:37 -0400 X-SecurityPolicyCheck-FJ: OK by FujitsuOutboundMailChecker v1.3.1 From: KOSAKI Motohiro To: Minchan Kim Subject: Re: [PATCH 4/9] oom: oom_kill_process() need to check p is unkillable Cc: kosaki.motohiro@jp.fujitsu.com, LKML , linux-mm , Andrew Morton , David Rientjes , KAMEZAWA Hiroyuki In-Reply-To: <20100616150728.GD9278@barrios-desktop> References: <20100616203212.72E0.A69D9226@jp.fujitsu.com> <20100616150728.GD9278@barrios-desktop> Message-Id: <20100617084416.FB36.A69D9226@jp.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset="ISO-2022-JP" Content-Transfer-Encoding: 7bit X-Mailer: Becky! ver. 2.50.07 [ja] Date: Thu, 17 Jun 2010 10:51:34 +0900 (JST) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1467 Lines: 42 > On Wed, Jun 16, 2010 at 08:32:45PM +0900, KOSAKI Motohiro wrote: > > 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 > > --- > > 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; > > + > > I think this check could be done before oom_kill_proces in case of > sysctl_oom_kill_allocating_task, too. ok. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/