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 5D582C7EE31 for ; Thu, 26 Jun 2025 15:33:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 009C88D000A; Thu, 26 Jun 2025 11:33:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EF63D8D0001; Thu, 26 Jun 2025 11:33:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D97FE8D000A; Thu, 26 Jun 2025 11:33:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id C25198D0001 for ; Thu, 26 Jun 2025 11:33:06 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 85689801F5 for ; Thu, 26 Jun 2025 15:33:06 +0000 (UTC) X-FDA: 83597945172.30.0471E49 Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) by imf18.hostedemail.com (Postfix) with ESMTP id 8648C1C001C for ; Thu, 26 Jun 2025 15:33:04 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=EHXBZKKy; spf=pass (imf18.hostedemail.com: domain of snovitoll@gmail.com designates 209.85.208.179 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=1750951984; a=rsa-sha256; cv=none; b=24q0+owhygIr40T/kWRWN5W/fFX76Ss4+ZOPB5omgFj7IqQyPpChm2rBypK4HFbNDdVTTr JbkZx5gt2jbPg89uoo2SD8alfSlKMNQVBm2VwZzL6P4hVXu2vULfXscMcPHM8euUyz7NL/ ETk7AJNuFXxEZrPx6dmanyP/QziLQ54= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=EHXBZKKy; spf=pass (imf18.hostedemail.com: domain of snovitoll@gmail.com designates 209.85.208.179 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=1750951984; 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=gODL4ePLEui+bgBCtMqPW0nf/RnbL8ytBUu0XwvP9Tc=; b=rGu4yYwzf8bzimECbfCiizuScZF7pTWQy7LiAAvLxp9AnYSrWLzsP9aTDJYhxO2KsSazCv bwXdOSMx4zNU0eAjPAsD3BR+aa6M8LM7YyRiBP4Ab76xj41tn1QQLA1uJWajFwXZw7KHtZ W5665bZxsANssdiZPBN9bUVoR3wf7LA= Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-32b8134ef6aso11478111fa.0 for ; Thu, 26 Jun 2025 08:33:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750951983; x=1751556783; 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=gODL4ePLEui+bgBCtMqPW0nf/RnbL8ytBUu0XwvP9Tc=; b=EHXBZKKyIVtrkYRaPty3kjWTsJkrT8LA+jo6Tv1ZlwSd1uWk8LcFh70V7UtM+FVfim IvZLcyQkU44gMhA0co3eWcCVZCUf4s9MvsUPvrq1Q3HyrSJZxXOhPKd+azrFeY4ofWrg VhsZ1qIYlNuTW3X5aG5ncddl2yADE5Mr3HvGGXIAzD+BVIFtCtkedaiuw/6raK+JuY+4 rsjm0KkcFeeh2Unlz53G+qayW6wP4wbTQ/zKl2dKLjCke7cqaNE3B9gJzK1pNAUHRkL4 N6sK6UOuIvmI+X1WikpG0VPchnb99y15MmydJQczZb2kYjr/r0xg7Z7O/9sFDuG5Yj5j 8sBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750951983; x=1751556783; 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=gODL4ePLEui+bgBCtMqPW0nf/RnbL8ytBUu0XwvP9Tc=; b=X7lducT35W7Eqw6h0qcTUH1Bi7PWKZuQIMZPOmkyp+MAs1biTuSxxeuTYB1hGVorf3 Vbp/7gVfNby8n+IGoO2ONRReSCUisK7/lXzC4w0n0PQhbkfcPhbCx4WQRvy14UuU8Xlz 2PpTgB0gsr7UL8ip3VZHDcrzWSMNyO1zG0rApqykHfsaY1CfMCWV3lMD22tbnxp60VF+ W4UgsZeuq/SEYW+H0IVVntx/wNx3fAPzwgZ+CRcU7sne45MVlaln9nfa8R3r+XN/2RYd yR7wy+xekgAzlI8EcZ44qALq6bUO0tfOQ+3FstW1KQU/QFq90W+MgtJQkvMfqOO0rMVj b17A== X-Forwarded-Encrypted: i=1; AJvYcCUumemq1A4vyrBLmyM0YM/rRrxhaOpQy6XKtx+RE5pQjiBXQ1+cOP5CsAmZjZzVP8hUT641OJmA+g==@kvack.org X-Gm-Message-State: AOJu0YwRbXzZpYF2cau3/ag5Ysswp9XsNLsulq0OzZ3YFG5Ux4xjqD4p H0b9U7l9LHpNtPPlz19PoPqbljJPnTCY2q6Eqr1SZB/a3gFyhaVwL6gf X-Gm-Gg: ASbGncs4lRs2vpmhM2E4OFrmk2E9VCMLk/WIbAF8c3xSsNklCAE/Nc0Ko9QGKAJ/zB4 dbSpUGOZIiRW1mVNYJgo7wTNPueJY7Yjiau1BSCqrWR46kXOelV9zO3CiKoDix7N/2hJB+zmDsD Un6wn2Ab7qY6RcZKvGfzFo/yOD6Jc7Ycm8OJ4QcKxTTKKuRmDagK2+X8ccsXqyXvg+3Er/ZOUW7 U6H1PvA+/m1Omm85pPOg8qzjQ40k6uj34X0JiL07tlONZEtkQGOA/WRcMBaWgXP7wbMexuoK7Je cdYmfQWHl48KCbj9vcEKnV+Ll+1eUEz8/TIiiJJPsYjrIPvDO53SwDmeLj7KYSZB6osHTu27Him bVq0Ky6A8Z935Xer+AMyhpEDiuLMibQ== X-Google-Smtp-Source: AGHT+IFtokin1pGKu8SGoAO+egXDXmR37EPc9QSc1BH26CQqVKh0GZxc7OuPefULxYvAjMzQKpLkUQ== X-Received: by 2002:a05:6512:318f:b0:553:ae47:6856 with SMTP id 2adb3069b0e04-5550b474cafmr117706e87.10.1750951982600; Thu, 26 Jun 2025 08:33:02 -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.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jun 2025 08:33:02 -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 09/11] kasan/powerpc: call kasan_init_generic in kasan_init Date: Thu, 26 Jun 2025 20:31:45 +0500 Message-Id: <20250626153147.145312-10-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-Transfer-Encoding: 8bit X-Stat-Signature: c8adgf1rjz1pg9sx6z8th96888ma9bbc X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 8648C1C001C X-Rspam-User: X-HE-Tag: 1750951984-193113 X-HE-Meta: U2FsdGVkX1/MZTNjI49PjmrE0lXFEJDC8bNM1U1ra6W9BB4tPJL/ej5vu97Q2JWkoIdJ8ohE0ww8vW1ttldDbjpSunhF/mvkMfkcJKxBJM7WURPb2T6c/lT6Jc/L/RgVdGD+3Bz3VpTP4CvASPlRq/qmrK27YZHQ5qx7+/QFGZzKYvPnFOZQgiRjGr4hhLbdfNwZovuS+Bp7KatOHiDaJjxvkZ/b49pj0+JK+s95krBKEDAfjze7qsBXmo8B6Eo/xjeTTI3GAEdLPhl1jmSZHjVksR4084g0jQRwmyJot0PcBJteiA7Ehs8greoDEH1+6NzhjakehaKCgAqD2xrfI9S5kGmp/epTchuR6NIMMK03D3lViHNbNo6GJdDZm2ZySvq3C5fYpXOaf2AMcolyN7QgrZvONE5eJ91k8+sL7oViktlQeXs0qK/zvRzJRLJMPNTwqdDMWSM+aX7HcnnrEpY+4gHVmJZ4XxgqqD7zWVu8pVKoy0yGoc7kuCpi+CbGZbgILEu1c34pMFs/t6TSN5DLLzvOVY5Odz50rL+WfVkUqnhN1pqn3ZliPj6X0uPCz+a2XuFlYhbAGQojI0yuedgM7PvCoq9Xd1/0vvkyHbZ55oEhG/3Kl1+nTQpxcepfzyyFoweE7/Gh3Jh5lEsLELvwYf+k4wXiH6rTcn951xmSpmKn9msF/xOyN+z4ecUQTWuBc+xxjle5btWGBsV+rOB5cqEPiINbevg3w8Apo+nGCPCZOc0mcpvGSvUuHseCcOruFlyHvybyoJ+10YAMrZSKlBxgH/E770MQzlhyX1tSgLE16omOvNSyvvGZYxogQ6jfeq3R4o4x1kvgCROI1J7jZSK+7pMIvXF4Em1a5s3T6Ic76t+g6vDrCwGCeXdim8TOIrgvUS/hJZpzdpBrjy5cJ8JJ8c0vdaeZPb9cYljAwyn4pzpDo33dci9AwAt0DDIeZzIfD6bBzCnvYD9 J2zHZa9N 5Bu2NBUmzsutBRgcrd7BnZ7qF/otEnnap36NvJn+EUxDdDLl6mwytfJOOv8YOkTpLGXHZlztdnbgnaOEPIxHzBUij7TqIggyBGZZ9lFb0JAYxQXt8rcWZ4o4E1LNWNXhLi06jXIMk7s+7cbbYdrilfiwVCWkc60N0YFcpxh+OFqMmXu1Qvqx8LWI2PynCnoihqnpXdMx5on96ox1GAPCuoFfdWqrYUY3Yh5NG1AMKHPITh/FWs3RIPwB8JQEBaM8CK5FN7te4Ay/PHr7gvO66uT8GvJxDNwuyVK+Q9wn9M94X8EgnRzD5PQuV6qoj7ap6SOB/GDKEXiBPzWKWYTo2UQRIWhTJ7HPKGfcbj9F0XjMA0lfdSHw3nlaqNhJNzRWtGZkQh3f4sur+9x3Snx9vP+WH9+nMU0EOUAVQqppMOtPrP84dX+S4isnNX3F13rse5WKIAkAvKlbhji76mRBu/gnvrWFI2i5ByCIhD6BvfL/fjLpGeM1kfwgn6g+V0uzEM+khWhRG1UopJwNl4j9hg1gyp2JV05lEiqAqDluDlzPtGwfuGtcDfHZHYg== 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: Call kasan_init_generic() which enables the static flag to mark generic KASAN initialized, otherwise it's an inline stub. Also prints the banner from the single place. Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218315 Fixes: 55d77bae7342 ("kasan: fix Oops due to missing calls to kasan_arch_is_ready()") Signed-off-by: Sabyrzhan Tasbolatov --- Changes in v2: - Add kasan_init_generic() in other kasan_init() calls: arch/powerpc/mm/kasan/init_32.c arch/powerpc/mm/kasan/init_book3e_64.c - Add back `#ifdef CONFIG_KASAN` deleted in v1 --- arch/powerpc/include/asm/kasan.h | 13 ------------- 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 +----- 4 files changed, 3 insertions(+), 20 deletions(-) diff --git a/arch/powerpc/include/asm/kasan.h b/arch/powerpc/include/asm/kasan.h index b5bbb94c51f..73466d3ff30 100644 --- a/arch/powerpc/include/asm/kasan.h +++ b/arch/powerpc/include/asm/kasan.h @@ -53,19 +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); void kasan_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