Commit 3395ee05 authored by Paul Menage's avatar Paul Menage Committed by Linus Torvalds

[PATCH] mm: add noaliencache boot option to disable numa alien caches

When using numa=fake on non-NUMA hardware there is no benefit to having the
alien caches, and they consume much memory.

Add a kernel boot option to disable them.

Christoph sayeth "This is good to have even on large NUMA.  The problem is
that the alien caches grow by the square of the size of the system in terms of
nodes."

Cc: Christoph Lameter <clameter@engr.sgi.com>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Manfred Spraul <manfred@colorfullife.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8f5be20b
...@@ -1012,6 +1012,10 @@ and is between 256 and 4096 characters. It is defined in the file ...@@ -1012,6 +1012,10 @@ and is between 256 and 4096 characters. It is defined in the file
emulation library even if a 387 maths coprocessor emulation library even if a 387 maths coprocessor
is present. is present.
noaliencache [MM, NUMA] Disables the allcoation of alien caches in
the slab allocator. Saves per-node memory, but will
impact performance on real NUMA hardware.
noalign [KNL,ARM] noalign [KNL,ARM]
noapic [SMP,APIC] Tells the kernel to not make use of any noapic [SMP,APIC] Tells the kernel to not make use of any
......
...@@ -869,6 +869,22 @@ static void __slab_error(const char *function, struct kmem_cache *cachep, ...@@ -869,6 +869,22 @@ static void __slab_error(const char *function, struct kmem_cache *cachep,
dump_stack(); dump_stack();
} }
/*
* By default on NUMA we use alien caches to stage the freeing of
* objects allocated from other nodes. This causes massive memory
* inefficiencies when using fake NUMA setup to split memory into a
* large number of small nodes, so it can be disabled on the command
* line
*/
static int use_alien_caches __read_mostly = 1;
static int __init noaliencache_setup(char *s)
{
use_alien_caches = 0;
return 1;
}
__setup("noaliencache", noaliencache_setup);
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
/* /*
* Special reaping functions for NUMA systems called from cache_reap(). * Special reaping functions for NUMA systems called from cache_reap().
...@@ -1117,7 +1133,7 @@ static inline int cache_free_alien(struct kmem_cache *cachep, void *objp) ...@@ -1117,7 +1133,7 @@ static inline int cache_free_alien(struct kmem_cache *cachep, void *objp)
* Make sure we are not freeing a object from another node to the array * Make sure we are not freeing a object from another node to the array
* cache on this cpu. * cache on this cpu.
*/ */
if (likely(slabp->nodeid == node)) if (likely(slabp->nodeid == node) || unlikely(!use_alien_caches))
return 0; return 0;
l3 = cachep->nodelists[node]; l3 = cachep->nodelists[node];
...@@ -1195,7 +1211,7 @@ static int __cpuinit cpuup_callback(struct notifier_block *nfb, ...@@ -1195,7 +1211,7 @@ static int __cpuinit cpuup_callback(struct notifier_block *nfb,
list_for_each_entry(cachep, &cache_chain, next) { list_for_each_entry(cachep, &cache_chain, next) {
struct array_cache *nc; struct array_cache *nc;
struct array_cache *shared; struct array_cache *shared;
struct array_cache **alien; struct array_cache **alien = NULL;
nc = alloc_arraycache(node, cachep->limit, nc = alloc_arraycache(node, cachep->limit,
cachep->batchcount); cachep->batchcount);
...@@ -1207,9 +1223,11 @@ static int __cpuinit cpuup_callback(struct notifier_block *nfb, ...@@ -1207,9 +1223,11 @@ static int __cpuinit cpuup_callback(struct notifier_block *nfb,
if (!shared) if (!shared)
goto bad; goto bad;
alien = alloc_alien_cache(node, cachep->limit); if (use_alien_caches) {
if (!alien) alien = alloc_alien_cache(node, cachep->limit);
goto bad; if (!alien)
goto bad;
}
cachep->array[cpu] = nc; cachep->array[cpu] = nc;
l3 = cachep->nodelists[node]; l3 = cachep->nodelists[node];
BUG_ON(!l3); BUG_ON(!l3);
...@@ -3590,13 +3608,15 @@ static int alloc_kmemlist(struct kmem_cache *cachep) ...@@ -3590,13 +3608,15 @@ static int alloc_kmemlist(struct kmem_cache *cachep)
int node; int node;
struct kmem_list3 *l3; struct kmem_list3 *l3;
struct array_cache *new_shared; struct array_cache *new_shared;
struct array_cache **new_alien; struct array_cache **new_alien = NULL;
for_each_online_node(node) { for_each_online_node(node) {
new_alien = alloc_alien_cache(node, cachep->limit); if (use_alien_caches) {
if (!new_alien) new_alien = alloc_alien_cache(node, cachep->limit);
goto fail; if (!new_alien)
goto fail;
}
new_shared = alloc_arraycache(node, new_shared = alloc_arraycache(node,
cachep->shared*cachep->batchcount, cachep->shared*cachep->batchcount,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment