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 lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 94799CA0EFA for ; Wed, 20 Aug 2025 05:36:34 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4c6FYs1P2dz2xcC; Wed, 20 Aug 2025 15:36:33 +1000 (AEST) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1755668193; cv=none; b=aT0CwHOxyVuFHnKjALvrdn3xtHqCtfEceirhfqAJYUXuE7wANrMuX187L5Q1Pi3bwpkSgkxcC8pZHICyB7N1b0A00rEjY6oIHFrOnf9X94l/WdO9KPIJbsYPGKQ2CT3eu+iRxYYCTJ8Szpcu31JakVuyA5pjut9rXrC4sCXzcUUb2qpsBuxlxG/Dz5UHO4yFaF9qB4eSpBpkGpP3+Et/PlxeNUMfTZ2ogRt8uhLbhCMWWS3ZT+eUrIoOopVfdv+4AKVfnfpR+nPqw9Xz8cX1WMk2ureZMrneLD7FdYUv0CxYgNhMckLstyTiKAeK1t+LUgCvKi1mH0/cRfSggrwDgQ== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1755668193; c=relaxed/relaxed; bh=ffaqmFj6s7jEE3FagcYbQXUNvNizOaxd5L//WV57Tuw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-type; b=iW0a9+HY1+pZEq1Guj5AseHJcv3Jnu3k8Dlhh6x2GIolrHI9K3Pba91ko+5iaJDLZn08Wn/lVU8oiNiLuDA6r8tSRNI6vYXnfic1goXkc+SfbM6Ofg3GzxjR+sO3LkJd9iZaV7DCQ227FJpIjuSfefRuoj8z+rGIJdhDZiBTB9T5mvTkZmtOswZhPmWbFeVJJYhwgIST7hLGevOfG6VtSEKD77oWMTpya3jEHrDr+o0XPO8lsKrLf/sL5k/GyMh3JXBg8x6RUqKekFtQoTTh7tVVRdAYoklycqks6dP1izNV7sxwABRhFF8pmzosIBNUUyuCgmsjC+UXv+JzEwiEuA== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=DF29jM0R; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=DF29jM0R; dkim-atps=neutral; spf=pass (client-ip=170.10.133.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=bhe@redhat.com; receiver=lists.ozlabs.org) smtp.mailfrom=redhat.com Authentication-Results: lists.ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=DF29jM0R; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=DF29jM0R; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=redhat.com (client-ip=170.10.133.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=bhe@redhat.com; receiver=lists.ozlabs.org) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4c6FYr0FZXz2xQ0 for ; Wed, 20 Aug 2025 15:36:30 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755668186; h=from:from: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; bh=ffaqmFj6s7jEE3FagcYbQXUNvNizOaxd5L//WV57Tuw=; b=DF29jM0Roba8vBM3dAYs3nuHyW1+95KkGk9zUe+dI3HTNOYOquK8zO/Ur9RdwFb4Cd5enb lmEQL4/a5xtPLmKV53cMtBAjQZyy41nyXBRtDyzgWgnOR6gSbNeYy6HbvBy7rleVBex2q3 MuKdmKOwZghkS3l7OaMSs9XUucWM8CU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755668186; h=from:from: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; bh=ffaqmFj6s7jEE3FagcYbQXUNvNizOaxd5L//WV57Tuw=; b=DF29jM0Roba8vBM3dAYs3nuHyW1+95KkGk9zUe+dI3HTNOYOquK8zO/Ur9RdwFb4Cd5enb lmEQL4/a5xtPLmKV53cMtBAjQZyy41nyXBRtDyzgWgnOR6gSbNeYy6HbvBy7rleVBex2q3 MuKdmKOwZghkS3l7OaMSs9XUucWM8CU= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-176-ljSlvNsWPGC2J3sVaEdsMA-1; Wed, 20 Aug 2025 01:36:18 -0400 X-MC-Unique: ljSlvNsWPGC2J3sVaEdsMA-1 X-Mimecast-MFC-AGG-ID: ljSlvNsWPGC2J3sVaEdsMA_1755668176 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0057919775E8; Wed, 20 Aug 2025 05:36:16 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.112.99]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0B83A19560B0; Wed, 20 Aug 2025 05:36:07 +0000 (UTC) From: Baoquan He To: linux-mm@kvack.org Cc: ryabinin.a.a@gmail.com, andreyknvl@gmail.com, glider@google.com, dvyukov@google.com, vincenzo.frascino@arm.com, akpm@linux-foundation.org, kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, kexec@lists.infradead.org, sj@kernel.org, lorenzo.stoakes@oracle.com, elver@google.com, snovitoll@gmail.com, christophe.leroy@csgroup.eu, Baoquan He , linuxppc-dev@lists.ozlabs.org Subject: [PATCH v3 07/12] arch/powerpc: don't initialize kasan if it's disabled Date: Wed, 20 Aug 2025 13:34:54 +0800 Message-ID: <20250820053459.164825-8-bhe@redhat.com> In-Reply-To: <20250820053459.164825-1-bhe@redhat.com> References: <20250820053459.164825-1-bhe@redhat.com> X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , List-Unsubscribe: Precedence: list MIME-Version: 1.0 Content-type: text/plain Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 This includes 32bit, book3s/64 and book3e/64. And also add code to enable kasan_flag_enabled, this is for later usage. Signed-off-by: Baoquan He Cc: linuxppc-dev@lists.ozlabs.org --- arch/powerpc/mm/kasan/init_32.c | 8 +++++++- arch/powerpc/mm/kasan/init_book3e_64.c | 6 ++++++ arch/powerpc/mm/kasan/init_book3s_64.c | 6 ++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/mm/kasan/init_32.c b/arch/powerpc/mm/kasan/init_32.c index 03666d790a53..b0c465f3fbf5 100644 --- a/arch/powerpc/mm/kasan/init_32.c +++ b/arch/powerpc/mm/kasan/init_32.c @@ -141,6 +141,9 @@ void __init kasan_init(void) u64 i; int ret; + if (kasan_arg_disabled) + return; + for_each_mem_range(i, &base, &end) { phys_addr_t top = min(end, total_lowmem); @@ -163,6 +166,9 @@ void __init kasan_init(void) clear_page(kasan_early_shadow_page); + /* KASAN is now initialized, enable it. */ + static_branch_enable(&kasan_flag_enabled); + /* At this point kasan is fully initialized. Enable error messages */ init_task.kasan_depth = 0; pr_info("KASAN init done\n"); @@ -170,7 +176,7 @@ void __init kasan_init(void) void __init kasan_late_init(void) { - if (IS_ENABLED(CONFIG_KASAN_VMALLOC)) + if (IS_ENABLED(CONFIG_KASAN_VMALLOC) && kasan_enabled()) kasan_unmap_early_shadow_vmalloc(); } diff --git a/arch/powerpc/mm/kasan/init_book3e_64.c b/arch/powerpc/mm/kasan/init_book3e_64.c index 60c78aac0f63..1e1c10467a2b 100644 --- a/arch/powerpc/mm/kasan/init_book3e_64.c +++ b/arch/powerpc/mm/kasan/init_book3e_64.c @@ -111,6 +111,9 @@ void __init kasan_init(void) u64 i; pte_t zero_pte = pfn_pte(virt_to_pfn(kasan_early_shadow_page), PAGE_KERNEL_RO); + if (kasan_arg_disabled) + return; + for_each_mem_range(i, &start, &end) kasan_init_phys_region(phys_to_virt(start), phys_to_virt(end)); @@ -125,6 +128,9 @@ void __init kasan_init(void) memset(kasan_early_shadow_page, 0, PAGE_SIZE); + /* KASAN is now initialized, enable it. */ + static_branch_enable(&kasan_flag_enabled); + /* Enable error messages */ init_task.kasan_depth = 0; pr_info("KASAN init done\n"); diff --git a/arch/powerpc/mm/kasan/init_book3s_64.c b/arch/powerpc/mm/kasan/init_book3s_64.c index 7d959544c077..9c5cf2354c8b 100644 --- a/arch/powerpc/mm/kasan/init_book3s_64.c +++ b/arch/powerpc/mm/kasan/init_book3s_64.c @@ -56,6 +56,9 @@ void __init kasan_init(void) u64 i; pte_t zero_pte = pfn_pte(virt_to_pfn(kasan_early_shadow_page), PAGE_KERNEL); + if (kasan_arg_disabled) + return; + if (!early_radix_enabled()) { pr_warn("KASAN not enabled as it requires radix!"); return; @@ -94,6 +97,9 @@ void __init kasan_init(void) static_branch_inc(&powerpc_kasan_enabled_key); + /* KASAN is now initialized, enable it. */ + static_branch_enable(&kasan_flag_enabled); + /* Enable error messages */ init_task.kasan_depth = 0; pr_info("KASAN init done\n"); -- 2.41.0