From: Sebastian Andrzej Siewior Date: Mon, 13 Jul 2015 13:08:25 +0200 Subject: Revert "slub: delay ctor until the object is requested" Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.0/patches-4.0.8-rt6.tar.xz This approach is broken with SLAB_DESTROY_BY_RCU allocations. Reported by Steven Rostedt and Koehrer Mathias. Cc: stable-rt@vger.kernel.org Signed-off-by: Sebastian Andrzej Siewior --- mm/slub.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/mm/slub.c b/mm/slub.c index ea83736be12c..6d7f5165a634 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -1411,13 +1411,11 @@ static void setup_object(struct kmem_cache *s, struct page *page, void *object) { setup_object_debug(s, page, object); -#ifndef CONFIG_PREEMPT_RT_FULL if (unlikely(s->ctor)) { kasan_unpoison_object_data(s, object); s->ctor(object); kasan_poison_object_data(s, object); } -#endif } static struct page *new_slab(struct kmem_cache *s, gfp_t flags, int node) @@ -2562,13 +2560,6 @@ static __always_inline void *slab_alloc_node(struct kmem_cache *s, if (unlikely(gfpflags & __GFP_ZERO) && object) memset(object, 0, s->object_size); -#ifdef CONFIG_PREEMPT_RT_FULL - if (unlikely(s->ctor) && object) { - kasan_unpoison_object_data(s, object); - s->ctor(object); - kasan_poison_object_data(s, object); - } -#endif slab_post_alloc_hook(s, gfpflags, object); -- 2.1.4