* [PATCH v4 1/2] mm: introduce helper to check slub_debug_enabled
@ 2021-07-02 8:53 yee.lee
2021-07-02 9:33 ` Marco Elver
0 siblings, 1 reply; 2+ messages in thread
From: yee.lee @ 2021-07-02 8:53 UTC (permalink / raw)
To: andreyknvl
Cc: wsd_upstream, nicholas.Tang, Kuan-Ying.lee, chinwen.chang,
Marco Elver, Yee Lee, Christoph Lameter, Pekka Enberg,
David Rientjes, Joonsoo Kim, Andrew Morton, Vlastimil Babka,
Matthias Brugger, open list:SLAB ALLOCATOR, open list,
moderated list:ARM/Mediatek SoC support,
moderated list:ARM/Mediatek SoC support
From: Marco Elver <elver@google.com>
Introduce a helper to check slub_debug_enabled, so that we can confine
the use of #ifdef to the definition of the slub_debug_enabled_unlikely()
helper.
---
Signed-off-by: Marco Elver <elver@google.com>
Signed-off-by: Yee Lee <yee.lee@mediatek.com>
---
mm/slab.h | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/mm/slab.h b/mm/slab.h
index 7b60ef2f32c3..a11126afe24c 100644
--- a/mm/slab.h
+++ b/mm/slab.h
@@ -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_unlikely(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_unlikely(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
- VM_WARN_ON_ONCE(!(flags & SLAB_DEBUG_FLAGS));
- if (static_branch_unlikely(&slub_debug_enabled))
+ if (IS_ENABLED(CONFIG_SLUB_DEBUG))
+ VM_WARN_ON_ONCE(!(flags & SLAB_DEBUG_FLAGS));
+ if (slub_debug_enabled_unlikely())
return s->flags & flags;
-#endif
return false;
}
--
2.18.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v4 1/2] mm: introduce helper to check slub_debug_enabled
2021-07-02 8:53 [PATCH v4 1/2] mm: introduce helper to check slub_debug_enabled yee.lee
@ 2021-07-02 9:33 ` Marco Elver
0 siblings, 0 replies; 2+ messages in thread
From: Marco Elver @ 2021-07-02 9:33 UTC (permalink / raw)
To: yee.lee
Cc: andreyknvl, wsd_upstream, nicholas.tang, Kuan-Ying.Lee,
chinwen.chang, Christoph Lameter, Pekka Enberg, David Rientjes,
Joonsoo Kim, Andrew Morton, Vlastimil Babka, Matthias Brugger,
open list:SLAB ALLOCATOR, open list,
moderated list:ARM/Mediatek SoC support,
moderated list:ARM/Mediatek SoC support
On Fri, 2 Jul 2021 at 10:54, <yee.lee@mediatek.com> wrote:
>
> From: Marco Elver <elver@google.com>
>
> Introduce a helper to check slub_debug_enabled, so that we can confine
> the use of #ifdef to the definition of the slub_debug_enabled_unlikely()
> helper.
>
> ---
^^ this '---' is wrong. It needs to be removed, because anything after
the first '---' will be discarded if it is turned into a commit by the
maintainer.
> Signed-off-by: Marco Elver <elver@google.com>
> Signed-off-by: Yee Lee <yee.lee@mediatek.com>
>
> ---
> mm/slab.h | 15 +++++++++++----
> 1 file changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/mm/slab.h b/mm/slab.h
> index 7b60ef2f32c3..a11126afe24c 100644
> --- a/mm/slab.h
> +++ b/mm/slab.h
> @@ -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_unlikely(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_unlikely(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
> - VM_WARN_ON_ONCE(!(flags & SLAB_DEBUG_FLAGS));
> - if (static_branch_unlikely(&slub_debug_enabled))
> + if (IS_ENABLED(CONFIG_SLUB_DEBUG))
> + VM_WARN_ON_ONCE(!(flags & SLAB_DEBUG_FLAGS));
> + if (slub_debug_enabled_unlikely())
> return s->flags & flags;
> -#endif
> return false;
> }
>
> --
> 2.18.0
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-02 9:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-02 8:53 [PATCH v4 1/2] mm: introduce helper to check slub_debug_enabled yee.lee
2021-07-02 9:33 ` Marco Elver
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).