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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 D2D6ECA0EFD for ; Wed, 20 Aug 2025 05:45:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc: To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=iAEMFQ7UJQsp/YRWJnDzAESQXUNpKqSpnHshmUmLX+c=; b=Jb9ri5srQLTBGxBKbGE9kXk4NJ 6eaB5Ji5RbD7D+pJk/PAqJQWNlbLyfcGT9j8GdrUT5D+UmdXHeOprgiWGVHaQCAjErBIe5udMur/1 55vsieJr1r187xibHWTjIYYWP07/mVxU9oEr4WngLpuks0IjlmOm1IwvHxSowOiyeI68rx68InIfy 8+uatsGGXVK4Pso6+NVCteTM55gIiIYN+3YIzBmakzBJSjIYJ8+gjZEloy4+GAagttWqbd9rc/PV1 91xuFc7jmIu4dH9VgetOu9vhdwDDhq4OY5yEXCKkm0XP2SuyFhl0JMIzMLGnCncijpQvhNeVdpdMV Tma7DWOQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uobde-0000000CRgS-2GYn; Wed, 20 Aug 2025 05:45:34 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uobV2-0000000CQKE-36dY for kexec@lists.infradead.org; Wed, 20 Aug 2025 05:36:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755668199; 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=iAEMFQ7UJQsp/YRWJnDzAESQXUNpKqSpnHshmUmLX+c=; b=gPdTm5lzBAQ5uEAk45iYhvkef2Z1amasqGVDVuPASqY1lveeNxSjIyvlQ8XMqdpsZA4m7G ZzThMf3YkWO9J4kVx4HX4B21qJor4l6K/9nfUVwwYBz8Yqo9XyxSSCUJ/x/LYH/hz+mtUf mA8rO9Bf9CsAhs7KfxNzkjOqLZjbmik= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-488-ua7zccu4OLWU2rQ3gWmgQw-1; Wed, 20 Aug 2025 01:36:36 -0400 X-MC-Unique: ua7zccu4OLWU2rQ3gWmgQw-1 X-Mimecast-MFC-AGG-ID: ua7zccu4OLWU2rQ3gWmgQw_1755668194 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E7C12180034B; Wed, 20 Aug 2025 05:36:33 +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 712EF19560B0; Wed, 20 Aug 2025 05:36:25 +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 , x86@kernel.org Subject: [PATCH v3 09/12] arch/x86: don't initialize kasan if it's disabled Date: Wed, 20 Aug 2025 13:34:56 +0800 Message-ID: <20250820053459.164825-10-bhe@redhat.com> In-Reply-To: <20250820053459.164825-1-bhe@redhat.com> References: <20250820053459.164825-1-bhe@redhat.com> MIME-Version: 1.0 Content-type: text/plain Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250819_223640_847031_5F270548 X-CRM114-Status: UNSURE ( 9.08 ) X-CRM114-Notice: Please train this message. X-BeenThere: kexec@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "kexec" Errors-To: kexec-bounces+kexec=archiver.kernel.org@lists.infradead.org And also add code to enable kasan_flag_enabled, this is for later usage. Signed-off-by: Baoquan He Cc: x86@kernel.org --- arch/x86/mm/kasan_init_64.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c index 0539efd0d216..0f2f9311e9df 100644 --- a/arch/x86/mm/kasan_init_64.c +++ b/arch/x86/mm/kasan_init_64.c @@ -343,6 +343,9 @@ void __init kasan_init(void) unsigned long shadow_cea_begin, shadow_cea_per_cpu_begin, shadow_cea_end; int i; + if (kasan_arg_disabled) + return; + memcpy(early_top_pgt, init_top_pgt, sizeof(early_top_pgt)); /* @@ -450,6 +453,9 @@ void __init kasan_init(void) /* Flush TLBs again to be sure that write protection applied. */ __flush_tlb_all(); + /* KASAN is now initialized, enable it. */ + static_branch_enable(&kasan_flag_enabled); + init_task.kasan_depth = 0; pr_info("KernelAddressSanitizer initialized\n"); } -- 2.41.0