From nobody Sun Oct 5 12:52:21 2025 Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 89989279DB2; Tue, 5 Aug 2025 14:26:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754403997; cv=none; b=kyuEyhfqUwDMUa7wBcMsNpLxSl8ZH9lGoqrm5POzKWLf1GdA4BOu7ApEax+kKobuciIFrJeZnL/BT0WM+UiMnUg1Rl3rq0i2tCWOtnm5rMvqjufqpoAeTeYNkK+VgxsX5K+EE5LXY52e5ZHDTIhqKX8HKH8MI/EIWr6sSgti+Rk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754403997; c=relaxed/simple; bh=3HeZTVECsuRRA+a4sR8Q4oo4v2MjazmlgBTz+bqQUAY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=A6nUUu8MiWWHvk4UmS4YlvYXltXWxAx6pAKLNo5JlkxmAWPhh5XMfX8vyiTiAcv6YT6htsg5KnGmLAmvt6nLzRDoL64LPnaH5aXU/JdWEf/VF8oCUBJOZM8sKoELCKeEt218grP7+EOyynlfm0EH9JR5iK9L+/fpxu7W6Y+gjBQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=km1pkYEb; arc=none smtp.client-ip=209.85.167.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="km1pkYEb" Received: by mail-lf1-f47.google.com with SMTP id 2adb3069b0e04-55b847a061dso6301784e87.1; Tue, 05 Aug 2025 07:26:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754403994; x=1755008794; darn=vger.kernel.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=44Cef9kvp87sJdDYN0I0T3XW3v08YaC6etU0qwyWC00=; b=km1pkYEbPblgG788xOt4jJwdm347HO/muJrcupmXPqGUVuqElqezcDZNOvyuW9w6vD pnDkZ0wXqkoSBG/Op4hVdxGqhMnnNnMXwLDTJXib3v4EwZR2XfvwiF1XkUN1QJLfqIjP 83WS77V6JGVpZqLY9nDp4io7tA+EYqbDT0CSuMPe0PPNx7lti2WK41s1W9SsENYbqiqB yRsPJWvi+i0QKVFvrI/q+wYVzlkhUyYsT9IpzmojjLLlxxx6WXZ02qmq+w1+9BCpM83h 44OwKIhNrGU/v/QBUk34KP7P1K43tBNX/N/EF9P/YF8AudAh3DcvfZ04RD7HCf06fsOB rK0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754403994; x=1755008794; 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=44Cef9kvp87sJdDYN0I0T3XW3v08YaC6etU0qwyWC00=; b=mimn+n9eMTM40fvJNQ1TLU5di/rImJ+gX50i9Af/H5Mr7wPfkxXXdRD3a8UF8Ix2ZU CyafL2o0BfRqH3jSPMve6ABUbyxxZOgfgDBJtbzvitksrvI3D5SMpSjxHSbDItHe1FmK cXDKMg11Y2cxR+yKIkCbwX60pYLb82CC3jVWdjngkm0ZcaFjEE4scVGAu37vyfXrDmCm IccIFoYUDwbaqQl+puOIVJLIFpalpOUOhO4hlJ1VBd+M/O7zySysy3zKATKjlh12WiD+ es/1mHMmYySag7O3DpgB+aJO0Y6l1IMUF80YoFrop1OG+9n4+K2iedgTfyBUk4iwKwei zNXA== X-Forwarded-Encrypted: i=1; AJvYcCWKC0Ohpxb27rPfy11b9pshyZAtTio0LniU7LJPer5TfhBxi22c9UUNHfuwnrsiycUL3lCRNSUo3MN5dy8=@vger.kernel.org, AJvYcCXlK5NkXTP8nC3RBl+fo2oDyAz80oOaMzEkFy+GDTdIlSfh7LeAhfuDzHTTVQPJ16CXYWjucNA+9ZNLmA==@vger.kernel.org X-Gm-Message-State: AOJu0Yx9BLBvtxMkhokfzzpDEX6LkU+2NjnN7VxSo13KhPNIyz4sR/fG XRFNn3vlHachIyE0eNLA3SLgOUw5mi6OxlsZCiVVLbeInWgrrKWj0dV5TlDBCh2HQAs= X-Gm-Gg: ASbGncuIHSac7tspzp58N+zA+BRiiXbgd8ShhyDW1/jKgXNz9qn09raAzC8f9aw1AZ9 j9dXgzluJMBhzqzce95UWNdYNj4cLp1T34MjOMztWHHVuEU2OypESwQyl9zjxnYidw46wr4iaWS ERIrHLHEDbcdElqBeuFEjM9C9yDu1wKMJ6aLMD7HLYN3FXPJF8XNtuQJw0nMLqL0+zvOyUfJmnK CGfmr9O232UmC5KcB9vaPT/z9vMammAGk6MoGqSniQ88sIOTuefJLRikyAjkMJpKDTnuU7ox4wG J6iMqZxCF94qp2geeAI4EBXng/8zvq8Sefn66ZD0ifSBuHuwr57KAgQl4r72cHPCZDcidaZhHKP CTB3R17T3X9qXMdxDoLVU2A6kQYBXpNN3KkG0YXEyTpJtoBZmhH5l26mw4k5HX5wZmKzSXA== X-Google-Smtp-Source: AGHT+IG3IvKFDzWW1UJXkvwSM56EKK5Kb8nNkpLL/WnL+raFeiYW6aZ7Xti28XnaNJYqXW0SrOWKyA== X-Received: by 2002:a05:6512:4023:b0:55b:81de:3576 with SMTP id 2adb3069b0e04-55bab40c2d5mr1298432e87.24.1754403993514; Tue, 05 Aug 2025 07:26:33 -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-55b889a290fsm1976379e87.54.2025.08.05.07.26.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Aug 2025 07:26:33 -0700 (PDT) From: Sabyrzhan Tasbolatov To: ryabinin.a.a@gmail.com, hca@linux.ibm.com, christophe.leroy@csgroup.eu, andreyknvl@gmail.com, agordeev@linux.ibm.com, akpm@linux-foundation.org, zhangqing@loongson.cn, chenhuacai@loongson.cn, trishalfonso@google.com, davidgow@google.com Cc: 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 v4 2/9] kasan/powerpc: select ARCH_DEFER_KASAN and call kasan_init_generic Date: Tue, 5 Aug 2025 19:26:15 +0500 Message-Id: <20250805142622.560992-3-snovitoll@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250805142622.560992-1-snovitoll@gmail.com> References: <20250805142622.560992-1-snovitoll@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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. Remove the PowerPC-specific static key and kasan_arch_is_ready() implementation in favor of the unified interface. Closes: https://bugzilla.kernel.org/show_bug.cgi?id=3D217049 Fixes: 55d77bae7342 ("kasan: fix Oops due to missing calls to kasan_arch_is= _ready()") Signed-off-by: Sabyrzhan Tasbolatov --- 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 93402a1d9c9..11c8ef2d88e 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -122,6 +122,7 @@ config PPC # Please keep this list sorted alphabetically. # select ARCH_32BIT_OFF_T if PPC32 + select ARCH_DEFER_KASAN if PPC_RADIX_MMU select ARCH_DISABLE_KASAN_INLINE if PPC_RADIX_MMU select ARCH_DMA_DEFAULT_COHERENT if !NOT_COHERENT_CACHE select ARCH_ENABLE_MEMORY_HOTPLUG diff --git a/arch/powerpc/include/asm/kasan.h b/arch/powerpc/include/asm/ka= san.h index b5bbb94c51f..957a57c1db5 100644 --- a/arch/powerpc/include/asm/kasan.h +++ b/arch/powerpc/include/asm/kasan.h @@ -53,18 +53,6 @@ #endif =20 #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 =20 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_3= 2.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) =20 /* At this point kasan is fully initialized. Enable error messages */ init_task.kasan_depth =3D 0; - pr_info("KASAN init done\n"); + kasan_init_generic(); } =20 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) =20 /* Enable error messages */ init_task.kasan_depth =3D 0; - pr_info("KASAN init done\n"); + kasan_init_generic(); } =20 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 =20 -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); =20 - static_branch_inc(&powerpc_kasan_enabled_key); - /* Enable error messages */ init_task.kasan_depth =3D 0; - pr_info("KASAN init done\n"); + kasan_init_generic(); } =20 void __init kasan_early_init(void) { } --=20 2.34.1