Commit 52930067 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] Fix slab creation/destruction vs. CPU Hotplug

From: Rusty Russell <rusty@rustcorp.com.au>

From: Srivatsa Vaddagiri <vatsa@in.ibm.com>

Hit a couple of (cpu hotplug) races in slab allocator during my tests.
Mostly it was because of continuous loading/unloading fs/minix/minix.ko
while simultaneously doing offline/online of CPUs.  As part of its init and
exit routines, minix.ko create/destroys caches, which lead to several
oopses.

1. kmem_cache_create
	In brief, kmem_cache_create does:
		a) calls enable_cpucache to create per-cpu cache for all
		   online CPUs. 
		b) adds the cache to the global list of caches

	These two are not done atomically and thats what causes problems.

	For ex: lets say that at the time of step a) CPU1 is not online.
	Hence no per-cpu cache is created for CPU1 (cachep->array[1] is NULL). 
	However CPU1 is not completely dead in the sense that CPU_DEAD
	processing for it is not yet over.  By the time CPU_DEAD processing 
	starts for CPU1, step b) is complete. So cpuup_callback finds this
	cache and tries freeing it's per-cpu cache associated with CPU1.
	In the process it dereferences a NULL pointer and dies.

2. kmem_cache_destroy
	In brief, kmem_cache_destroy does:
		a) deletes the cache from the global list of caches
		b) Drain per-cpu cache (drain_cpu_caches), which
		   basically uses smp_call_function to run do_drain
		   on all online CPUs.

	One possible race is let's say that CPU1 is coming up.
	By the time CPU_UP_PREPARE is processed for CPU1, step a) is
	complete. Hence cpuup_callback does not allocate any per-cpu cache
	for the cache that is being destroyed.

	However by the time step b) is run, CPU1 is completely online
	(taking interrupts). It receives the IPI and tries draining
	it per-cpu cache (which is NULL) and dies there.

I think we need to serialize kmem_cache_create/destroy against CPU hotplug
to prevent these problems.  Patch below does that by taking CPU Hotplug sem
(which is OK since kmem_cache_create/destroy are not very frequently
used?).
parent 7d7dac02
...@@ -1279,6 +1279,9 @@ kmem_cache_create (const char *name, size_t size, size_t offset, ...@@ -1279,6 +1279,9 @@ kmem_cache_create (const char *name, size_t size, size_t offset,
cachep->dtor = dtor; cachep->dtor = dtor;
cachep->name = name; cachep->name = name;
/* Don't let CPUs to come and go */
lock_cpu_hotplug();
if (g_cpucache_up == FULL) { if (g_cpucache_up == FULL) {
enable_cpucache(cachep); enable_cpucache(cachep);
} else { } else {
...@@ -1328,6 +1331,7 @@ kmem_cache_create (const char *name, size_t size, size_t offset, ...@@ -1328,6 +1331,7 @@ kmem_cache_create (const char *name, size_t size, size_t offset,
if (!strcmp(pc->name,name)) { if (!strcmp(pc->name,name)) {
printk("kmem_cache_create: duplicate cache %s\n",name); printk("kmem_cache_create: duplicate cache %s\n",name);
up(&cache_chain_sem); up(&cache_chain_sem);
unlock_cpu_hotplug();
BUG(); BUG();
} }
} }
...@@ -1337,6 +1341,7 @@ kmem_cache_create (const char *name, size_t size, size_t offset, ...@@ -1337,6 +1341,7 @@ kmem_cache_create (const char *name, size_t size, size_t offset,
/* cache setup completed, link it into the list */ /* cache setup completed, link it into the list */
list_add(&cachep->next, &cache_chain); list_add(&cachep->next, &cache_chain);
up(&cache_chain_sem); up(&cache_chain_sem);
unlock_cpu_hotplug();
opps: opps:
return cachep; return cachep;
} }
...@@ -1487,6 +1492,9 @@ int kmem_cache_destroy (kmem_cache_t * cachep) ...@@ -1487,6 +1492,9 @@ int kmem_cache_destroy (kmem_cache_t * cachep)
if (!cachep || in_interrupt()) if (!cachep || in_interrupt())
BUG(); BUG();
/* Don't let CPUs to come and go */
lock_cpu_hotplug();
/* Find the cache in the chain of caches. */ /* Find the cache in the chain of caches. */
down(&cache_chain_sem); down(&cache_chain_sem);
/* /*
...@@ -1500,6 +1508,7 @@ int kmem_cache_destroy (kmem_cache_t * cachep) ...@@ -1500,6 +1508,7 @@ int kmem_cache_destroy (kmem_cache_t * cachep)
down(&cache_chain_sem); down(&cache_chain_sem);
list_add(&cachep->next,&cache_chain); list_add(&cachep->next,&cache_chain);
up(&cache_chain_sem); up(&cache_chain_sem);
unlock_cpu_hotplug();
return 1; return 1;
} }
...@@ -1514,6 +1523,8 @@ int kmem_cache_destroy (kmem_cache_t * cachep) ...@@ -1514,6 +1523,8 @@ int kmem_cache_destroy (kmem_cache_t * cachep)
cachep->lists.shared = NULL; cachep->lists.shared = NULL;
kmem_cache_free(&cache_cache, cachep); kmem_cache_free(&cache_cache, cachep);
unlock_cpu_hotplug();
return 0; return 0;
} }
......
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