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=-15.1 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 DFC39C07E98 for ; Mon, 5 Jul 2021 06:52:05 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5A4EC613D1 for ; Mon, 5 Jul 2021 06:52:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5A4EC613D1 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 E78276B0011; Mon, 5 Jul 2021 02:52:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E4F4B6B0036; Mon, 5 Jul 2021 02:52:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CC8D16B005D; Mon, 5 Jul 2021 02:52:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id AB3836B0011 for ; Mon, 5 Jul 2021 02:52:04 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 1EA9620BD6 for ; Mon, 5 Jul 2021 06:52:04 +0000 (UTC) X-FDA: 78327614568.16.0CF36F2 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by imf05.hostedemail.com (Postfix) with ESMTP id C2D075002F02 for ; Mon, 5 Jul 2021 06:52:03 +0000 (UTC) Received: by mail-wr1-f43.google.com with SMTP id a8so8985806wrp.5 for ; Sun, 04 Jul 2021 23:52:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to :user-agent; bh=0PAq5gly45ZNE8e5BiWwjKT7YlCoXcC5+DypWR8xekQ=; b=teM2Bdl5BmbHgjRb4mT+Wc5tlBFFsvI/WLte/ypgOKGUdnv1OQ7Q4UHv391bGmdF2m fbjqfqpuKXxhzxCDJDI2lq3ePRxzqLiM9pmXPifuVuP3zMWZKJFPU5YmAOCjpcVqeuT+ 69FZ6JbInI1FogYB3U3CtedBGOV4antwVdPDtoL9m15ETVWCn02f42eWwCd74Kmoq9Ah X4zfSED0QHJhts6U9sEG7pgUZbDUQuGpITSr78bulxMXcFqeIVR8K9Byj/P1E/6F5Lm7 X9tkyUNtOZePnWwwfgmgIa1wZgiLvobUBXGpjyW7Im9d22zS83wFUbpQWU8F6BI7Nsn/ pxZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to:user-agent; bh=0PAq5gly45ZNE8e5BiWwjKT7YlCoXcC5+DypWR8xekQ=; b=GJ2H839tpbGytV4eBPok3aZPwTGLrvw2dzyOdt3/Q2LzOB7JpnRuxxLiYkgPMZU1cu SSr+YpHtyCMUPxGX0q7nuIi3AzQbsSL3SYSJLYjvhhLeYQu9Kqq06DrqM86Ghb8bVVmX 3eW4/kwTvuCW5d2Rb1NkSLLsZs5NUlzt846+eLyp3kLZMV2e1L+XWfbNzuVLCcs3Dqtw TjBg3sq8pWmL26BVgurKus0TuH5YO4BKuGGknVTac/f4JQ/wr2l1P2h68L8tolxrARK9 XHMINRc4SjwVKCF7N80stK2NjgR3b6Il8w3yCxImWWBjkeUzqf6lKTJC6ZUbHxgi38oR va1Q== X-Gm-Message-State: AOAM53092MvMKQQfv3JbJjBvkEXaRHHOkC6RtYEhmfGYgxY3kWqZrBW6 d3LFoCSjwWSI8Lo0AQDWFxB26g== X-Google-Smtp-Source: ABdhPJyNpOR+dyomUYhPcFDJgtUd7h/Ep6MW12XYAeNSolQ+4SM8/CIDil3Trk4tn13tfpTuwHudRw== X-Received: by 2002:a5d:638b:: with SMTP id p11mr13930736wru.380.1625467922388; Sun, 04 Jul 2021 23:52:02 -0700 (PDT) Received: from elver.google.com ([2a00:79e0:15:13:dddd:647c:7745:e5f7]) by smtp.gmail.com with ESMTPSA id a4sm11784090wru.55.2021.07.04.23.52.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jul 2021 23:52:01 -0700 (PDT) Date: Mon, 5 Jul 2021 08:51:55 +0200 From: Marco Elver To: Matthew Wilcox Cc: yee.lee@mediatek.com, linux-kernel@vger.kernel.org, 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" , "moderated list:ARM/Mediatek SoC support" , "moderated list:ARM/Mediatek SoC support" Subject: Re: [PATCH v5 1/2] mm: introduce helper to check slub_debug_enabled Message-ID: References: <20210705024101.1567-1-yee.lee@mediatek.com> <20210705024101.1567-2-yee.lee@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/2.0.5 (2021-01-21) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=google.com header.s=20161025 header.b=teM2Bdl5; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf05.hostedemail.com: domain of elver@google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=elver@google.com X-Rspamd-Server: rspam02 X-Stat-Signature: 4ww8esbr4qekeji83a5dw5khg7u45row X-Rspamd-Queue-Id: C2D075002F02 X-HE-Tag: 1625467923-969011 Content-Transfer-Encoding: quoted-printable 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 Mon, Jul 05, 2021 at 04:20AM +0100, Matthew Wilcox wrote: > On Mon, Jul 05, 2021 at 10:40:57AM +0800, yee.lee@mediatek.com wrote: > > From: Marco Elver > >=20 > > Introduce a helper to check slub_debug_enabled, so that we can confin= e > > the use of #ifdef to the definition of the slub_debug_enabled_unlikel= y() > > helper. >=20 > We don't usually embed '_unlikely' in function names; we > just do: >=20 > static inline bool slub_debug_enabled(void) > { > return static_branch_unlikely(&slub_debug_enabled); > } The names are identical, this obviously won't work: In file included from mm/slub.c:21: mm/slab.h:219:20: error: =E2=80=98slub_debug_enabled=E2=80=99 redeclared = as different kind of symbol 219 | static inline bool slub_debug_enabled(void) But it seems that someone had the same idea, and this merge window got a __slub_debug_enabled() with 792702911f58. Yee, can you replace this patch with the below: From: Marco Elver Date: Wed, 30 Jun 2021 20:56:57 +0200 Subject: [PATCH] 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. Signed-off-by: Marco Elver --- v6: * Move helper instead of introducing a new one. --- mm/slab.h | 15 +++++++++++---- mm/slub.c | 14 -------------- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/mm/slab.h b/mm/slab.h index 67e06637ff2e..f997fd5e42c8 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(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 =20 /* @@ -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_fla= gs_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()) return s->flags & flags; -#endif return false; } =20 diff --git a/mm/slub.c b/mm/slub.c index 2ee43ff667a5..090fa14628f9 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -119,25 +119,11 @@ */ =20 #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 */ =20 static inline bool kmem_cache_debug(struct kmem_cache *s) --=20 2.32.0.93.g670b81a890-goog