lkml.org 
[lkml]   [2007]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH] Uninline kcalloc()
    From
    This saves some bytes on usual config here and allows inserting integer
    overflow warning without pissing off printk-haters crowd later on.

    text data bss dec hex filename
    2662791 195347 159744 3017882 2e0c9a vmlinux -O2 before
    2662535 195347 159744 3017626 2e0b9a vmlinux -O2 after
    -------------------------------
    -256

    2439726 195347 159744 2794817 2aa541 vmlinux -Os before
    2439598 195347 159744 2794689 2aa4c1 vmlinux -Os after
    -------------------------------
    -128

    Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
    ---

    include/linux/slab.h | 58 ----------------------------------------
    mm/util.c | 59 +++++++++++++++++++++++++++++++++++++++++
    2 files changed, 60 insertions(+), 57 deletions(-)

    --- a/include/linux/slab.h
    +++ b/include/linux/slab.h
    @@ -120,63 +120,7 @@ size_t ksize(const void *);
    #include <linux/slab_def.h>
    #endif

    -/**
    - * kcalloc - allocate memory for an array. The memory is set to zero.
    - * @n: number of elements.
    - * @size: element size.
    - * @flags: the type of memory to allocate.
    - *
    - * The @flags argument may be one of:
    - *
    - * %GFP_USER - Allocate memory on behalf of user. May sleep.
    - *
    - * %GFP_KERNEL - Allocate normal kernel ram. May sleep.
    - *
    - * %GFP_ATOMIC - Allocation will not sleep. May use emergency pools.
    - * For example, use this inside interrupt handlers.
    - *
    - * %GFP_HIGHUSER - Allocate pages from high memory.
    - *
    - * %GFP_NOIO - Do not do any I/O at all while trying to get memory.
    - *
    - * %GFP_NOFS - Do not make any fs calls while trying to get memory.
    - *
    - * %GFP_NOWAIT - Allocation will not sleep.
    - *
    - * %GFP_THISNODE - Allocate node-local memory only.
    - *
    - * %GFP_DMA - Allocation suitable for DMA.
    - * Should only be used for kmalloc() caches. Otherwise, use a
    - * slab created with SLAB_DMA.
    - *
    - * Also it is possible to set different flags by OR'ing
    - * in one or more of the following additional @flags:
    - *
    - * %__GFP_COLD - Request cache-cold pages instead of
    - * trying to return cache-warm pages.
    - *
    - * %__GFP_HIGH - This allocation has high priority and may use emergency pools.
    - *
    - * %__GFP_NOFAIL - Indicate that this allocation is in no way allowed to fail
    - * (think twice before using).
    - *
    - * %__GFP_NORETRY - If memory is not immediately available,
    - * then give up at once.
    - *
    - * %__GFP_NOWARN - If allocation fails, don't issue any warnings.
    - *
    - * %__GFP_REPEAT - If allocation fails initially, try once more before failing.
    - *
    - * There are other flags available as well, but these are not intended
    - * for general use, and so are not documented here. For a full list of
    - * potential flags, always refer to linux/gfp.h.
    - */
    -static inline void *kcalloc(size_t n, size_t size, gfp_t flags)
    -{
    - if (n != 0 && size > ULONG_MAX / n)
    - return NULL;
    - return __kmalloc(n * size, flags | __GFP_ZERO);
    -}
    +void *kcalloc(size_t n, size_t size, gfp_t flags);

    #if !defined(CONFIG_NUMA) && !defined(CONFIG_SLOB)
    /**
    --- a/mm/util.c
    +++ b/mm/util.c
    @@ -5,6 +5,65 @@
    #include <asm/uaccess.h>

    /**
    + * kcalloc - allocate memory for an array. The memory is set to zero.
    + * @n: number of elements.
    + * @size: element size.
    + * @flags: the type of memory to allocate.
    + *
    + * The @flags argument may be one of:
    + *
    + * %GFP_USER - Allocate memory on behalf of user. May sleep.
    + *
    + * %GFP_KERNEL - Allocate normal kernel ram. May sleep.
    + *
    + * %GFP_ATOMIC - Allocation will not sleep. May use emergency pools.
    + * For example, use this inside interrupt handlers.
    + *
    + * %GFP_HIGHUSER - Allocate pages from high memory.
    + *
    + * %GFP_NOIO - Do not do any I/O at all while trying to get memory.
    + *
    + * %GFP_NOFS - Do not make any fs calls while trying to get memory.
    + *
    + * %GFP_NOWAIT - Allocation will not sleep.
    + *
    + * %GFP_THISNODE - Allocate node-local memory only.
    + *
    + * %GFP_DMA - Allocation suitable for DMA.
    + * Should only be used for kmalloc() caches. Otherwise, use a
    + * slab created with SLAB_DMA.
    + *
    + * Also it is possible to set different flags by OR'ing
    + * in one or more of the following additional @flags:
    + *
    + * %__GFP_COLD - Request cache-cold pages instead of
    + * trying to return cache-warm pages.
    + *
    + * %__GFP_HIGH - This allocation has high priority and may use emergency pools.
    + *
    + * %__GFP_NOFAIL - Indicate that this allocation is in no way allowed to fail
    + * (think twice before using).
    + *
    + * %__GFP_NORETRY - If memory is not immediately available,
    + * then give up at once.
    + *
    + * %__GFP_NOWARN - If allocation fails, don't issue any warnings.
    + *
    + * %__GFP_REPEAT - If allocation fails initially, try once more before failing.
    + *
    + * There are other flags available as well, but these are not intended
    + * for general use, and so are not documented here. For a full list of
    + * potential flags, always refer to linux/gfp.h.
    + */
    +void *kcalloc(size_t n, size_t size, gfp_t flags)
    +{
    + if (n != 0 && size > ULONG_MAX / n)
    + return NULL;
    + return __kmalloc(n * size, flags | __GFP_ZERO);
    +}
    +EXPORT_SYMBOL(kcalloc);
    +
    +/**
    * kstrdup - allocate space for and copy an existing string
    * @s: the string to duplicate
    * @gfp: the GFP mask used in the kmalloc() call when allocating memory
    -
    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-09-22 22:07    [W:0.026 / U:1.056 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site