From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-23.4 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24E76C11F68 for ; Fri, 2 Jul 2021 09:34:07 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C6CA161413 for ; Fri, 2 Jul 2021 09:34:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C6CA161413 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 248496B0011; Fri, 2 Jul 2021 05:34:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1F8D96B0036; Fri, 2 Jul 2021 05:34:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 070EA6B005D; Fri, 2 Jul 2021 05:34:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0143.hostedemail.com [216.40.44.143]) by kanga.kvack.org (Postfix) with ESMTP id D24BE6B0011 for ; Fri, 2 Jul 2021 05:34:05 -0400 (EDT) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 85C8528480 for ; Fri, 2 Jul 2021 09:34:05 +0000 (UTC) X-FDA: 78317136450.02.2FB8B3A Received: from mail-oi1-f177.google.com (mail-oi1-f177.google.com [209.85.167.177]) by imf05.hostedemail.com (Postfix) with ESMTP id 464CA5000BD0 for ; Fri, 2 Jul 2021 09:34:05 +0000 (UTC) Received: by mail-oi1-f177.google.com with SMTP id b2so10643265oiy.6 for ; Fri, 02 Jul 2021 02:34:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=vrAYdCh2ggaj+XWyXcYy308yp58pQSy2cm79Y1b9M3w=; b=hNF+Pzl08HoowaYaI83wQ56Z3dXc8hRtqXGtkOzRz33spQN1kGyXCVYZVzm0DYWiLw XtCqS+WaXZriTD8y0SP0WsV9iOn77PsWScKeRn4c7PG9cj8ydXssDog7mjNCw8tmmuLE kK/MdzCEK4SKBRDgdHLCHcKpPKZuUv9KbQlZsSJ99wkV6LZRqUA7MZdDTdir0KunOwLX lD+r1KE0ZhmxbwGSwrPHUm2/Tsy4UGZZOG9CAMykeOXzLAkYHI/yBhyJ2wmodFGjJxWT pblIW+2gTt0xKiPPMkXLrT5fWrh9OBCPA3PjQmoVivLa/x88/0TG/o5HEJS/5C8jiftf Nbew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=vrAYdCh2ggaj+XWyXcYy308yp58pQSy2cm79Y1b9M3w=; b=moGahXuL4gPwj6CDafvzl4Y0f28A6QTJdFXvh1xOoB+G1tOuneNFXTQrBRf+XX/Ktv 44rf/2krGdBMrwcPkewpCed4cca+Ov28cNzhNFRezUf5556o81WyJJCeUxV4TmdVVH70 GhKjOSeGpKA9w9r0JJ+qQEkHnrWNGrNh+QZD3jtINpPDO9soGZSoYr+YKNX6b9HLbvDo YBuV2F972wBRaX978GNmYWbxEdngmIXENn0TU42GWa4f+1/Nk3YY3KeHzwtu+tlP9+PY CwzXjLWCS+++Uz1M7PzWz4lZi2lH4Cf4Nwekoty/AsCoZHKcPM+qdrDGYJPWjh1O7NBy m8UA== X-Gm-Message-State: AOAM532Ad31PG1ohe4dU+mqA00zA89g2i/7x6hBcgOE/CihDtNLbQVpt 9TeubyFEdU+VUa5cIfZMyCXdFou8u5KXBEide0ecIw== X-Google-Smtp-Source: ABdhPJzv4fiupIq0BP8aoyZl0EKj339UCB3ZRtMVV0Lv/baM7npJRmNBELCQcSGxXvHf8nlEIar0CsEzluqEKYruPtc= X-Received: by 2002:a05:6808:210e:: with SMTP id r14mr2475518oiw.172.1625218444412; Fri, 02 Jul 2021 02:34:04 -0700 (PDT) MIME-Version: 1.0 References: <20210702085332.10035-1-yee.lee@mediatek.com> In-Reply-To: <20210702085332.10035-1-yee.lee@mediatek.com> From: Marco Elver Date: Fri, 2 Jul 2021 11:33:53 +0200 Message-ID: Subject: Re: [PATCH v4 1/2] mm: introduce helper to check slub_debug_enabled 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 , 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" Content-Type: text/plain; charset="UTF-8" Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20161025 header.b=hNF+Pzl0; spf=pass (imf05.hostedemail.com: domain of elver@google.com designates 209.85.167.177 as permitted sender) smtp.mailfrom=elver@google.com; dmarc=pass (policy=reject) header.from=google.com X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 464CA5000BD0 X-Stat-Signature: tpogsof5znwes65yt4tgc9xz5an8hq6o X-HE-Tag: 1625218445-800010 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Fri, 2 Jul 2021 at 10:54, wrote: > > From: Marco Elver > > 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 > Signed-off-by: Yee Lee > > --- > 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