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 51DA4C83F38 for ; Thu, 17 Jul 2025 14:27:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E4CFC6B009A; Thu, 17 Jul 2025 10:27:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DFE3B6B009D; Thu, 17 Jul 2025 10:27:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CED1B6B009E; Thu, 17 Jul 2025 10:27:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id B99026B009A for ; Thu, 17 Jul 2025 10:27:54 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 890EF1A0706 for ; Thu, 17 Jul 2025 14:27:54 +0000 (UTC) X-FDA: 83673985668.16.DD937A4 Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by imf27.hostedemail.com (Postfix) with ESMTP id 83CFC4000B for ; Thu, 17 Jul 2025 14:27:52 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="fc/Cj1Kz"; spf=pass (imf27.hostedemail.com: domain of snovitoll@gmail.com designates 209.85.167.42 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=1752762472; 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=9U6pXPOm17QNJUh3dL0X5SvDfkuBM+kFPXcpz1Z7hWM=; b=XKRuL3DQpeSQKcHHP4BIs4zfaRoxZFiBSo9NjVsvHwbkkAICHZWXyMK0RlYuAEU0WdG/ac CIFNjahr/bX37OkJD+1e4/hSmRfaE6U9heZIZGS6bnPxaFi/WBEFYAP9HyfXbFII+1Z8r0 hybRfYyHwa/5U9wWTYoc8E7VHZsTtnE= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="fc/Cj1Kz"; spf=pass (imf27.hostedemail.com: domain of snovitoll@gmail.com designates 209.85.167.42 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=1752762472; a=rsa-sha256; cv=none; b=i2CzIn0YjSN76qhZGzOuJvAsM0CaFlC0uTMOsVPHlMBOoubJoGg6J+KZB0QxSsA3VX9CP0 6kTkvidIfTtdqOWb1B+cWlxdOmRC65enDA5B4dQLJV6pqxuGy/UyZgDLPve8+d02PQuJne bjgLWQYQxKl6YHbW8OCetxXPzWhCmNg= Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-558fa0b2c99so852143e87.2 for ; Thu, 17 Jul 2025 07:27:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752762471; x=1753367271; 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=9U6pXPOm17QNJUh3dL0X5SvDfkuBM+kFPXcpz1Z7hWM=; b=fc/Cj1KzUWL7w2/jY/JyL2IgYr/whsYsRLVuc4v5ek9gTonAwYJlKCUcl+BLnUwpuB gvuiWy56y2EpXUvd3xbYlw2L/HXzgQOirn6s9dU+wuEKmBEBe+XtyMy7b1IRnaghWUoD bSCAur9qG6esWH1G5A0FACURWNnql2SSAu4k/R7LVf3M6aWAVnYSv7mI1P/Pw4xqVa4x tvy5QdJ9l12rzGLV/sFSCXNDhCdlMgj15rXYt3VdDrBNTrqT85R50wGad7BBH5jNEwXU eap7Tj2GnDhGdwyxzu+IatUVRJqQO3plDi+bnqCM39mXQZLgaVi2pKOR2CQmz+F4PRPZ waEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752762471; x=1753367271; 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=9U6pXPOm17QNJUh3dL0X5SvDfkuBM+kFPXcpz1Z7hWM=; b=h9g1l/r0vrz/HaEsATZ+xGCRJuBBNqv+bkCeik+6QfJnnBcQRBJDSYgz2f3rQ53EIK 3iJijSQIauNdFYSo1jzAUUV3xDA0FSgyEZiX9kgKPxNn+OuO6z92LUwbaWgYhS+xby5X HhokjkmGQGZtllnXm3Z4BtlbxU0rfwJCL1OukO4G//FVE0LyWVSDngtGVk6Mw9i7Rnwj P5A/vykplXhB9Jsx1mrkYAK84/FesU0ti/GJ8OJu6JPVR9l+zgWN22obPvERBSQD6gL0 wupc/W6rypXKYF3H1zbWDUAHKyMzh5OVq95W25wMi3GN1nM8Tfa/mf8DKb8/Dntlzi51 LArA== X-Forwarded-Encrypted: i=1; AJvYcCXVFsYBMbjMHh7SCnoTyHVGj9ViMoR3BfqqYbwBaJ4VOUb/TNrYjr58/Kff6YAvOhSG8m6uoNvTtg==@kvack.org X-Gm-Message-State: AOJu0YwnjJ3zemqhn1kxcAYrbnywzr+D2yYKXjpbYZFuEDLcDaDAfzmr Kmd/4rr7fFUlpY2nGDkf4rsAWrTTkORHjpyy1MD4CCp5W+o/W4UCwZUi X-Gm-Gg: ASbGncuhaLqm6DaS/PELCi7YQWI9SzKQtiQLfB+LPrBPdM6W3FtDSIehduceIizE3am mecnHIPkHXgy+Q5ElUb00tlibrgiLSKcD1b/855+hx9FMwCXlLHRrdnojStbllmiMScghY54Pmk czcnY6M+QmKeDcvXiSJhnMs3kNFCHpb3VIjP5yGIaCBWxoeu1buQpsptnGXDpys9GdNi0TdqCZg pOCppQ7t21+B8US9FI2GUlsVBe1g8JyBFGATmJoRfvpx66ekz5yOy1I+HLTd7POVW7/jTNQemoe Oa34LoRhnGZCNrJYvrAU0boEPCd05XMWOFFDteS2T0nhRpFKnEE5PoDswkmyzkyS5ZvQy85iLyU fhED6yYFPynPTZDxLeAFdqG4FkFIDvXBgIFgAw7vBCk7INer9AQ00wupGL683UgeKRJxI X-Google-Smtp-Source: AGHT+IFxg66CFuCFZcq7YEHf2jsYRpZfJ3opYk2GjZt6qN26RYtZXaN505yqdxOnxSgHLvlINQObtg== X-Received: by 2002:a05:6512:78a:b0:553:2868:635c with SMTP id 2adb3069b0e04-55a233db5f5mr1804298e87.48.1752762470559; Thu, 17 Jul 2025 07:27:50 -0700 (PDT) Received: from localhost.localdomain (178.90.89.143.dynamic.telecom.kz. [178.90.89.143]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-55989825fe3sm3022975e87.223.2025.07.17.07.27.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jul 2025 07:27:49 -0700 (PDT) From: Sabyrzhan Tasbolatov To: hca@linux.ibm.com, christophe.leroy@csgroup.eu, andreyknvl@gmail.com, agordeev@linux.ibm.com, akpm@linux-foundation.org Cc: ryabinin.a.a@gmail.com, glider@google.com, dvyukov@google.com, kasan-dev@googlegroups.com, 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, snovitoll@gmail.com Subject: [PATCH v3 03/12] kasan/powerpc: select ARCH_DEFER_KASAN and call kasan_init_generic Date: Thu, 17 Jul 2025 19:27:23 +0500 Message-Id: <20250717142732.292822-4-snovitoll@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250717142732.292822-1-snovitoll@gmail.com> References: <20250717142732.292822-1-snovitoll@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: 83CFC4000B X-Rspamd-Server: rspam06 X-Stat-Signature: p68dbp34iof4h4531p8nri4k1g5tq7bh X-HE-Tag: 1752762472-391311 X-HE-Meta: U2FsdGVkX1+gcDRseKiR/Tth1/bpRP1KIBU5zdjSPMppwKM4iL3Dlb9elnQ5eAOUVn/Ns+TdNYHjSrzRhrBKYTprTtPP2VFybxo07gJLsakNVKO5hd4CpZSEEB7gta4IEzZZ+JndxjwSP9OtYqGOmtC52shKk1S8O4wbWSC3UntqvQNGU0Q3Iq1S932W3gUiTOJNb8WjyJEsDU85QN2KGAa5VzsE6d+JpZsvAxFG6NQZ1MObma+HJHqRigwmFJ2GC2iewYTvU9Z29A4PGvRFxBw7L6e4Ks0IDq1Vb35ypz/FtLotzzCq1msA76tSRcCwIKsFi5PxowPDOt4wnP5CbcdQAxGU5a/As+l4hf1leP682QxAJ/SRaCTbhysYD6BHE76WaMEr8ql2r67oAx6n4FDhgNGOE5BLTT0ipR1c3mOpSBvF5SFpwQiSPPjXKLmDrKFCu4NhTl+hu8YR3P3TzPFB6T6IozMysls0hdI8KAffAPjHDJckvcaiwhe+v+qEYA3UqaOAhPB36KLVxX8hnlqS8UeEXi5DnL5dMGsdaQ4qtXQbk2jSfxVtOlfTAqmeNBOOiyg6hy+pgrhMfoHDKfqOxI4qrpJEkg2PkFd+vBZUB5/gpw5OnDXJ13/XW9PUHbfGwl2FhUz2oLIPjn4x/kImudyMXS8LSBw676saZfM0bdaLzZS0LriFY5XYkSm+MPha3uyuJzsf9LpnybJiMIbROvZ/0I+5h3vRpn4GViUhuHgcv4f/9y5DC7ebM6ugcUGV0Q8a9eq7h3A+SGoN28zbCmhQtWUage992Wum37188a89xmaFW7dLukBIuIPMwI9h8mjI7LkNaKIdq47Axedjw/05LOLIsiafP562zuKL/kuT9iNJ8BBVCQpO+wVoFw2FWo6qVBRoi5EQvBujxz+0jkFvRPC6ZZ1hRdT9IYVc5SfeGGOxNnCdpRo0I6pBX7DkwH4ITlDViTONh7c VY0bAZlR Uga+LC1DqR3eQ9rvD9zYC9O4RF8R5YNDNBe7Afk/xBARCNvgw0zp3cepNXFjydg/eOTEWRLWv2qX2zheUKrZetfFtzjNCMMO5p7E8r96ZcCT+D4Ng1HQSbArTl7ejSdFPndHaK0cEuYX5Em9fzGUC+0PGApO1hm8uTRxQzz3Dbt5BiF3b5kvawm6dsv24F8blBUxkA8AUdz9AfqzUGER68JCqazOqcuTYLPGfJAcws0GqeRlmThce5Dty4BTcIHJsz9AG/T+Eac61aTyQPYL7HADu+7rwF9SGD0Gfpp5EmasOBfxBVLfKjfoSCgGRo78Bb1WfILwpTpGM1AMQY/beZEkC60u+4kz41Mu4QrFdt4fdUFrr+AuiB2cXISIPvoKT42VHeVW0qpLaq01myiCLlz366kvZn8AA6849mwK0zFa0vClHb8p4cp2oyWStV4R/lp4qT5jsmVmm8N7TF5SooHukO4akQNMN4PN59G5/SSQCRkW4N1vLEkU1fGilQTXi5tveidHguVBd4HomUwEBhnI7ymkXmlftxiE5jNHI1ESrq+iZWNviBNrTlg== 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: PowerPC with radix MMU is the primary architecture that needs deferred KASAN initialization, as it requires complex shadow memory setup before KASAN can be safely enabled. Select ARCH_DEFER_KASAN for PPC_RADIX_MMU to enable the static key mechanism for runtime KASAN control. Other PowerPC configurations (like book3e and 32-bit) can enable KASAN early and will use compile-time constants instead. Also call kasan_init_generic() which handles Generic KASAN initialization. For PowerPC radix MMU (which selects ARCH_DEFER_KASAN), this enables the static key. For other PowerPC variants, kasan_enable() is a no-op and kasan_enabled() returns IS_ENABLED(CONFIG_KASAN). Remove the PowerPC-specific static key and kasan_arch_is_ready() implementation in favor of the unified interface. This ensures that: - PowerPC radix gets the runtime control it needs - Other PowerPC variants get optimal compile-time behavior - No unnecessary overhead is added where not needed Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217049 Fixes: 55d77bae7342 ("kasan: fix Oops due to missing calls to kasan_arch_is_ready()") Signed-off-by: Sabyrzhan Tasbolatov --- Changes in v3: - Added CONFIG_ARCH_DEFER_KASAN selection for PPC_RADIX_MMU only - Kept ARCH_DISABLE_KASAN_INLINE selection since it's needed independently --- arch/powerpc/Kconfig | 1 + arch/powerpc/include/asm/kasan.h | 12 ------------ arch/powerpc/mm/kasan/init_32.c | 2 +- arch/powerpc/mm/kasan/init_book3e_64.c | 2 +- arch/powerpc/mm/kasan/init_book3s_64.c | 6 +----- 5 files changed, 4 insertions(+), 19 deletions(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index c3e0cc83f12..e5a6aae6a77 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -123,6 +123,7 @@ config PPC # select ARCH_32BIT_OFF_T if PPC32 select ARCH_DISABLE_KASAN_INLINE if PPC_RADIX_MMU + select ARCH_DEFER_KASAN if PPC_RADIX_MMU select ARCH_DMA_DEFAULT_COHERENT if !NOT_COHERENT_CACHE select ARCH_ENABLE_MEMORY_HOTPLUG select ARCH_ENABLE_MEMORY_HOTREMOVE diff --git a/arch/powerpc/include/asm/kasan.h b/arch/powerpc/include/asm/kasan.h index b5bbb94c51f..957a57c1db5 100644 --- a/arch/powerpc/include/asm/kasan.h +++ b/arch/powerpc/include/asm/kasan.h @@ -53,18 +53,6 @@ #endif #ifdef CONFIG_KASAN -#ifdef CONFIG_PPC_BOOK3S_64 -DECLARE_STATIC_KEY_FALSE(powerpc_kasan_enabled_key); - -static __always_inline bool kasan_arch_is_ready(void) -{ - if (static_branch_likely(&powerpc_kasan_enabled_key)) - return true; - return false; -} - -#define kasan_arch_is_ready kasan_arch_is_ready -#endif void kasan_early_init(void); void kasan_mmu_init(void); diff --git a/arch/powerpc/mm/kasan/init_32.c b/arch/powerpc/mm/kasan/init_32.c index 03666d790a5..1d083597464 100644 --- a/arch/powerpc/mm/kasan/init_32.c +++ b/arch/powerpc/mm/kasan/init_32.c @@ -165,7 +165,7 @@ void __init kasan_init(void) /* At this point kasan is fully initialized. Enable error messages */ init_task.kasan_depth = 0; - pr_info("KASAN init done\n"); + kasan_init_generic(); } void __init kasan_late_init(void) diff --git a/arch/powerpc/mm/kasan/init_book3e_64.c b/arch/powerpc/mm/kasan/init_book3e_64.c index 60c78aac0f6..0d3a73d6d4b 100644 --- a/arch/powerpc/mm/kasan/init_book3e_64.c +++ b/arch/powerpc/mm/kasan/init_book3e_64.c @@ -127,7 +127,7 @@ void __init kasan_init(void) /* Enable error messages */ init_task.kasan_depth = 0; - pr_info("KASAN init done\n"); + kasan_init_generic(); } void __init kasan_late_init(void) { } diff --git a/arch/powerpc/mm/kasan/init_book3s_64.c b/arch/powerpc/mm/kasan/init_book3s_64.c index 7d959544c07..dcafa641804 100644 --- a/arch/powerpc/mm/kasan/init_book3s_64.c +++ b/arch/powerpc/mm/kasan/init_book3s_64.c @@ -19,8 +19,6 @@ #include #include -DEFINE_STATIC_KEY_FALSE(powerpc_kasan_enabled_key); - static void __init kasan_init_phys_region(void *start, void *end) { unsigned long k_start, k_end, k_cur; @@ -92,11 +90,9 @@ void __init kasan_init(void) */ memset(kasan_early_shadow_page, 0, PAGE_SIZE); - static_branch_inc(&powerpc_kasan_enabled_key); - /* Enable error messages */ init_task.kasan_depth = 0; - pr_info("KASAN init done\n"); + kasan_init_generic(); } void __init kasan_early_init(void) { } -- 2.34.1