Re: [BUGFIX][PATCH] oom-kill: fix NUMA consraint check with nodemaskv4.1

From: David Rientjes
Date: Wed Nov 11 2009 - 01:26:34 EST


On Wed, 11 Nov 2009, KAMEZAWA Hiroyuki wrote:

> > > 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 ?
>

Even when I pointed it out, you still didn't bother to try compiling it?
You need s/GPF/GFP, it stands for "get free pages."

You can also eliminate the ret variable, it's not doing anything.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/