Messages in this thread | | | Date | Sun, 3 May 2009 17:38:06 -0700 (PDT) | From | David Rientjes <> | Subject | Re: [PATCH 1/5] mm: Add __GFP_NO_OOM_KILL flag |
| |
On Mon, 4 May 2009, Rafael J. Wysocki wrote:
> Index: linux-2.6/mm/page_alloc.c > =================================================================== > --- linux-2.6.orig/mm/page_alloc.c > +++ linux-2.6/mm/page_alloc.c > @@ -1620,7 +1620,8 @@ nofail_alloc: > } > > /* The OOM killer will not help higher order allocs so fail */ > - if (order > PAGE_ALLOC_COSTLY_ORDER) { > + if (order > PAGE_ALLOC_COSTLY_ORDER || > + (gfp_mask & __GFP_NO_OOM_KILL)) { > clear_zonelist_oom(zonelist, gfp_mask); > goto nopage; > }
This is inconsistent because __GFP_NO_OOM_KILL now implies __GFP_NORETRY (the "goto nopage" above), but only for allocations with __GFP_FS set and __GFP_NORETRY clear.
| |