Skip to content

Commit

Permalink
slub: Remove static kmem_cache_cpu array for boot
Browse files Browse the repository at this point in the history
The percpu allocator can now handle allocations during early boot.
So drop the static kmem_cache_cpu array.

Cc: Tejun Heo <tj@kernel.org>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Christoph Lameter <cl@linux-foundation.org>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
  • Loading branch information
Christoph Lameter authored and Pekka Enberg committed Oct 2, 2010
1 parent 5513659 commit 6c182dc
Showing 1 changed file with 4 additions and 13 deletions.
17 changes: 4 additions & 13 deletions mm/slub.c
Original file line number Diff line number Diff line change
Expand Up @@ -2062,23 +2062,14 @@ init_kmem_cache_node(struct kmem_cache_node *n, struct kmem_cache *s)
#endif
}

static DEFINE_PER_CPU(struct kmem_cache_cpu, kmalloc_percpu[KMALLOC_CACHES]);

static inline int alloc_kmem_cache_cpus(struct kmem_cache *s)
{
if (s < kmalloc_caches + KMALLOC_CACHES && s >= kmalloc_caches)
/*
* Boot time creation of the kmalloc array. Use static per cpu data
* since the per cpu allocator is not available yet.
*/
s->cpu_slab = kmalloc_percpu + (s - kmalloc_caches);
else
s->cpu_slab = alloc_percpu(struct kmem_cache_cpu);
BUILD_BUG_ON(PERCPU_DYNAMIC_EARLY_SIZE <
SLUB_PAGE_SHIFT * sizeof(struct kmem_cache_cpu));

if (!s->cpu_slab)
return 0;
s->cpu_slab = alloc_percpu(struct kmem_cache_cpu);

return 1;
return s->cpu_slab != NULL;
}

#ifdef CONFIG_NUMA
Expand Down

0 comments on commit 6c182dc

Please sign in to comment.