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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0868AC7EE30 for ; Thu, 26 Jun 2025 15:32:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 99EB56B0092; Thu, 26 Jun 2025 11:32:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9769F8D0005; Thu, 26 Jun 2025 11:32:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 88BAA8D0001; Thu, 26 Jun 2025 11:32:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 77BE36B0092 for ; Thu, 26 Jun 2025 11:32:15 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 47977C0267 for ; Thu, 26 Jun 2025 15:32:15 +0000 (UTC) X-FDA: 83597943030.17.9CB0BFA Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) by imf10.hostedemail.com (Postfix) with ESMTP id 287A7C001A for ; Thu, 26 Jun 2025 15:32:12 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=a9M8XMHP; spf=pass (imf10.hostedemail.com: domain of snovitoll@gmail.com designates 209.85.167.50 as permitted sender) smtp.mailfrom=snovitoll@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750951933; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=8WWyylL/OQDZN+BQlllp9O148iIrISnZhKRdMW4Il1I=; b=o4pAX3a7buplWLSBskCOEZeRxvXZHOJbpEhkls6yPlnvOS4tq2igMqQ+K0GXA1Vq2N6odd i8Jau2HWiIzfoKCLjRKP6PP+xyEVRgyIcQET2EbinS96z7OYfs98VYF6dI+n3Te34bKiuv LDLCW7nmjCHnD/DOSd9lhST7/HiR0/c= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=a9M8XMHP; spf=pass (imf10.hostedemail.com: domain of snovitoll@gmail.com designates 209.85.167.50 as permitted sender) smtp.mailfrom=snovitoll@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750951933; a=rsa-sha256; cv=none; b=nsiIV/b/FTTOHyv8EqaxMMIYi9exv5A1PcOpGmitFRVBb8+HF34cWpXbdwk/aSRg/QCZhD QYp3O/7Cd5t3iOfrtITuPASkqcPAQY4ghWM/FV0nNw061994bVM37fgOjE1uFWMvbOiPc9 WxkBD4vCmAlaE70sQPqgYwT45HXVffE= Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-555024588b1so1398889e87.1 for ; Thu, 26 Jun 2025 08:32:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750951931; x=1751556731; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=8WWyylL/OQDZN+BQlllp9O148iIrISnZhKRdMW4Il1I=; b=a9M8XMHPs7rBmjZ2cTMNZe8lIvAvtno1ZHYLDwWX4iEc42kbEB6BARZRneIMp2crLc ezy75CNNQAPCMeiyQrMCaB2qYNdZLxRPdB2xW3PtFtohq8XNIdShBWmF7ZzTSfUfxwwj Hl/GIIa9wqTiRVdueBHhCDcNw26BrdWHmu/upHkgyW3+af2BttXnMOKD1ZjJtyM7oXJ1 HmmcJ6kFT8im/k8BLAUZu53B+sKYEI+OI96qHZ1YQ+Ev8Ld4dyBq7EVCcbJMZ3up+FLl 5Wxeb0juaw22M42lTStU6TL89yf63xw7OsKPg7dUyk3ih5nXdxdiv6RjgnMQ+luwvinI V2mA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750951931; x=1751556731; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8WWyylL/OQDZN+BQlllp9O148iIrISnZhKRdMW4Il1I=; b=gpf9cOrahEFEIfuwz/zlP3qPSAx3Ubkk5iH4pJ3cRzsl5G7IXyciL7Lked/ShLxxP3 mYS8uP02hZqK5v6c7V0wiLlymKPYQZE/C4Fk6k+45e/ijsW7XHRznRY0Z1+EkF3IOk2y SFvfSorD0l9IsOmtbxHCYjngFbgPS2/E7at+krGD5C7lRUa8erLKOwWIEmPtdUb2ODra XdwJN/pjykz4m5GG5xlNvpaVLkpG/c7H8ncWQZl4FpYC8wH+9TtvtJYCkHTUGbWwtbAW Qit8DEN1Bt+BY6G2PKl+5oW9TlB3MOzkOz7KVRXhnf/KqPQwIwFl5Ti08MkMAabIXGMh 5kPA== X-Forwarded-Encrypted: i=1; AJvYcCWqlQhY1BbMsBGmVmKUNNeNleyHC5C0JxCg12hNazIisaw4T2VToHnqyEOtqaVJZZlaCWS5DQCVWw==@kvack.org X-Gm-Message-State: AOJu0Yzewnnqpa0qFNq86qrhV856JX2omMRvI0FB4c7NDG52vgoGK+zV PqIhOZyrVsJxBd7H9bv4gOW8mjFdrzhAf4fWAS+VzTOTUOqLdqKNTRH7 X-Gm-Gg: ASbGncuNg39YibvABYJAhWybvr2YWWNtBj1mAAVLgQSFdm0E9IXKroYN8aH69g5X9rc k1r4qtwFy9i+gOm8BkavuFWl9rDf74IcrwVut34EvOe6hJnun+h2ac8N3BPnFrvehvrp7MKfXhG 7NHMb7TfdBLGiwQJlD36BKg7cvXte+56DB/T/HLpnqJjnZqHc6kvOoK1QUEWFby1ecABINZuaIm C6K2NGC2ePo5BCCELrATc/Kd70TvjR9SaXY1kVzSC/mdRJlc5AGeW8wXkS8lRQDgrL0z7arimhV a6XGDuuhq4ZRCNZy27jOBMz2+hodzeNG7gN0OnvIbP8qPfPx7Wem1m4HYFA4k/tztThf7heUA/h ovja8XGYJbJtmpgPgj+gLOIqlVE9Ez1nqSiBz1g8u X-Google-Smtp-Source: AGHT+IE9GYxLiOYhxIA5Ev3WJWnszBqvgVmZmVZpoI4KzTn4pH5uj6GPwII6Blv/6T015vTzfPK1pQ== X-Received: by 2002:a05:6512:b91:b0:553:adf7:e740 with SMTP id 2adb3069b0e04-554fdd1d728mr2765576e87.28.1750951930696; Thu, 26 Jun 2025 08:32:10 -0700 (PDT) Received: from localhost.localdomain (2.135.54.165.dynamic.telecom.kz. [2.135.54.165]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5550b2ce1fasm42792e87.174.2025.06.26.08.32.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jun 2025 08:32:10 -0700 (PDT) From: Sabyrzhan Tasbolatov To: ryabinin.a.a@gmail.com, glider@google.com, andreyknvl@gmail.com, dvyukov@google.com, vincenzo.frascino@arm.com, linux@armlinux.org.uk, catalin.marinas@arm.com, will@kernel.org, chenhuacai@kernel.org, kernel@xen0n.name, maddy@linux.ibm.com, mpe@ellerman.id.au, npiggin@gmail.com, christophe.leroy@csgroup.eu, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, alex@ghiti.fr, hca@linux.ibm.com, gor@linux.ibm.com, agordeev@linux.ibm.com, borntraeger@linux.ibm.com, svens@linux.ibm.com, richard@nod.at, anton.ivanov@cambridgegreys.com, johannes@sipsolutions.net, dave.hansen@linux.intel.com, luto@kernel.org, peterz@infradead.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, hpa@zytor.com, chris@zankel.net, jcmvbkbc@gmail.com, akpm@linux-foundation.org, nathan@kernel.org, nick.desaulniers+lkml@gmail.com, morbo@google.com, justinstitt@google.com Cc: arnd@arndb.de, rppt@kernel.org, geert@linux-m68k.org, mcgrof@kernel.org, guoweikang.kernel@gmail.com, tiwei.btw@antgroup.com, kevin.brodsky@arm.com, benjamin.berg@intel.com, kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-um@lists.infradead.org, linux-mm@kvack.org, llvm@lists.linux.dev, snovitoll@gmail.com Subject: [PATCH v2 01/11] kasan: unify static kasan_flag_enabled across modes Date: Thu, 26 Jun 2025 20:31:37 +0500 Message-Id: <20250626153147.145312-2-snovitoll@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250626153147.145312-1-snovitoll@gmail.com> References: <20250626153147.145312-1-snovitoll@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 287A7C001A X-Stat-Signature: n74h19nj7ipte1isewbphk3mcupiie7x X-Rspam-User: X-HE-Tag: 1750951932-146565 X-HE-Meta: U2FsdGVkX1+8a/HhBHdAYCq8yNYm69BoaGIR8PW/8U4rs8P336p4dZGCJwEm34u0/d5AAEjtcnI0S9OYDn8YthokHyUdiulBC5r/If0AZ6n+stobH/riLOlL+nf/VP2gkiLQhVah1yRRIK4A/BfxQASlR9pXzVUaZWwuHpU1yomlFrkr/4PIX3xN8VsRFIX03vhou3egz0/iZf1Wd3vluL0VMtM/DYpqoqa8pYvmOjZbdii3d6UxtoxCeQeTd6KPoqkcmqgLrU0v+Lkno0eyYLLvuwVUBlarhiaRLzDimjoEzAJAJelBmvdQteMj+tClJDvuojbgtF6kTtv59ibcYby8Yc+OT3OmAgka3XiW/MSH3LbxQnVKpSjJ3WKnrnmLxSccyDekieNgyy2t/payYpb6rwtucee4VBWKekYWQhf9q4PRycnigbrZow/6H7NZkw1nldUrmVM8THc3YRvVtru6jWL1J02TAnTM2VN35qHl1f7NUip6nhkvrn2ApJ5kbgZH/7jXTj51BX0Zik+U31VxDY19TAZ3S69uBmBrUc4Gkyk0T45ULZ9eH7nGEgft4V+XEDOVfI7cgl8XeV3fHZyG/8AMi7zlTUMrTC6PSHvphqJllm5y5harqFYTRDRBua+itgWAzf9NqVt7+VjNtXEoH3aK+Y2BXudMgdZMwbcky65W4AWy3U8Z5G+ZcjOa8bTGMsemCUgFipS2EJ0RqdDZiZR84PxTIPZg8nRXWX8vpsW5DFhxWpSglle1bGg8DPd1ZQRt3Y7ZpyI2NGz+i01jXw93AwidopMtvtTrEhgvhWyquQyL3bQZUKE/Ivfh6UlsThb54+XsHjDQDGX9CuyADEVEoqSGuUqumiZUIILUHIQX0qidCOk7DE36+J7x3HKKXhnCWzlpNm/qWrEBnhULnhU97D2XzIjvPguOFEkbW6d6gZry8RnEiTpwiMTDAXee6gLRbhcWhUbHMze oI0VABev NL5ILr+yEH4cyGqoOXuOZ2vYhe4WeW1mt2BUA1I7KRPUi09LQoHhBOvYegbwrp7S2a+4PXz1Q4+eS4kxUk1O0RxUfE0Zm8BQ9uDbwBUvHyifduvj8dZo1Wvrex5oRMpiSoW890a9SC+rzBYnCvuzJzFTlkcdFShKhV4GQrDY0csgy3D9CJOznyvnfdVo8iBSly1UcrGFiCXZHzdfpvTPJudqKX2pbp9pr+dQzNGp7BvrZxAHk9oQFCGrklwsGDlOntdpLMzOno4rmjDSpqcE+PsyZB5nEULsRQN0ztPoE6c75ZgPuF+OnFuiIzDhjsctZTAtqC0Slw6uI1OzAFfzM/OAXRBYtLisPvm+gtJ/m9AKUtuyotCI8t/6ioPheZCjki6m6wHeF7UbyE5my+41N6fb00VBsjbKRz9i4j44Ky1aWixi7ytn2Q6Buq9GBsnIB5ek3EJ7Yr53VbM4LszWgLm6XTgKIfWQZfNX8B/yQi/Q82axhiwDTaDOyEGhRsm25EJqlhMF7u0o4dyFb+xius5XNdKdjOToPxlXdnfas/V5B8Whk86H4peqTEmPaOTZwI+gmvV8I/FTrAMm8wo8H4HOb4RtV+V48tdhHOuNDL6blamTdZ/8Rn1S1ZiiPNnMiEIEv 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: Historically, the runtime static key kasan_flag_enabled existed only for CONFIG_KASAN_HW_TAGS mode. Generic and SW_TAGS modes either relied on architecture-specific kasan_arch_is_ready() implementations or evaluated KASAN checks unconditionally, leading to code duplication. This patch unifies the approach by: 1. Moving kasan_flag_enabled declaration under CONFIG_KASAN (all modes) instead of only CONFIG_KASAN_HW_TAGS 2. Moving the static key definition to common.c for shared usage 3. Adding kasan_init_generic() function that enables the static key and handles initialization for Generic mode 4. Updating SW_TAGS mode to enable the unified static key 5. Removing the duplicate static key definition from HW_TAGS After this change, all KASAN modes use the same underlying static key infrastructure. The kasan_enabled() function now provides consistent runtime enable behavior across Generic, SW_TAGS, and HW_TAGS modes. This maintains a backward compatibility - existing architecture code continues to work unchanged, but now benefits from the unified runtime control mechanism. The architecture-specific kasan_arch_is_ready() implementations can be gradually replaced with calls to the new kasan_init_generic() function. Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218315 Signed-off-by: Sabyrzhan Tasbolatov --- include/linux/kasan-enabled.h | 10 ++++++++-- include/linux/kasan.h | 6 ++++++ mm/kasan/common.c | 7 +++++++ mm/kasan/generic.c | 11 +++++++++++ mm/kasan/hw_tags.c | 7 ------- mm/kasan/sw_tags.c | 2 ++ 6 files changed, 34 insertions(+), 9 deletions(-) diff --git a/include/linux/kasan-enabled.h b/include/linux/kasan-enabled.h index 6f612d69ea0..2b1351c30c6 100644 --- a/include/linux/kasan-enabled.h +++ b/include/linux/kasan-enabled.h @@ -4,9 +4,15 @@ #include -#ifdef CONFIG_KASAN_HW_TAGS - +#ifdef CONFIG_KASAN +/* + * Global runtime flag. Starts ‘false’; switched to ‘true’ by + * the appropriate kasan_init_*() once KASAN is fully initialized. + */ DECLARE_STATIC_KEY_FALSE(kasan_flag_enabled); +#endif + +#ifdef CONFIG_KASAN_HW_TAGS static __always_inline bool kasan_enabled(void) { diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 890011071f2..51a8293d1af 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -543,6 +543,12 @@ void kasan_report_async(void); #endif /* CONFIG_KASAN_HW_TAGS */ +#ifdef CONFIG_KASAN_GENERIC +void __init kasan_init_generic(void); +#else +static inline void kasan_init_generic(void) { } +#endif + #ifdef CONFIG_KASAN_SW_TAGS void __init kasan_init_sw_tags(void); #else diff --git a/mm/kasan/common.c b/mm/kasan/common.c index ed4873e18c7..525194da25f 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -32,6 +32,13 @@ #include "kasan.h" #include "../slab.h" +/* + * Definition of the unified static key declared in kasan-enabled.h. + * This provides consistent runtime enable/disable across all KASAN modes. + */ +DEFINE_STATIC_KEY_FALSE(kasan_flag_enabled); +EXPORT_SYMBOL(kasan_flag_enabled); + struct slab *kasan_addr_to_slab(const void *addr) { if (virt_addr_valid(addr)) diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c index d54e89f8c3e..32c432df24a 100644 --- a/mm/kasan/generic.c +++ b/mm/kasan/generic.c @@ -36,6 +36,17 @@ #include "kasan.h" #include "../slab.h" +/* + * Initialize Generic KASAN and enable runtime checks. + * This should be called from arch kasan_init() once shadow memory is ready. + */ +void __init kasan_init_generic(void) +{ + static_branch_enable(&kasan_flag_enabled); + + pr_info("KernelAddressSanitizer initialized (generic)\n"); +} + /* * All functions below always inlined so compiler could * perform better optimizations in each of __asan_loadX/__assn_storeX diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c index 9a6927394b5..8e819fc4a26 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. diff --git a/mm/kasan/sw_tags.c b/mm/kasan/sw_tags.c index b9382b5b6a3..525bc91e2fc 100644 --- a/mm/kasan/sw_tags.c +++ b/mm/kasan/sw_tags.c @@ -45,6 +45,8 @@ void __init kasan_init_sw_tags(void) kasan_init_tags(); + static_branch_enable(&kasan_flag_enabled); + pr_info("KernelAddressSanitizer initialized (sw-tags, stacktrace=%s)\n", str_on_off(kasan_stack_collection_enabled())); } -- 2.34.1