From: Marco Elver <elver@google.com>
To: yee.lee@mediatek.com
Cc: andreyknvl@gmail.com, wsd_upstream@mediatek.com,
nicholas.tang@mediatek.com, Kuan-Ying.Lee@mediatek.com,
chinwen.chang@mediatek.com, Christoph Lameter <cl@linux.com>,
Pekka Enberg <penberg@kernel.org>,
David Rientjes <rientjes@google.com>,
Joonsoo Kim <iamjoonsoo.kim@lge.com>,
Andrew Morton <akpm@linux-foundation.org>,
Vlastimil Babka <vbabka@suse.cz>,
Matthias Brugger <matthias.bgg@gmail.com>,
"open list:SLAB ALLOCATOR" <linux-mm@kvack.org>,
open list <linux-kernel@vger.kernel.org>,
"moderated list:ARM/Mediatek SoC support"
<linux-arm-kernel@lists.infradead.org>,
"moderated list:ARM/Mediatek SoC support"
<linux-mediatek@lists.infradead.org>
Subject: Re: [PATCH v4 1/2] mm: introduce helper to check slub_debug_enabled
Date: Fri, 2 Jul 2021 11:33:53 +0200 [thread overview]
Message-ID: <CANpmjNPqHJqAaDBJDA1t-OOWKMSs5sqbwVRAkQr+E6w5EgJ1Nw@mail.gmail.com> (raw)
In-Reply-To: <20210702085332.10035-1-yee.lee@mediatek.com>
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
prev parent reply other threads:[~2021-07-02 9:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CANpmjNPqHJqAaDBJDA1t-OOWKMSs5sqbwVRAkQr+E6w5EgJ1Nw@mail.gmail.com \
--to=elver@google.com \
--cc=Kuan-Ying.Lee@mediatek.com \
--cc=akpm@linux-foundation.org \
--cc=andreyknvl@gmail.com \
--cc=chinwen.chang@mediatek.com \
--cc=cl@linux.com \
--cc=iamjoonsoo.kim@lge.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-mm@kvack.org \
--cc=matthias.bgg@gmail.com \
--cc=nicholas.tang@mediatek.com \
--cc=penberg@kernel.org \
--cc=rientjes@google.com \
--cc=vbabka@suse.cz \
--cc=wsd_upstream@mediatek.com \
--cc=yee.lee@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).