Commit 2e443fd0 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds

SLUB: extract dma_kmalloc_cache from get_cache.

The rarely used dma functionality in get_slab() makes the function too
complex.  The compiler begins to spill variables from the working set onto the
stack.  The created function is only used in extremely rare cases so make sure
that the compiler does not decide on its own to merge it back into get_slab().
Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0c710013
...@@ -2272,6 +2272,40 @@ panic: ...@@ -2272,6 +2272,40 @@ panic:
panic("Creation of kmalloc slab %s size=%d failed.\n", name, size); panic("Creation of kmalloc slab %s size=%d failed.\n", name, size);
} }
#ifdef CONFIG_ZONE_DMA
static noinline struct kmem_cache *dma_kmalloc_cache(int index, gfp_t flags)
{
struct kmem_cache *s;
struct kmem_cache *x;
char *text;
size_t realsize;
s = kmalloc_caches_dma[index];
if (s)
return s;
/* Dynamically create dma cache */
x = kmalloc(kmem_size, flags & ~SLUB_DMA);
if (!x)
panic("Unable to allocate memory for dma cache\n");
if (index <= KMALLOC_SHIFT_HIGH)
realsize = 1 << index;
else {
if (index == 1)
realsize = 96;
else
realsize = 192;
}
text = kasprintf(flags & ~SLUB_DMA, "kmalloc_dma-%d",
(unsigned int)realsize);
s = create_kmalloc_cache(x, text, realsize, flags);
kmalloc_caches_dma[index] = s;
return s;
}
#endif
static struct kmem_cache *get_slab(size_t size, gfp_t flags) static struct kmem_cache *get_slab(size_t size, gfp_t flags)
{ {
int index = kmalloc_index(size); int index = kmalloc_index(size);
...@@ -2284,36 +2318,8 @@ static struct kmem_cache *get_slab(size_t size, gfp_t flags) ...@@ -2284,36 +2318,8 @@ static struct kmem_cache *get_slab(size_t size, gfp_t flags)
return NULL; return NULL;
#ifdef CONFIG_ZONE_DMA #ifdef CONFIG_ZONE_DMA
if ((flags & SLUB_DMA)) { if ((flags & SLUB_DMA))
struct kmem_cache *s; return dma_kmalloc_cache(index, flags);
struct kmem_cache *x;
char *text;
size_t realsize;
s = kmalloc_caches_dma[index];
if (s)
return s;
/* Dynamically create dma cache */
x = kmalloc(kmem_size, flags & ~SLUB_DMA);
if (!x)
panic("Unable to allocate memory for dma cache\n");
if (index <= KMALLOC_SHIFT_HIGH)
realsize = 1 << index;
else {
if (index == 1)
realsize = 96;
else
realsize = 192;
}
text = kasprintf(flags & ~SLUB_DMA, "kmalloc_dma-%d",
(unsigned int)realsize);
s = create_kmalloc_cache(x, text, realsize, flags);
kmalloc_caches_dma[index] = s;
return s;
}
#endif #endif
return &kmalloc_caches[index]; return &kmalloc_caches[index];
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment