Messages in this thread Patch in this message | | | Date | Fri, 12 Jun 2009 11:13:40 +0300 (EEST) | From | Pekka J Enberg <> | Subject | [PATCH 2/2] slab,slub: ignore __GFP_WAIT if we're booting or suspending |
| |
From: Pekka Enberg <penberg@cs.helsinki.fi>
As explained by Benjamin Herrenschmidt:
Oh and btw, your patch alone doesn't fix powerpc, because it's missing a whole bunch of GFP_KERNEL's in the arch code... You would have to grep the entire kernel for things that check slab_is_available() and even then you'll be missing some.
For example, slab_is_available() didn't always exist, and so in the early days on powerpc, we used a mem_init_done global that is set form mem_init() (not perfect but works in practice). And we still have code using that to do the test.
Therefore, ignore __GFP_WAIT in the slab allocators if we're booting or suspending.
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Christoph Lameter <cl@linux-foundation.org> Cc: Nick Piggin <npiggin@suse.de> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> --- mm/slab.c | 7 +++++++ mm/slub.c | 7 +++++++ 2 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/mm/slab.c b/mm/slab.c index f46b65d..4b932e0 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -2812,6 +2812,13 @@ static int cache_grow(struct kmem_cache *cachep, offset *= cachep->colour_off; + /* + * Lets not wait if we're booting up or suspending even if the user + * asks for it. + */ + if (system_state != SYSTEM_RUNNING) + local_flags &= ~__GFP_WAIT; + if (local_flags & __GFP_WAIT) local_irq_enable(); diff --git a/mm/slub.c b/mm/slub.c index 3964d3c..053ea3e 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1548,6 +1548,13 @@ new_slab: goto load_freelist; } + /* + * Lets not wait if we're booting up or suspending even if the user + * asks for it. + */ + if (system_state != SYSTEM_RUNNING) + gfpflags &= ~__GFP_WAIT; + if (gfpflags & __GFP_WAIT) local_irq_enable(); -- 1.6.0.4
| |