Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3242151 authored by Eric Dumazet's avatar Eric Dumazet Committed by Linus Torvalds
Browse files

PERCPU : __percpu_alloc_mask() can dynamically size percpu_data storage 



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: default avatarEric Dumazet <dada1@cosmosbay.com>
Cc: Christoph Lameter <clameter@sgi.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e7ca2d41

include/linux/percpu.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
#ifdef CONFIG_SMP



struct percpu_data {

	void *ptrs[NR_CPUS];

	void *ptrs[1];

};



#define __percpu_disguise(pdata) (struct percpu_data *)~(unsigned long)(pdata)

mm/allocpercpu.c

+1 −1
Original line number Diff line number Diff line
@@ -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))