Commit 0d4a062a authored by Marco Elver's avatar Marco Elver Committed by Linus Torvalds
Browse files

mm: move helper to check slub_debug_enabled 

Move the helper to check slub_debug_enabled, so that we can confine the
use of #ifdef outside slub.c as well.

Link: https://lkml.kernel.org/r/20210705103229.8505-2-yee.lee@mediatek.com


Signed-off-by: default avatarMarco Elver <elver@google.com>
Signed-off-by: default avatarYee Lee <yee.lee@mediatek.com>
Suggested-by: default avatarMatthew Wilcox <willy@infradead.org>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Konovalov <andreyknvl@gmail.com>
Cc: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: Chinwen Chang <chinwen.chang@mediatek.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Kuan-Ying Lee <Kuan-Ying.Lee@mediatek.com>
Cc: Nicholas Tang <nicholas.tang@mediatek.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 40226a3d

mm/slab.h

+11 −4
Original line number Diff line number Diff line
@@ -216,10 +216,18 @@ DECLARE_STATIC_KEY_FALSE(slub_debug_enabled); 
#endif

extern void print_tracking(struct kmem_cache *s, void *object);

long validate_slab_cache(struct kmem_cache *s);

static inline bool __slub_debug_enabled(void)

{

	return static_branch_unlikely(&slub_debug_enabled);

}

#else

static inline void print_tracking(struct kmem_cache *s, void *object)

{

}

static inline bool __slub_debug_enabled(void)

{

	return false;

}

#endif



/*
@@ -229,11 +237,10 @@ static inline void print_tracking(struct kmem_cache *s, void *object) 
 */

static inline bool kmem_cache_debug_flags(struct kmem_cache *s, slab_flags_t flags)

{

#ifdef CONFIG_SLUB_DEBUG

	if (IS_ENABLED(CONFIG_SLUB_DEBUG))

		VM_WARN_ON_ONCE(!(flags & SLAB_DEBUG_FLAGS));

	if (static_branch_unlikely(&slub_debug_enabled))

	if (__slub_debug_enabled())

		return s->flags & flags;

#endif

	return false;

}

mm/slub.c

+0 −14
Original line number Diff line number Diff line
@@ -120,25 +120,11 @@ 
 */



#ifdef CONFIG_SLUB_DEBUG



#ifdef CONFIG_SLUB_DEBUG_ON

DEFINE_STATIC_KEY_TRUE(slub_debug_enabled);

#else

DEFINE_STATIC_KEY_FALSE(slub_debug_enabled);

#endif



static inline bool __slub_debug_enabled(void)

{

	return static_branch_unlikely(&slub_debug_enabled);

}



#else		/* CONFIG_SLUB_DEBUG */



static inline bool __slub_debug_enabled(void)

{

	return false;

}



#endif		/* CONFIG_SLUB_DEBUG */



static inline bool kmem_cache_debug(struct kmem_cache *s)