Commit 8de456cf authored by Qian Cai's avatar Qian Cai Committed by Linus Torvalds

debugobjects: avoid recursive calls with kmemleak

CONFIG_DEBUG_OBJECTS_RCU_HEAD does not play well with kmemleak due to
recursive calls.

fill_pool
  kmemleak_ignore
    make_black_object
      put_object
        __call_rcu (kernel/rcu/tree.c)
          debug_rcu_head_queue
            debug_object_activate
              debug_object_init
                fill_pool
                  kmemleak_ignore
                    make_black_object
                      ...

So add SLAB_NOLEAKTRACE to kmem_cache_create() to not register newly
allocated debug objects at all.

Link: http://lkml.kernel.org/r/20181126165343.2339-1-cai@gmx.usSigned-off-by: default avatarQian Cai <cai@gmx.us>
Suggested-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Acked-by: default avatarWaiman Long <longman@redhat.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Yang Shi <yang.shi@linux.alibaba.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dcf7fe9d
...@@ -135,7 +135,6 @@ static void fill_pool(void) ...@@ -135,7 +135,6 @@ static void fill_pool(void)
if (!new) if (!new)
return; return;
kmemleak_ignore(new);
raw_spin_lock_irqsave(&pool_lock, flags); raw_spin_lock_irqsave(&pool_lock, flags);
hlist_add_head(&new->node, &obj_pool); hlist_add_head(&new->node, &obj_pool);
debug_objects_allocated++; debug_objects_allocated++;
...@@ -1128,7 +1127,6 @@ static int __init debug_objects_replace_static_objects(void) ...@@ -1128,7 +1127,6 @@ static int __init debug_objects_replace_static_objects(void)
obj = kmem_cache_zalloc(obj_cache, GFP_KERNEL); obj = kmem_cache_zalloc(obj_cache, GFP_KERNEL);
if (!obj) if (!obj)
goto free; goto free;
kmemleak_ignore(obj);
hlist_add_head(&obj->node, &objects); hlist_add_head(&obj->node, &objects);
} }
...@@ -1184,7 +1182,8 @@ void __init debug_objects_mem_init(void) ...@@ -1184,7 +1182,8 @@ void __init debug_objects_mem_init(void)
obj_cache = kmem_cache_create("debug_objects_cache", obj_cache = kmem_cache_create("debug_objects_cache",
sizeof (struct debug_obj), 0, sizeof (struct debug_obj), 0,
SLAB_DEBUG_OBJECTS, NULL); SLAB_DEBUG_OBJECTS | SLAB_NOLEAKTRACE,
NULL);
if (!obj_cache || debug_objects_replace_static_objects()) { if (!obj_cache || debug_objects_replace_static_objects()) {
debug_objects_enabled = 0; debug_objects_enabled = 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