lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SLUB: Fix early boot GFP_DMA allocations

Browse Source 
Recent change to use slab allocations earlier exposed a bug where
SLUB can call schedule_work and try to call sysfs before it is
safe to do so.

Reported-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Tested-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Nick Piggin <npiggin@suse.de>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
This commit is contained in:
Nick Piggin
2009-06-15 13:35:10 +03:00
committed by Pekka Enberg
parent 45e3e1935e
commit 964cf35c88
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mm/slub.c
View File

@@ -2610,6 +2610,7 @@ static noinline struct kmem_cache *dma_kmalloc_cache(int index, gfp_t flags)
struct kmem_cache *s; struct kmem_cache *s;
char *text; char *text;
size_t realsize; size_t realsize;
unsigned long slabflags;
s = kmalloc_caches_dma[index]; s = kmalloc_caches_dma[index];
if (s) if (s)
@@ -2631,9 +2632,18 @@ static noinline struct kmem_cache *dma_kmalloc_cache(int index, gfp_t flags)
(unsigned int)realsize); (unsigned int)realsize);
s = kmalloc(kmem_size, flags & ~SLUB_DMA); s = kmalloc(kmem_size, flags & ~SLUB_DMA);
/*
* Must defer sysfs creation to a workqueue because we don't know
* what context we are called from. Before sysfs comes up, we don't
* need to do anything because our sysfs initcall will start by
* adding all existing slabs to sysfs.
*/
slabflags = SLAB_CACHE_DMA;
if (slab_state >= SYSFS)
slabflags |= __SYSFS_ADD_DEFERRED;
if (!s || !text || !kmem_cache_open(s, flags, text, if (!s || !text || !kmem_cache_open(s, flags, text,
realsize, ARCH_KMALLOC_MINALIGN, realsize, ARCH_KMALLOC_MINALIGN, slabflags, NULL)) {
SLAB_CACHE_DMA|__SYSFS_ADD_DEFERRED, NULL)) {
kfree(s); kfree(s);
kfree(text); kfree(text);
goto unlock_out; goto unlock_out;
@@ -2642,7 +2652,8 @@ static noinline struct kmem_cache *dma_kmalloc_cache(int index, gfp_t flags)
list_add(&s->list, &slab_caches); list_add(&s->list, &slab_caches);
kmalloc_caches_dma[index] = s; kmalloc_caches_dma[index] = s;
schedule_work(&sysfs_add_work); if (slab_state >= SYSFS)
schedule_work(&sysfs_add_work);
unlock_out: unlock_out:
up_write(&slub_lock); up_write(&slub_lock);