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 D7C62C7115C for ; Wed, 25 Jun 2025 09:53:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 779E66B00C3; Wed, 25 Jun 2025 05:53:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 72A336B00C5; Wed, 25 Jun 2025 05:53:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5F9346B00C3; Wed, 25 Jun 2025 05:53:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 4B82A6B00C3 for ; Wed, 25 Jun 2025 05:53:43 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id C091DC1B2D for ; Wed, 25 Jun 2025 09:53:42 +0000 (UTC) X-FDA: 83593461084.27.0CCBEB4 Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by imf04.hostedemail.com (Postfix) with ESMTP id 8370340015 for ; Wed, 25 Jun 2025 09:53:40 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Zf0ubmyh; spf=pass (imf04.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=1750845220; 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=ovwzGubQ7EZCWb++7xcfiusg6EJnFDR8lh6aTJ/PpoI=; b=OhiCbEVGGRZJo6IQpE9eYSpPoK5GmNdMRb8z4r2EXA/ppJ6RaQCYPQNaUsSS+83/Qud/7F xq/PwB0u1Dmqsk0SjBgum4yM8QHj+GZQMOXjJbAgMhsGX/Q5Y/ZQgvqS+1f+/E8XfaaL3F m+7qysglb1Z5DKpYtybnACRli8XJI6o= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750845220; a=rsa-sha256; cv=none; b=DJMhUrHGYtIkM9VzH+2Ex+iPupUeP6iMx8FXaX4kcOS4rbD9KgzxpA7qZINwOqaFFegrSY owVt5qFZRB8gj/DGEMftLG3lCA9Ozqad9XLi9h79i/LcrzpQ3DPHD2Qof+zIgDn7A2OuhV IkcskbXYQ7dsUDyBkixGHz9XH8hMEv8= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Zf0ubmyh; spf=pass (imf04.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 Received: by mail-lf1-f42.google.com with SMTP id 2adb3069b0e04-55220699ba8so6788087e87.2 for ; Wed, 25 Jun 2025 02:53:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750845219; x=1751450019; 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=ovwzGubQ7EZCWb++7xcfiusg6EJnFDR8lh6aTJ/PpoI=; b=Zf0ubmyhMiN7bzfOURb02aQV46QzGQFGXvhw672Iv4DnGm+qIwvVbIU6vxHqqLMVne 87AJQIjudwFQIggAo5X3RnZnp4ZLPBbfy6QGBOGhIY2mXsHyKkI8c5q/4js8sim5N8Bd 2pSCRRJga+IWtywNRk9ucZK47ZoO14bz6y4+x4WsFng7KGShot71IDRZidzFA4NHV5Q6 szBlGxmVQDhxnlncIzQHDX+0d0thM3t509zmsa14pu2ZEe5Ny6OuE9Hx2BOAvTNBSOkR XcyQCOCxXyCyGGoUizPoIerALJdwhZE0jY9I+nrgkIoIxmGYtBO7fvF5VFQz6b/T1UG0 s4CQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750845219; x=1751450019; 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=ovwzGubQ7EZCWb++7xcfiusg6EJnFDR8lh6aTJ/PpoI=; b=Z7pXskCt2ILY+qkjwMmTyPGzDBF8z1kxfzNQKna/k+n5WVeTWmlLs7tKT9aN51nl+u hoDI+to1xBMaidEr8MmR2Q5mCsalfn/nJN5HRO5qXHytiDdHD7Px0qs/5ezQnx6sx925 DAbS7zJYB7od9v4SOjgSMJcU3cISZRz4ud7dY7w8vYDrqvdXcd9yrkNy8ui0J8jZCrzx +HXugihskZUNtJb8tG1nKF5lL4oN3cjO7olhIwwLpF9sM3t3LYVCfoOfhY5mPWc34zYa u1qpzr3LbYxChA07CjOYVuoW6OpxheQzEyGyfYU5RvFV/JCKgsB5zHAQI4g/dxnvWjSS I00Q== X-Forwarded-Encrypted: i=1; AJvYcCWcyTzcJANQPUDfktNnRWNPZ1gI6kOBJ30F5DfjpKbfsSHrzTer1x1HAzJcRCDalNVcKNeht/Yfqw==@kvack.org X-Gm-Message-State: AOJu0Yx/ZmGRozwEmOHUTO82ftAA3Nk3lzcFBaJrXWXvbIIvR4KNaLWz H4NYuCs/a3LB32LWizmOgLR21sW69XyMfVm4yERddcyFQH21njAnxSdH X-Gm-Gg: ASbGncsWOcqF9Nf7sl/drizaEFu2ma9pdlwBGlqO36Adw4YHJbQoZEl+6v0k9YHd+Ux q6zK2x48IS/z5vw8QJu1z/FgiWO2ZQ7jHz63oraZow+rq5+jeT2bpTO/TFAuv8KkjbfdAQdZiLx CxVNiYPVB6gz+/8EqXPxTFqFkrVSCsKpWL2/RUlEPLFOJvCOzUN1M3tHd6PfSd57qmZXXe7Pjy6 erFauLbqSkHephsvbgV+tMyjDc/vi5YZu9APqzMT+++ZVctoiDVWdgN1el4OJBbvNYEbZHYqawc gpFcd2ZNgs35HpyKPGCOu7uDElTn8/017QMwqwb407BsICuhJIy+UfnnV03Rh0Lc8x73i6zUoua zfoZL/pA4iyc78zdaAw7HQTj+v8boqQ== X-Google-Smtp-Source: AGHT+IHEtWnCbJrLGTsCzIsOmvfz7XrCUuinYoJ1YMkmnRrIevIL2qUouOt7T42E5UqDFgQKhJfguA== X-Received: by 2002:a05:6512:3dab:b0:553:26f6:bbfd with SMTP id 2adb3069b0e04-554fdce00cdmr639671e87.8.1750845218713; Wed, 25 Jun 2025 02:53:38 -0700 (PDT) Received: from localhost.localdomain (2.135.54.165.dynamic.telecom.kz. [2.135.54.165]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-32b980a36c0sm19311851fa.62.2025.06.25.02.53.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jun 2025 02:53:38 -0700 (PDT) From: Sabyrzhan Tasbolatov To: ryabinin.a.a@gmail.com, glider@google.com, andreyknvl@gmail.com, dvyukov@google.com, vincenzo.frascino@arm.com, 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, 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 Cc: guoweikang.kernel@gmail.com, geert@linux-m68k.org, rppt@kernel.org, tiwei.btw@antgroup.com, richard.weiyang@gmail.com, benjamin.berg@intel.com, kevin.brodsky@arm.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-s390@vger.kernel.org, linux-um@lists.infradead.org, linux-mm@kvack.org, snovitoll@gmail.com Subject: [PATCH 9/9] kasan/powerpc: call kasan_init_generic in kasan_init Date: Wed, 25 Jun 2025 14:52:24 +0500 Message-Id: <20250625095224.118679-10-snovitoll@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250625095224.118679-1-snovitoll@gmail.com> References: <20250625095224.118679-1-snovitoll@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 8370340015 X-Stat-Signature: t8bmg13t7xeps366e3zfwtbt8b8t7y5j X-Rspam-User: X-HE-Tag: 1750845220-801067 X-HE-Meta: U2FsdGVkX19dezZlmPZ4Z4X4Go2JW/Lkoymh4R2Mi/xFYK5b/q9PnyssLPNmYPYR3ntCqMYUu++LsMXhd1gouwTa4BwpCWKDnxRUNhNqTazatZ+/9Jxi2p7OPI40I7KJZHwqr8e9RAEMrAoWNIXl1l+uKPPtLx/C720QXbHIKXUK/VHquTUCJboy1QNUAJU5bXxPdPC8XEe2sBnC48I9KROHFTaH2hyCA8FEHx2ZsI3ml7juZlJYCwW7dKyPbLDFUPRWNguAbjCniJmzK/79k+z8QCCyEoHz+Y3b8apPsnA6yk0JiSflRXjyqSDYZtclBh8MThrFTBKxN7g1ukmwJYCzlsFx8CpoaLLfP4tF33j7Z+S29pewFrDwMUiBU0CwHxpfmeG6uU0WLuXOiqmEWOrE7eWXRRdrUpeQs/+7o6xvVg5aijtLwbxjl1yRJzBKZxCqmiQwLKX/NwgLJYSsrIoFa/F4csmAygbaGbWZV4z6lBXy/gEKzNn6jkgg+32Y2qaI16Oa/WghJw8x7y09WPDEP4PPHNtYXG6snEL8e4PhMlL8EBQaEPpJD+rlLJiNCN7Br2hJizgbKH+/Yi//2ZTBwfymHvKWWpZwCpIXeMuYRGXUFEaeROfSgcRme+nL1NmM5R/q7x0BGio9xZT8SpbWGzCOVFJuntmmZNXKqHooc7TYoE4eZC4TKh1MIIPUNGyWS22jQZeRZarLY5Yw1OfiIOUljUNfy6vWU317aD+uidUwUmsQfer84wa8naTs29vlPz+wr++Sfmv8mDdx3QLyPk0/b0sr9f/by5nLXdqHR0jIw9UwLpMXe7eQckRm7n7CWT1QSrixxITB/UzRdt4GV4CIZIKXFxUmbpPws5RXVdoY1eWgc54x+0Y/JVIwuOUrJehaflEgjUBEBFiu8unTXsVw3Z1I1N4WsQwQRr9GGSM71bwXpWKBuE7u4O0/rYcLGjERP4p8hd60dsQ qAMUdG4q 3trmLu6tdWOke6L5D+f99jtUlKjs0xoTLNVeMVerdq2SeSQuQfbGdy8/kpWY/ULcPASA8u2SzJZV3vp4weP0J3yDjlmldf3OQrmskk7ducbDU1sDmj/36rCOhkUI79C0i8N4HRPBewAj2FxE= 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 --- arch/powerpc/include/asm/kasan.h | 14 -------------- arch/powerpc/mm/kasan/init_book3s_64.c | 6 +----- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/arch/powerpc/include/asm/kasan.h b/arch/powerpc/include/asm/kasan.h index b5bbb94c51f..23a06fbec72 100644 --- a/arch/powerpc/include/asm/kasan.h +++ b/arch/powerpc/include/asm/kasan.h @@ -52,20 +52,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_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