diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2009-06-25 12:31:37 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-07-30 14:39:04 -0700 |
commit | e9cbe5c4d29e052c38e500a06517b27c60f22c02 (patch) | |
tree | 807b57e4d94ba9d3add4058ebc8270e5cac11a9c /mm | |
parent | 843f9d9fa71d3889169172b20ee07ae6e51c0be4 (diff) |
fix RCU-callback-after-kmem_cache_destroy problem in sl[aou]b
commit 7ed9f7e5db58c6e8c2b4b738a75d5dcd8e17aad5 upstream.
Jesper noted that kmem_cache_destroy() invokes synchronize_rcu() rather than
rcu_barrier() in the SLAB_DESTROY_BY_RCU case, which could result in RCU
callbacks accessing a kmem_cache after it had been destroyed.
Acked-by: Matt Mackall <mpm@selenic.com>
Reported-by: Jesper Dangaard Brouer <hawk@comx.dk>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/slab.c | 2 | ||||
-rw-r--r-- | mm/slob.c | 2 | ||||
-rw-r--r-- | mm/slub.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/mm/slab.c b/mm/slab.c index 9a90b00d2f91..021d69fec164 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -2592,7 +2592,7 @@ void kmem_cache_destroy(struct kmem_cache *cachep) } if (unlikely(cachep->flags & SLAB_DESTROY_BY_RCU)) - synchronize_rcu(); + rcu_barrier(); __kmem_cache_destroy(cachep); mutex_unlock(&cache_chain_mutex); diff --git a/mm/slob.c b/mm/slob.c index f92e66d558bd..c80d982a6f5c 100644 --- a/mm/slob.c +++ b/mm/slob.c @@ -590,6 +590,8 @@ EXPORT_SYMBOL(kmem_cache_create); void kmem_cache_destroy(struct kmem_cache *c) { + if (c->flags & SLAB_DESTROY_BY_RCU) + rcu_barrier(); slob_free(c, sizeof(struct kmem_cache)); } EXPORT_SYMBOL(kmem_cache_destroy); diff --git a/mm/slub.c b/mm/slub.c index 65ffda5934b0..253016d3cb4c 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -2490,6 +2490,8 @@ static inline int kmem_cache_close(struct kmem_cache *s) */ void kmem_cache_destroy(struct kmem_cache *s) { + if (s->flags & SLAB_DESTROY_BY_RCU) + rcu_barrier(); down_write(&slub_lock); s->refcount--; if (!s->refcount) { |