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=-16.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,USER_AGENT_GIT 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 88720C07E9A for ; Mon, 5 Jul 2021 02:41:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6D4F4613D2 for ; Mon, 5 Jul 2021 02:41:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229852AbhGECnz (ORCPT ); Sun, 4 Jul 2021 22:43:55 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:51669 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S229824AbhGECnv (ORCPT ); Sun, 4 Jul 2021 22:43:51 -0400 X-UUID: 25a6ac1c61314a33b90c857c581a46a9-20210705 X-UUID: 25a6ac1c61314a33b90c857c581a46a9-20210705 Received: from mtkmbs10n2.mediatek.inc [(172.21.101.183)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1815970025; Mon, 05 Jul 2021 10:41:10 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs01n1.mediatek.inc (172.21.101.68) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 5 Jul 2021 10:41:08 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 5 Jul 2021 10:41:08 +0800 From: To: CC: , , , , Marco Elver , Yee Lee , 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: [PATCH v5 1/2] mm: introduce helper to check slub_debug_enabled Date: Mon, 5 Jul 2021 10:40:57 +0800 Message-ID: <20210705024101.1567-2-yee.lee@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20210705024101.1567-1-yee.lee@mediatek.com> References: <20210705024101.1567-1-yee.lee@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. 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 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=-17.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MIME_BASE64_TEXT,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,USER_AGENT_GIT 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 9734AC07E95 for ; Mon, 5 Jul 2021 02:41:27 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 277EA613D8 for ; Mon, 5 Jul 2021 02:41:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 277EA613D8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 525E46B0011; Sun, 4 Jul 2021 22:41:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4ADFD6B0036; Sun, 4 Jul 2021 22:41:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 327986B005D; Sun, 4 Jul 2021 22:41:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0131.hostedemail.com [216.40.44.131]) by kanga.kvack.org (Postfix) with ESMTP id 0702D6B0011 for ; Sun, 4 Jul 2021 22:41:25 -0400 (EDT) Received: from smtpin34.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 677E682499B9 for ; Mon, 5 Jul 2021 02:41:25 +0000 (UTC) X-FDA: 78326982930.34.F7C2390 Received: from mailgw01.mediatek.com (mailgw01.mediatek.com [216.200.240.184]) by imf26.hostedemail.com (Postfix) with ESMTP id 0A9E32001708 for ; Mon, 5 Jul 2021 02:41:22 +0000 (UTC) X-UUID: e3b4f13b6dac44b580815de580f45a55-20210704 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=B6t7erU9+iRByaPo4wC2X4X1SCmAAtDhr9EJz5GftOw=; b=qpGboqWQEb0Q3ci+l2Jvrsw489qOGK3/xSPwQVOz4muw/UkGSGR7Cc8wRbsZT/FKJ5Ww0HBIwUwbuKMt99suGYNt5Lp3n6bZzRGWXb3KvSlksEUi83XsYnEEofg2l1s0+EXG1SN2fAzJniISkcR5jqEsFe4PESxCv+BDArbl548=; X-UUID: e3b4f13b6dac44b580815de580f45a55-20210704 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1161700137; Sun, 04 Jul 2021 19:41:19 -0700 Received: from MTKMBS01N1.mediatek.inc (172.21.101.68) by MTKMBS62N2.mediatek.inc (172.29.193.42) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sun, 4 Jul 2021 19:41:17 -0700 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs01n1.mediatek.inc (172.21.101.68) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 5 Jul 2021 10:41:08 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 5 Jul 2021 10:41:08 +0800 From: To: CC: , , , , Marco Elver , Yee Lee , 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: [PATCH v5 1/2] mm: introduce helper to check slub_debug_enabled Date: Mon, 5 Jul 2021 10:40:57 +0800 Message-ID: <20210705024101.1567-2-yee.lee@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20210705024101.1567-1-yee.lee@mediatek.com> References: <20210705024101.1567-1-yee.lee@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Content-Transfer-Encoding: base64 Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=mediatek.com header.s=dk header.b=qpGboqWQ; spf=pass (imf26.hostedemail.com: domain of yee.lee@mediatek.com designates 216.200.240.184 as permitted sender) smtp.mailfrom=yee.lee@mediatek.com; dmarc=pass (policy=none) header.from=mediatek.com X-Stat-Signature: gfypz57rkpi9rx4m3d45yam8x3fsxubf X-Rspamd-Queue-Id: 0A9E32001708 X-Rspamd-Server: rspam06 X-HE-Tag: 1625452882-849977 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: RnJvbTogTWFyY28gRWx2ZXIgPGVsdmVyQGdvb2dsZS5jb20+DQoNCkludHJvZHVjZSBhIGhlbHBl ciB0byBjaGVjayBzbHViX2RlYnVnX2VuYWJsZWQsIHNvIHRoYXQgd2UgY2FuIGNvbmZpbmUNCnRo ZSB1c2Ugb2YgI2lmZGVmIHRvIHRoZSBkZWZpbml0aW9uIG9mIHRoZSBzbHViX2RlYnVnX2VuYWJs ZWRfdW5saWtlbHkoKQ0KaGVscGVyLg0KDQpTaWduZWQtb2ZmLWJ5OiBNYXJjbyBFbHZlciA8ZWx2 ZXJAZ29vZ2xlLmNvbT4NClNpZ25lZC1vZmYtYnk6IFllZSBMZWUgPHllZS5sZWVAbWVkaWF0ZWsu Y29tPg0KLS0tDQogbW0vc2xhYi5oIHwgMTUgKysrKysrKysrKystLS0tDQogMSBmaWxlIGNoYW5n ZWQsIDExIGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pDQoNCmRpZmYgLS1naXQgYS9tbS9z bGFiLmggYi9tbS9zbGFiLmgNCmluZGV4IDdiNjBlZjJmMzJjMy4uYTExMTI2YWZlMjRjIDEwMDY0 NA0KLS0tIGEvbW0vc2xhYi5oDQorKysgYi9tbS9zbGFiLmgNCkBAIC0yMTYsMTAgKzIxNiwxOCBA QCBERUNMQVJFX1NUQVRJQ19LRVlfRkFMU0Uoc2x1Yl9kZWJ1Z19lbmFibGVkKTsNCiAjZW5kaWYN CiBleHRlcm4gdm9pZCBwcmludF90cmFja2luZyhzdHJ1Y3Qga21lbV9jYWNoZSAqcywgdm9pZCAq b2JqZWN0KTsNCiBsb25nIHZhbGlkYXRlX3NsYWJfY2FjaGUoc3RydWN0IGttZW1fY2FjaGUgKnMp Ow0KK3N0YXRpYyBpbmxpbmUgYm9vbCBzbHViX2RlYnVnX2VuYWJsZWRfdW5saWtlbHkodm9pZCkN Cit7DQorCXJldHVybiBzdGF0aWNfYnJhbmNoX3VubGlrZWx5KCZzbHViX2RlYnVnX2VuYWJsZWQp Ow0KK30NCiAjZWxzZQ0KIHN0YXRpYyBpbmxpbmUgdm9pZCBwcmludF90cmFja2luZyhzdHJ1Y3Qg a21lbV9jYWNoZSAqcywgdm9pZCAqb2JqZWN0KQ0KIHsNCiB9DQorc3RhdGljIGlubGluZSBib29s IHNsdWJfZGVidWdfZW5hYmxlZF91bmxpa2VseSh2b2lkKQ0KK3sNCisJcmV0dXJuIGZhbHNlOw0K K30NCiAjZW5kaWYNCiANCiAvKg0KQEAgLTIyOSwxMSArMjM3LDEwIEBAIHN0YXRpYyBpbmxpbmUg dm9pZCBwcmludF90cmFja2luZyhzdHJ1Y3Qga21lbV9jYWNoZSAqcywgdm9pZCAqb2JqZWN0KQ0K ICAqLw0KIHN0YXRpYyBpbmxpbmUgYm9vbCBrbWVtX2NhY2hlX2RlYnVnX2ZsYWdzKHN0cnVjdCBr bWVtX2NhY2hlICpzLCBzbGFiX2ZsYWdzX3QgZmxhZ3MpDQogew0KLSNpZmRlZiBDT05GSUdfU0xV Ql9ERUJVRw0KLQlWTV9XQVJOX09OX09OQ0UoIShmbGFncyAmIFNMQUJfREVCVUdfRkxBR1MpKTsN Ci0JaWYgKHN0YXRpY19icmFuY2hfdW5saWtlbHkoJnNsdWJfZGVidWdfZW5hYmxlZCkpDQorCWlm IChJU19FTkFCTEVEKENPTkZJR19TTFVCX0RFQlVHKSkNCisJCVZNX1dBUk5fT05fT05DRSghKGZs YWdzICYgU0xBQl9ERUJVR19GTEFHUykpOw0KKwlpZiAoc2x1Yl9kZWJ1Z19lbmFibGVkX3VubGlr ZWx5KCkpDQogCQlyZXR1cm4gcy0+ZmxhZ3MgJiBmbGFnczsNCi0jZW5kaWYNCiAJcmV0dXJuIGZh bHNlOw0KIH0NCiANCi0tIA0KMi4xOC4wDQo= 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=-18.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_GIT 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 01965C07E95 for ; Mon, 5 Jul 2021 02:41:53 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A0E25613D0 for ; Mon, 5 Jul 2021 02:41:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A0E25613D0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=U0pdzuU6jcbuCvpOE6Obe3U33hR8ZjVI2c8KHU0JLX8=; b=CVzkoTQGsAyPKx J/nhfspHGhGm6kywx1fNbxEjXwY0RmHhNJuX3Ccd1h5vAoZirjLNH3JlS5KMNLwRGVcJqXEt9Rxvl TYHU//UE3/Ernji9a6UhitfVAcjanP3Zb8tHrgN9BZvx7+BUcRNOIDDmc4SctT8ReRLh9zoFeobrd p6nvpeT9pjYg9o9Ae0qNZZDT9y9VXOlvzPwN3QXSqHT2VSKrXTP+akuBF9jrRdEqSLuf1W8OkECbo vIKz+HxfXNYEDJ0h7xzZZ1sP0p0baFcWooVyH6BKOqUKr92ZFNB/JNI+x6ydP/SCyad0Ihenc67+W 02irtoPuDRFQe6n6DeGA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m0EYD-007Wnd-Cl; Mon, 05 Jul 2021 02:41:37 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m0EXz-007Wia-Bb; Mon, 05 Jul 2021 02:41:26 +0000 X-UUID: e3b4f13b6dac44b580815de580f45a55-20210704 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=B6t7erU9+iRByaPo4wC2X4X1SCmAAtDhr9EJz5GftOw=; b=qpGboqWQEb0Q3ci+l2Jvrsw489qOGK3/xSPwQVOz4muw/UkGSGR7Cc8wRbsZT/FKJ5Ww0HBIwUwbuKMt99suGYNt5Lp3n6bZzRGWXb3KvSlksEUi83XsYnEEofg2l1s0+EXG1SN2fAzJniISkcR5jqEsFe4PESxCv+BDArbl548=; X-UUID: e3b4f13b6dac44b580815de580f45a55-20210704 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1161700137; Sun, 04 Jul 2021 19:41:19 -0700 Received: from MTKMBS01N1.mediatek.inc (172.21.101.68) by MTKMBS62N2.mediatek.inc (172.29.193.42) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sun, 4 Jul 2021 19:41:17 -0700 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs01n1.mediatek.inc (172.21.101.68) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 5 Jul 2021 10:41:08 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 5 Jul 2021 10:41:08 +0800 From: To: CC: , , , , Marco Elver , Yee Lee , 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: [PATCH v5 1/2] mm: introduce helper to check slub_debug_enabled Date: Mon, 5 Jul 2021 10:40:57 +0800 Message-ID: <20210705024101.1567-2-yee.lee@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20210705024101.1567-1-yee.lee@mediatek.com> References: <20210705024101.1567-1-yee.lee@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210704_194124_855616_F7B04DE8 X-CRM114-Status: GOOD ( 10.29 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org 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. 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 _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek 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=-18.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_GIT 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 4B992C07E95 for ; Mon, 5 Jul 2021 02:43:54 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0CDBE613D0 for ; Mon, 5 Jul 2021 02:43:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0CDBE613D0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=B1nuqdVEUtimQ7gXNbP0XHh7iPJ+XVZFuOLiUfUISDE=; b=dhyVKzCQnquXr3 Sn5nHmKEBX9/95Zpu1Cz+6jGqfREhirk5/0i8cpwoZhxbVe0khJXXs80HjDeerQl9NsUu4yfevyRD 2SmEK6gvJoXlLofIWaDw7pQ4VwPGKzq+JgHurNmXQil69luTyOGlBD8swWS7rsX/roWV+tfhmXdL8 N5JwSVc8RCCnx8m0PcpDJjpiWdS04sqeMgWamKfquoHhknVOLtRTbc1wvrhnTcl8RrcuRC91qNaSj hqUWO1tCoTYjX6aq/2RHF2b4EBAOBeO3iiVSFZIVM8CrstGZcCt2bkcbx8sdKl0pGktQ6M8q7egOM uMrENoUcsrNYLnvQcvDg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m0EY4-007WlF-Dg; Mon, 05 Jul 2021 02:41:28 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m0EXz-007Wia-Bb; Mon, 05 Jul 2021 02:41:26 +0000 X-UUID: e3b4f13b6dac44b580815de580f45a55-20210704 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=B6t7erU9+iRByaPo4wC2X4X1SCmAAtDhr9EJz5GftOw=; b=qpGboqWQEb0Q3ci+l2Jvrsw489qOGK3/xSPwQVOz4muw/UkGSGR7Cc8wRbsZT/FKJ5Ww0HBIwUwbuKMt99suGYNt5Lp3n6bZzRGWXb3KvSlksEUi83XsYnEEofg2l1s0+EXG1SN2fAzJniISkcR5jqEsFe4PESxCv+BDArbl548=; X-UUID: e3b4f13b6dac44b580815de580f45a55-20210704 Received: from mtkcas66.mediatek.inc [(172.29.193.44)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1161700137; Sun, 04 Jul 2021 19:41:19 -0700 Received: from MTKMBS01N1.mediatek.inc (172.21.101.68) by MTKMBS62N2.mediatek.inc (172.29.193.42) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sun, 4 Jul 2021 19:41:17 -0700 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs01n1.mediatek.inc (172.21.101.68) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 5 Jul 2021 10:41:08 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Mon, 5 Jul 2021 10:41:08 +0800 From: To: CC: , , , , Marco Elver , Yee Lee , 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: [PATCH v5 1/2] mm: introduce helper to check slub_debug_enabled Date: Mon, 5 Jul 2021 10:40:57 +0800 Message-ID: <20210705024101.1567-2-yee.lee@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20210705024101.1567-1-yee.lee@mediatek.com> References: <20210705024101.1567-1-yee.lee@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210704_194124_855616_F7B04DE8 X-CRM114-Status: GOOD ( 10.29 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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. 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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel