From patchwork Tue Feb 18 08:15:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Wieczor-Retman X-Patchwork-Id: 13979237 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC099C02198 for ; Tue, 18 Feb 2025 08:16:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 70E492800F0; Tue, 18 Feb 2025 03:16:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 6BFC32800EC; Tue, 18 Feb 2025 03:16:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5385D2800F0; Tue, 18 Feb 2025 03:16:53 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 3670A2800EC for ; Tue, 18 Feb 2025 03:16:53 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id DE3241A0960 for ; Tue, 18 Feb 2025 08:16:52 +0000 (UTC) X-FDA: 83132359464.06.68F2A13 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by imf11.hostedemail.com (Postfix) with ESMTP id A2CC040018 for ; Tue, 18 Feb 2025 08:16:50 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=mX3WhEy9; spf=pass (imf11.hostedemail.com: domain of maciej.wieczor-retman@intel.com designates 192.198.163.16 as permitted sender) smtp.mailfrom=maciej.wieczor-retman@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739866610; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=1TTuXLxMopwWeFVdGnLcIPjRaZ96xctO0Nm3rLViPCA=; b=uBsw2HyX6eP0R8gq7F0pB6RQCJ8f9OVZ+gg6PSCdk9gPWDWMMrB4ketBhcT1bPzmzZ2TSm 6LpPW4PSoAfBexV2RgfXj2fBUPITaAjYpctvpKHKmAXhkZp3XtTArGY3veAAVLZixZPtJt orD8nrwAuIKFzfjsGwcudjMZ3HKQgdA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739866610; a=rsa-sha256; cv=none; b=AC+oPhqdeYsqSdz/MlZ7XsoQnEQtn5hzWL4QQ6gj66LIWHA+GCjdKdiJF5vcGgAU947lSl Q7/ctUjXB7VAHB1LKG/ru8QqOlKuRaT9F4+5L8s397o2R6WhKBN0fVy29k3jCGJ3jok4Yb 5WnCWjmO7XBSWcvg5WrZ4ZukGPHi+Bc= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=mX3WhEy9; spf=pass (imf11.hostedemail.com: domain of maciej.wieczor-retman@intel.com designates 192.198.163.16 as permitted sender) smtp.mailfrom=maciej.wieczor-retman@intel.com; dmarc=pass (policy=none) header.from=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1739866611; x=1771402611; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=o6OuX/IUpTkc++lHSC1ghvLKQzFvuT/g3IidU8BLRI0=; b=mX3WhEy9QJ0lMuEWrjD71IZaP95Ieo8bLnrqXjYOESa4HCZW9urxeSx/ 7jTyV+PSw6G1VO8um/xWxe48Io1WZwi3TxErU/mrG/fLJjlKFCUUC3XWH 3e5mpkcYbseSAwKgs6VProJjuHWKW7oITNjRctuXpar4+TdECDHAbJknq ag7gaHL9nKqlDh3QGcrLnoqaiKjSAP8JO+zyZ1Qv5IRnDK87Y5gZs24XS zNDtbU8GRHR3C0UWxWXd5aZltClSUw1dA/pY0D0KPh1e6QKQPi6bjfnLO nVDW4+niY62rHwbU4OIgCGRB8LYF1ho10iym9+AgEuQ1G1EAWJqnol/dA w==; X-CSE-ConnectionGUID: eOl4l5mlQumtDu6kbnx4eQ== X-CSE-MsgGUID: fdzHDGcbSIaVvOzYB5Rzdg== X-IronPort-AV: E=McAfee;i="6700,10204,11348"; a="28150018" X-IronPort-AV: E=Sophos;i="6.13,295,1732608000"; d="scan'208";a="28150018" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2025 00:16:49 -0800 X-CSE-ConnectionGUID: M5Fwk1/OT62LIgJLo5m/Ew== X-CSE-MsgGUID: 5TZpocIhS3iT+cIhiLsT0g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="119247387" Received: from ijarvine-mobl1.ger.corp.intel.com (HELO wieczorr-mobl1.intel.com) ([10.245.245.49]) by ORVIESA003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Feb 2025 00:16:28 -0800 From: Maciej Wieczor-Retman To: kees@kernel.org, julian.stecklina@cyberus-technology.de, kevinloughlin@google.com, peterz@infradead.org, tglx@linutronix.de, justinstitt@google.com, catalin.marinas@arm.com, wangkefeng.wang@huawei.com, bhe@redhat.com, ryabinin.a.a@gmail.com, kirill.shutemov@linux.intel.com, will@kernel.org, ardb@kernel.org, jason.andryuk@amd.com, dave.hansen@linux.intel.com, pasha.tatashin@soleen.com, ndesaulniers@google.com, guoweikang.kernel@gmail.com, dwmw@amazon.co.uk, mark.rutland@arm.com, broonie@kernel.org, apopple@nvidia.com, bp@alien8.de, rppt@kernel.org, kaleshsingh@google.com, richard.weiyang@gmail.com, luto@kernel.org, glider@google.com, pankaj.gupta@amd.com, andreyknvl@gmail.com, pawan.kumar.gupta@linux.intel.com, kuan-ying.lee@canonical.com, tony.luck@intel.com, tj@kernel.org, jgross@suse.com, dvyukov@google.com, baohua@kernel.org, samuel.holland@sifive.com, dennis@kernel.org, akpm@linux-foundation.org, thomas.weissschuh@linutronix.de, surenb@google.com, kbingham@kernel.org, ankita@nvidia.com, nathan@kernel.org, maciej.wieczor-retman@intel.com, ziy@nvidia.com, xin@zytor.com, rafael.j.wysocki@intel.com, andriy.shevchenko@linux.intel.com, cl@linux.com, jhubbard@nvidia.com, hpa@zytor.com, scott@os.amperecomputing.com, david@redhat.com, jan.kiszka@siemens.com, vincenzo.frascino@arm.com, corbet@lwn.net, maz@kernel.org, mingo@redhat.com, arnd@arndb.de, ytcoode@gmail.com, xur@google.com, morbo@google.com, thiago.bauermann@linaro.org Cc: linux-doc@vger.kernel.org, kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, llvm@lists.linux.dev, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, x86@kernel.org Subject: [PATCH v2 02/14] kasan: sw_tags: Check kasan_flag_enabled at runtime Date: Tue, 18 Feb 2025 09:15:18 +0100 Message-ID: X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: A2CC040018 X-Rspamd-Server: rspam07 X-Stat-Signature: czygxthyg76uc3dpeoawwtb8ndo3ac4t X-HE-Tag: 1739866610-25746 X-HE-Meta: U2FsdGVkX19pXXxVyBEt/AKIZvR4S0+Yw0DOTfftgRNOY3T6NqcJGlZ54BUkbPwXALfb0PtUWXqVpbK0QoE/q3ZYj8mqd5400+wWDPhiyCpHI+RoddY8MNyZ4thszNcd84Uyk5NrrbOjFt1hp7nWHVchudgEU+WQSvM1xNfTM27t65HFacNfLkHG3692/Zr8oCUfltTeK+Oq/bnkOunoQv+ktblPQE/YHanA3Yv2pQ9g0HJhMvx/kR+rUln3O7yTvm71UbZc2PxX7NivEHQtQ3qT5sV28wnHlnQIWtszGB2AXDUgKGPJDYmvXJeKzZSFSgAj6QA5azVTgJYVQ+/lRe/pyV/085TSlpHWSsWRq6+bPwS49oZVi5Ek3+uJ0EGe1bEwhIwhdrxd3p0msIZpX1I/u7sKOAFvOjSUAsdbaqwzpJZuXgha69BhSHsCCX6dwrulnbD/h2PWXDgU2QbOem34GvFECmCdjek+aFjnN+r/M2gX6aI7Ukq3XJRa4VcY0H+kPNiJQdw+btYxOsZT24QvwZq9xGg47yQhNKU08phQng2hspauqm+KI8erZEed0aNfcK7jon5VYhIK6WnX3gbFmW59wyI/VRBh9R1w/DifaV26LBDDg+5bTOCG2deHJwB3afjwtd0GxXE1ZBEGbysiCb6MKQ3koJ4Hy6TB+HZM86J6G7K1CF42rbCWq1AQ3OYKdrBJD/QINPyhOrGlbPYpxpuUShGGNHRZxpjDX9qD5zjJjayb0jcdTbjHj72B2a58qXYGGw5vY5D8GWdE4fXmdwTVX9pI4gqdr1StwGtF9DCTnToZa9b9NOmBePrHF/XMlk1HOzh8eOpFaNvxzlX7ZbWN/YQ7sSTy1KiMxVtSvZEUQmSFnxVjTAwxaXea7X9sxRsxqd3BFlul5LkrlHamGGoMCyboVqV4C1syn23tB/RljPvZ5SYYwRt1kwLCkGE49W9/HzDdNbeNVS2 UlPAE5Sl mUDpxOpu+TZoGQfZlwdACTlIQZv6fklRtXxA5QcC2fDIqO0voUL17nFA1kHFjSNPXDSleMKjoFf1jGHirjPDB9XJcXa8Q+x7fY/QIwUGV7+rTY34rBGxpe1nMncUYE3oiCn8pF1VTcIv0uRqrImcWsUViqDk8bPLFuRvh8SMb261o7o2Mw2svs7nOASLI03n7AgEtl3xG5XT5CT1RDsroulYHXtmkuZC+8juBKJDV39VfldHHHIS55eAJfi5rxZ4GTHhGDq59QzFXRvuEaaiOzDFzc5O/2MucB6Qnd8olG1jUDVjc+x4GUQyceAroKHHTwriccF9OTWXHjVNLqmSmDxB1YVXEQk1l5NO5kkWz+lGYL7ZSmGadHsC2N0lkzCuFQVQsEW3N+tG5BXQXV/qYxbt1i7Fsoru4f6q/eHeoCbh/GVAxyy5KVTy3C22kdkXnwvae 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: List-Subscribe: List-Unsubscribe: From: Samuel Holland On RISC-V, the ISA extension required to dereference tagged pointers is optional, and the interface to enable pointer masking requires firmware support. Therefore, we must detect at runtime if sw_tags is usable on a given machine. Reuse the logic from hw_tags to dynamically enable KASAN. This commit makes no functional change to the KASAN_HW_TAGS code path. Reviewed-by: Andrey Konovalov Signed-off-by: Samuel Holland Signed-off-by: Maciej Wieczor-Retman --- include/linux/kasan-enabled.h | 15 +++++---------- mm/kasan/hw_tags.c | 10 ---------- mm/kasan/tags.c | 10 ++++++++++ 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/include/linux/kasan-enabled.h b/include/linux/kasan-enabled.h index 6f612d69ea0c..648bda9495b7 100644 --- a/include/linux/kasan-enabled.h +++ b/include/linux/kasan-enabled.h @@ -4,7 +4,7 @@ #include -#ifdef CONFIG_KASAN_HW_TAGS +#if defined(CONFIG_KASAN_SW_TAGS) || defined(CONFIG_KASAN_HW_TAGS) DECLARE_STATIC_KEY_FALSE(kasan_flag_enabled); @@ -13,23 +13,18 @@ static __always_inline bool kasan_enabled(void) return static_branch_likely(&kasan_flag_enabled); } -static inline bool kasan_hw_tags_enabled(void) -{ - return kasan_enabled(); -} - -#else /* CONFIG_KASAN_HW_TAGS */ +#else /* CONFIG_KASAN_SW_TAGS || CONFIG_KASAN_HW_TAGS */ static inline bool kasan_enabled(void) { return IS_ENABLED(CONFIG_KASAN); } +#endif /* CONFIG_KASAN_SW_TAGS || CONFIG_KASAN_HW_TAGS */ + static inline bool kasan_hw_tags_enabled(void) { - return false; + return IS_ENABLED(CONFIG_KASAN_HW_TAGS) && kasan_enabled(); } -#endif /* CONFIG_KASAN_HW_TAGS */ - #endif /* LINUX_KASAN_ENABLED_H */ diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c index 9a6927394b54..7f82af13b6a6 100644 --- a/mm/kasan/hw_tags.c +++ b/mm/kasan/hw_tags.c @@ -45,13 +45,6 @@ static enum kasan_arg kasan_arg __ro_after_init; static enum kasan_arg_mode kasan_arg_mode __ro_after_init; static enum kasan_arg_vmalloc kasan_arg_vmalloc __initdata; -/* - * Whether KASAN is enabled at all. - * The value remains false until KASAN is initialized by kasan_init_hw_tags(). - */ -DEFINE_STATIC_KEY_FALSE(kasan_flag_enabled); -EXPORT_SYMBOL(kasan_flag_enabled); - /* * Whether the selected mode is synchronous, asynchronous, or asymmetric. * Defaults to KASAN_MODE_SYNC. @@ -259,9 +252,6 @@ void __init kasan_init_hw_tags(void) kasan_init_tags(); - /* KASAN is now initialized, enable it. */ - static_branch_enable(&kasan_flag_enabled); - pr_info("KernelAddressSanitizer initialized (hw-tags, mode=%s, vmalloc=%s, stacktrace=%s)\n", kasan_mode_info(), str_on_off(kasan_vmalloc_enabled()), diff --git a/mm/kasan/tags.c b/mm/kasan/tags.c index d65d48b85f90..c111d98961ed 100644 --- a/mm/kasan/tags.c +++ b/mm/kasan/tags.c @@ -32,6 +32,13 @@ enum kasan_arg_stacktrace { static enum kasan_arg_stacktrace kasan_arg_stacktrace __initdata; +/* + * Whether KASAN is enabled at all. + * The value remains false until KASAN is initialized by kasan_init_tags(). + */ +DEFINE_STATIC_KEY_FALSE(kasan_flag_enabled); +EXPORT_SYMBOL(kasan_flag_enabled); + /* Whether to collect alloc/free stack traces. */ DEFINE_STATIC_KEY_TRUE(kasan_flag_stacktrace); @@ -92,6 +99,9 @@ void __init kasan_init_tags(void) if (WARN_ON(!stack_ring.entries)) static_branch_disable(&kasan_flag_stacktrace); } + + /* KASAN is now initialized, enable it. */ + static_branch_enable(&kasan_flag_enabled); } static void save_stack_info(struct kmem_cache *cache, void *object,