slab: Avoid deadlock at kmem_cache_create/kmem_cache_destroy
PATCH 1/1 slab: Avoid deadlock at kmem_cache_create/kmem_cache_destroy
Prevents deadlock situation between kmem_cache_create()/kmem_cache_destory(), and kmem_cache_create() /cpu hotplug. The locking order probably got moved over time.
Signed-off-by Ravikiran Thirumalai <[email protected]>
Signed-off-by Shai Fultheim <[email protected]>
mm/slab.c +8 -3
@@ -1718,6 +1718,13 @@ kmem_cache_create (const char *name, sizBUG (); } +/* +* Don't let CPUs to come and go. +* Note: preserve lock taking order -- lock_cpu_hotplug first, +* cache_chain_mutex then. +*/ +lock_cpu_hotplug (); +mutex_lock (&cache_chain_mutex);list_for_each (p, &cache_chain) {
@@ -1918,8 +1925,6 @@ kmem_cache_create (const char *name, siz cachep->dtor = dtor; cachep->name = name; -/* Don't let CPUs to come and go */ -lock_cpu_hotplug ();if (g_cpucache_up ==FULL ) {enable_cpucache (cachep);
@@ -1978,12 +1983,12 @@ kmem_cache_create (const char *name, siz/* cache setup completed, link it into the list */ list_add (&cachep->next, &cache_chain); -unlock_cpu_hotplug (); oops:if (!cachep && (flags &SLAB_PANIC ))panic ("kmem_cache_create(): failed to create slab `%s'\n" , name);mutex_unlock (&cache_chain_mutex); +unlock_cpu_hotplug ();return cachep; }EXPORT_SYMBOL (kmem_cache_create);
Quoted 3 lines · Ravikiran G Thirumalai
Prevents deadlock situation between kmem_cache_create()/kmem_cache_destory(), and
kmem_cache_create()/cpu hotplug. The locking order probably got moved over time.
Looks good to me.
Pekka