From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail203.messagelabs.com (mail203.messagelabs.com [216.82.254.243]) by kanga.kvack.org (Postfix) with SMTP id 3B5616B004D for ; Wed, 11 Nov 2009 01:22:47 -0500 (EST) Received: from m3.gw.fujitsu.co.jp ([10.0.50.73]) by fgwmail5.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id nAB6Mip0025846 for (envelope-from kamezawa.hiroyu@jp.fujitsu.com); Wed, 11 Nov 2009 15:22:44 +0900 Received: from smail (m3 [127.0.0.1]) by outgoing.m3.gw.fujitsu.co.jp (Postfix) with ESMTP id 05E2645DE53 for ; Wed, 11 Nov 2009 15:22:44 +0900 (JST) Received: from s3.gw.fujitsu.co.jp (s3.gw.fujitsu.co.jp [10.0.50.93]) by m3.gw.fujitsu.co.jp (Postfix) with ESMTP id BA52745DE51 for ; Wed, 11 Nov 2009 15:22:43 +0900 (JST) Received: from s3.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s3.gw.fujitsu.co.jp (Postfix) with ESMTP id 6031C1DB8044 for ; Wed, 11 Nov 2009 15:22:43 +0900 (JST) Received: from m108.s.css.fujitsu.com (m108.s.css.fujitsu.com [10.249.87.108]) by s3.gw.fujitsu.co.jp (Postfix) with ESMTP id E70051DB803E for ; Wed, 11 Nov 2009 15:22:42 +0900 (JST) Date: Wed, 11 Nov 2009 15:20:04 +0900 From: KAMEZAWA Hiroyuki Subject: Re: [BUGFIX][PATCH] oom-kill: fix NUMA consraint check with nodemask v4.1 Message-Id: <20091111152004.3d585cee.kamezawa.hiroyu@jp.fujitsu.com> In-Reply-To: References: <20091110162121.361B.A69D9226@jp.fujitsu.com> <20091110162445.c6db7521.kamezawa.hiroyu@jp.fujitsu.com> <20091110163419.361E.A69D9226@jp.fujitsu.com> <20091110164055.a1b44a4b.kamezawa.hiroyu@jp.fujitsu.com> <20091110170338.9f3bb417.nishimura@mxp.nes.nec.co.jp> <20091110171704.3800f081.kamezawa.hiroyu@jp.fujitsu.com> <20091111112404.0026e601.kamezawa.hiroyu@jp.fujitsu.com> <20091111134514.4edd3011.kamezawa.hiroyu@jp.fujitsu.com> <20091111142811.eb16f062.kamezawa.hiroyu@jp.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org To: David Rientjes Cc: Daisuke Nishimura , KOSAKI Motohiro , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrew Morton , Christoph Lameter List-ID: On Tue, 10 Nov 2009 21:58:31 -0800 (PST) David Rientjes wrote: > On Wed, 11 Nov 2009, KAMEZAWA Hiroyuki wrote: > > > Index: mm-test-kernel/drivers/char/sysrq.c > > =================================================================== > > --- mm-test-kernel.orig/drivers/char/sysrq.c > > +++ mm-test-kernel/drivers/char/sysrq.c > > @@ -339,7 +339,7 @@ static struct sysrq_key_op sysrq_term_op > > > > static void moom_callback(struct work_struct *ignored) > > { > > - out_of_memory(node_zonelist(0, GFP_KERNEL), GFP_KERNEL, 0); > > + out_of_memory(node_zonelist(0, GFP_KERNEL), GFP_KERNEL, 0, NULL); > > } > > > > static DECLARE_WORK(moom_work, moom_callback); > > Index: mm-test-kernel/mm/oom_kill.c > > =================================================================== > > --- mm-test-kernel.orig/mm/oom_kill.c > > +++ mm-test-kernel/mm/oom_kill.c > > @@ -196,27 +196,47 @@ unsigned long badness(struct task_struct > > /* > > * Determine the type of allocation constraint. > > */ > > -static inline enum oom_constraint constrained_alloc(struct zonelist *zonelist, > > - gfp_t gfp_mask) > > -{ > > #ifdef CONFIG_NUMA > > +static enum oom_constraint constrained_alloc(struct zonelist *zonelist, > > + gfp_t gfp_mask, nodemask_t *nodemask) > > +{ > > struct zone *zone; > > struct zoneref *z; > > enum zone_type high_zoneidx = gfp_zone(gfp_mask); > > - nodemask_t nodes = node_states[N_HIGH_MEMORY]; > > + int ret = CONSTRAINT_NONE; > > > > - for_each_zone_zonelist(zone, z, zonelist, high_zoneidx) > > - if (cpuset_zone_allowed_softwall(zone, gfp_mask)) > > - node_clear(zone_to_nid(zone), nodes); > > - else > > - return CONSTRAINT_CPUSET; > > + /* > > + * Reach here only when __GFP_NOFAIL is used. So, we should avoid > > + * to kill current.We have to random task kill in this case. > > + * Hopefully, CONSTRAINT_THISNODE...but no way to handle it, now. > > + */ > > + if (gfp_mask & __GPF_THISNODE) > > + return ret; > > > > That shouldn't compile. > Why ? Thanks, -Kame -- 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