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.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 84113C4338F for ; Wed, 25 Aug 2021 09:17:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 68EF5610E9 for ; Wed, 25 Aug 2021 09:17:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239668AbhHYJSN (ORCPT ); Wed, 25 Aug 2021 05:18:13 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:18038 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239608AbhHYJSJ (ORCPT ); Wed, 25 Aug 2021 05:18:09 -0400 Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4GvgJD5blFzbhGf; Wed, 25 Aug 2021 17:13:32 +0800 (CST) Received: from dggpemm500001.china.huawei.com (7.185.36.107) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 25 Aug 2021 17:17:22 +0800 Received: from localhost.localdomain.localdomain (10.175.113.25) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 25 Aug 2021 17:17:22 +0800 From: Kefeng Wang To: Russell King , Alexander Potapenko , Marco Elver , Dmitry Vyukov , , , CC: Andrew Morton , Kefeng Wang Subject: [PATCH 4/4] mm: kfence: Only load kfence_test when kfence is enabled Date: Wed, 25 Aug 2021 17:21:16 +0800 Message-ID: <20210825092116.149975-5-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210825092116.149975-1-wangkefeng.wang@huawei.com> References: <20210825092116.149975-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.113.25] X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Provide kfence_is_enabled() helper, only load kfence_test module when kfence is enabled. Signed-off-by: Kefeng Wang --- include/linux/kfence.h | 2 ++ mm/kfence/core.c | 8 ++++++++ mm/kfence/kfence_test.c | 2 ++ 3 files changed, 12 insertions(+) diff --git a/include/linux/kfence.h b/include/linux/kfence.h index 3fe6dd8a18c1..f08f24e8a726 100644 --- a/include/linux/kfence.h +++ b/include/linux/kfence.h @@ -22,6 +22,8 @@ #define KFENCE_POOL_SIZE ((CONFIG_KFENCE_NUM_OBJECTS + 1) * 2 * PAGE_SIZE) extern char *__kfence_pool; +bool kfence_is_enabled(void); + #ifdef CONFIG_KFENCE_STATIC_KEYS #include DECLARE_STATIC_KEY_FALSE(kfence_allocation_key); diff --git a/mm/kfence/core.c b/mm/kfence/core.c index 7a97db8bc8e7..f1aaa7ebdcad 100644 --- a/mm/kfence/core.c +++ b/mm/kfence/core.c @@ -51,6 +51,14 @@ static unsigned long kfence_sample_interval __read_mostly = CONFIG_KFENCE_SAMPLE #endif #define MODULE_PARAM_PREFIX "kfence." +bool kfence_is_enabled(void) +{ + if (!kfence_sample_interval || !READ_ONCE(kfence_enabled)) + return false; + return true; +} +EXPORT_SYMBOL_GPL(kfence_is_enabled); + static int param_set_sample_interval(const char *val, const struct kernel_param *kp) { unsigned long num; diff --git a/mm/kfence/kfence_test.c b/mm/kfence/kfence_test.c index eb6307c199ea..4087f9f1497e 100644 --- a/mm/kfence/kfence_test.c +++ b/mm/kfence/kfence_test.c @@ -847,6 +847,8 @@ static void unregister_tracepoints(struct tracepoint *tp, void *ignore) */ static int __init kfence_test_init(void) { + if (!kfence_is_enabled()) + return 0; /* * Because we want to be able to build the test as a module, we need to * iterate through all known tracepoints, since the static registration -- 2.26.2