lkml.org 
[lkml]   [2008]   [Apr]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectPERCPU : __percpu_alloc_mask() can dynamically size percpu_data storage
    -stable review patch.  If anyone has any objections, please let us know.
    ---------------------

    From: Eric Dumazet <dada1@cosmosbay.com>

    upstream commit: b3242151906372f30f57feaa43b4cac96a23edb1

    Instead of allocating a fix sized array of NR_CPUS pointers for percpu_data,
    we can use nr_cpu_ids, which is generally < NR_CPUS.

    Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
    Cc: Christoph Lameter <clameter@sgi.com>
    Cc: "David S. Miller" <davem@davemloft.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Chris Wright <chrisw@sous-sol.org>
    ---
    include/linux/percpu.h | 2 +-
    mm/allocpercpu.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    This is appropriate for 2.6.24.y

    --- a/include/linux/percpu.h
    +++ b/include/linux/percpu.h
    @@ -34,7 +34,7 @@
    #ifdef CONFIG_SMP

    struct percpu_data {
    - void *ptrs[NR_CPUS];
    + void *ptrs[1];
    };

    #define __percpu_disguise(pdata) (struct percpu_data *)~(unsigned long)(pdata)
    --- a/mm/allocpercpu.c
    +++ b/mm/allocpercpu.c
    @@ -98,7 +98,7 @@ EXPORT_SYMBOL_GPL(__percpu_populate_mask
    */
    void *__percpu_alloc_mask(size_t size, gfp_t gfp, cpumask_t *mask)
    {
    - void *pdata = kzalloc(sizeof(struct percpu_data), gfp);
    + void *pdata = kzalloc(nr_cpu_ids * sizeof(void *), gfp);
    void *__pdata = __percpu_disguise(pdata);

    if (unlikely(!pdata))
    --


    \
     
     \ /
      Last update: 2008-04-17 03:25    [W:4.111 / U:0.268 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site