lkml.org 
[lkml]   [2007]   [Jun]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 08/26] 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: Christoph Lameter <clameter@sgi.com>

    ---
    mm/slub.c | 66 +++++++++++++++++++++++++++++++++-----------------------------
    1 file changed, 36 insertions(+), 30 deletions(-)

    Index: linux-2.6.22-rc4-mm2/mm/slub.c
    ===================================================================
    --- linux-2.6.22-rc4-mm2.orig/mm/slub.c 2007-06-17 18:12:04.000000000 -0700
    +++ linux-2.6.22-rc4-mm2/mm/slub.c 2007-06-17 18:12:10.000000000 -0700
    @@ -2281,6 +2281,40 @@ panic:
    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)
    {
    int index = kmalloc_index(size);
    @@ -2293,36 +2327,8 @@ static struct kmem_cache *get_slab(size_
    return NULL;

    #ifdef CONFIG_ZONE_DMA
    - if ((flags & SLUB_DMA)) {
    - 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;
    - }
    + if ((flags & SLUB_DMA))
    + return dma_kmalloc_cache(index, flags);
    #endif
    return &kmalloc_caches[index];
    }
    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-06-18 12:05    [W:2.226 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site