summaryrefslogtreecommitdiff
authorQian Cai <cai@gmx.us>2018-11-30 22:09:48 (GMT)
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org>2018-12-17 08:38:35 (GMT)
commitf4d2afe28f53f68c069afc8a7b42ecda003ac7af (patch)
tree73fb5fba79279a339277cbcf9c4c04d0a5d5b333
parent7f0a62fb6ee30def068a91faae290fc2bcc772cb (diff)
downloadcommon-f4d2afe28f53f68c069afc8a7b42ecda003ac7af.zip
common-f4d2afe28f53f68c069afc8a7b42ecda003ac7af.tar.gz
common-f4d2afe28f53f68c069afc8a7b42ecda003ac7af.tar.bz2
debugobjects: avoid recursive calls with kmemleak
[ Upstream commit 8de456cf87ba863e028c4dd01bae44255ce3d835 ] 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.us Signed-off-by: Qian Cai <cai@gmx.us> Suggested-by: Catalin Marinas <catalin.marinas@arm.com> Acked-by: Waiman Long <longman@redhat.com> Acked-by: Catalin 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: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat
-rw-r--r--lib/debugobjects.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/debugobjects.c b/lib/debugobjects.c
index 88580e8..1c43d4c 100644
--- a/lib/debugobjects.c
+++ b/lib/debugobjects.c
@@ -1110,7 +1110,8 @@ void __init debug_objects_mem_init(void)
obj_cache = kmem_cache_create("debug_objects_cache",
sizeof (struct debug_obj), 0,
- SLAB_DEBUG_OBJECTS, NULL);
+ SLAB_DEBUG_OBJECTS | SLAB_NOLEAKTRACE,
+ NULL);
if (!obj_cache || debug_objects_replace_static_objects()) {
debug_objects_enabled = 0;