lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Tue, 10 Nov 2009 21:58:31 -0800 (PST) From: David Rientjes <rientjes@...gle.com> To: KAMEZAWA Hiroyuki <kamezawa.hiroyu@...fujitsu.com> cc: Daisuke Nishimura <nishimura@....nes.nec.co.jp>, KOSAKI Motohiro <kosaki.motohiro@...fujitsu.com>, linux-mm@...ck.org, linux-kernel@...r.kernel.org, Andrew Morton <akpm@...ux-foundation.org>, Christoph Lameter <cl@...ux-foundation.org> Subject: Re: [BUGFIX][PATCH] oom-kill: fix NUMA consraint check with nodemask v4.1 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. > - if (!nodes_empty(nodes)) > + /* > + * The nodemask here is a nodemask passed to alloc_pages(). Now, > + * cpuset doesn't use this nodemask for its hardwall/softwall/hierarchy > + * feature. mempolicy is an only user of nodemask here. > + * check mempolicy's nodemask contains all N_HIGH_MEMORY > + */ > + if (nodemask && !nodes_subset(node_states[N_HIGH_MEMORY], *nodemask)) > return CONSTRAINT_MEMORY_POLICY; > -#endif > > + /* Check this allocation failure is caused by cpuset's wall function */ > + for_each_zone_zonelist_nodemask(zone, z, zonelist, > + high_zoneidx, nodemask) > + if (!cpuset_zone_allowed_softwall(zone, gfp_mask)) > + return CONSTRAINT_CPUSET; > + > + return CONSTRAINT_NONE; > +} > +#else > +static enum oom_constraint constrained_alloc(struct zonelist *zonelist, > + gfp_t gfp_mask, nodemask_t *nodemask) inline seems appropriate in this case, gcc will optimize it anyway. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists