From nobody Sun Oct 5 10:45:26 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5F41D20A5EB for ; Tue, 5 Aug 2025 06:23:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754375040; cv=none; b=N2KDvzoq1gACTa+fgjoICSRYuxF+ztiLA9NeEQDWvrlxJ9Yw2cvvMyssmA8usc0S4i3Vz22cdbtW7A8FSFwscJ9mpklyRYokHScwxdU6iW5G4ZnkMfWR0jDVZiPbh/YDhOLoY4Y96I/GvcMz4HqQoq6Qh1m10ayBrEfsfs0Oins= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754375040; c=relaxed/simple; bh=guGVq8yM5kD8jmGr7FO8uLNG/DOGjFIKUs+p4MVpbG8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-type; b=SEP+OfQmsPHih8BvRn6vGdO6ixD+SxH7p71GbOQLaYTF/dqi9OiWS/mbrQh7Bsc6TKvdjW4s/FQ7t7mIxAXAN6uifVxRg624Ca0Fc4EgiJLiWpf9FNeSm5S9aU79orYXUonF1GnXRUW7mtAbqnjhs7wqgkKEvurFHcGGtuG3RIg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=auKTYg7m; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="auKTYg7m" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754375037; 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=YU51QcBxpYhMcGyh8yXmd1ecFtbJIeZYT5VTxJvHY9k=; b=auKTYg7m0jqy3qjDun6SHuaMtsQW2Mf6K4cQT0Y2Kr8PeWcr7zWOK1VlA5SCf99pz6V7hK FLEerwbsyu+mfATOFvgabg7GMZE8L+crr9b/lxffns0cFTN1cXfY3ulADcj/x+i2ZlH4rr MwVooJw4dU7zOUV3J+69kZdSK7aTzRc= Received: from mx-prod-mc-01.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-308-8_Hp1WdPNaKVrdPYJCqwew-1; Tue, 05 Aug 2025 02:23:50 -0400 X-MC-Unique: 8_Hp1WdPNaKVrdPYJCqwew-1 X-Mimecast-MFC-AGG-ID: 8_Hp1WdPNaKVrdPYJCqwew_1754375029 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8F8761956089; Tue, 5 Aug 2025 06:23:48 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.112.136]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5033C1956094; Tue, 5 Aug 2025 06:23:42 +0000 (UTC) From: Baoquan He To: linux-mm@kvack.org Cc: ryabinin.a.a@gmail.com, glider@google.com, andreyknvl@gmail.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, Baoquan He Subject: [PATCH 1/4] mm/kasan: add conditional checks in functions to return directly if kasan is disabled Date: Tue, 5 Aug 2025 14:23:30 +0800 Message-ID: <20250805062333.121553-2-bhe@redhat.com> In-Reply-To: <20250805062333.121553-1-bhe@redhat.com> References: <20250805062333.121553-1-bhe@redhat.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 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" The current code only does the check if kasan is disabled for hw_tags mode. Here add the conditional checks for functional functions of generic mode and sw_tags mode. This is prepared for later adding kernel parameter kasan=3Don|off for all kasan modes. Signed-off-by: Baoquan He --- mm/kasan/generic.c | 20 ++++++++++++++++++-- mm/kasan/init.c | 6 ++++++ mm/kasan/quarantine.c | 3 +++ mm/kasan/shadow.c | 23 ++++++++++++++++++++++- mm/kasan/sw_tags.c | 3 +++ 5 files changed, 52 insertions(+), 3 deletions(-) diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c index d54e89f8c3e7..ee4ddc1e7127 100644 --- a/mm/kasan/generic.c +++ b/mm/kasan/generic.c @@ -165,6 +165,9 @@ static __always_inline bool check_region_inline(const v= oid *addr, size_t size, bool write, unsigned long ret_ip) { + if (!kasan_enabled()) + return true; + if (!kasan_arch_is_ready()) return true; =20 @@ -203,12 +206,13 @@ bool kasan_byte_accessible(const void *addr) =20 void kasan_cache_shrink(struct kmem_cache *cache) { - kasan_quarantine_remove_cache(cache); + if (kasan_enabled()) + kasan_quarantine_remove_cache(cache); } =20 void kasan_cache_shutdown(struct kmem_cache *cache) { - if (!__kmem_cache_empty(cache)) + if (kasan_enabled() && !__kmem_cache_empty(cache)) kasan_quarantine_remove_cache(cache); } =20 @@ -228,6 +232,9 @@ void __asan_register_globals(void *ptr, ssize_t size) int i; struct kasan_global *globals =3D ptr; =20 + if (!kasan_enabled()) + return; + for (i =3D 0; i < size; i++) register_global(&globals[i]); } @@ -358,6 +365,9 @@ void kasan_cache_create(struct kmem_cache *cache, unsig= ned int *size, unsigned int rem_free_meta_size; unsigned int orig_alloc_meta_offset; =20 + if (!kasan_enabled()) + return; + if (!kasan_requires_meta()) return; =20 @@ -510,6 +520,9 @@ size_t kasan_metadata_size(struct kmem_cache *cache, bo= ol in_object) { struct kasan_cache *info =3D &cache->kasan_info; =20 + if (!kasan_enabled()) + return 0; + if (!kasan_requires_meta()) return 0; =20 @@ -535,6 +548,9 @@ void kasan_record_aux_stack(void *addr) struct kasan_alloc_meta *alloc_meta; void *object; =20 + if (!kasan_enabled()) + return; + if (is_kfence_address(addr) || !slab) return; =20 diff --git a/mm/kasan/init.c b/mm/kasan/init.c index ced6b29fcf76..43d95f329675 100644 --- a/mm/kasan/init.c +++ b/mm/kasan/init.c @@ -449,6 +449,9 @@ void kasan_remove_zero_shadow(void *start, unsigned lon= g size) unsigned long addr, end, next; pgd_t *pgd; =20 + if (!kasan_enabled()) + return; + addr =3D (unsigned long)kasan_mem_to_shadow(start); end =3D addr + (size >> KASAN_SHADOW_SCALE_SHIFT); =20 @@ -484,6 +487,9 @@ int kasan_add_zero_shadow(void *start, unsigned long si= ze) int ret; void *shadow_start, *shadow_end; =20 + if (!kasan_enabled()) + return 0; + shadow_start =3D kasan_mem_to_shadow(start); shadow_end =3D shadow_start + (size >> KASAN_SHADOW_SCALE_SHIFT); =20 diff --git a/mm/kasan/quarantine.c b/mm/kasan/quarantine.c index 6958aa713c67..a6dc2c3d8a15 100644 --- a/mm/kasan/quarantine.c +++ b/mm/kasan/quarantine.c @@ -405,6 +405,9 @@ static int __init kasan_cpu_quarantine_init(void) { int ret =3D 0; =20 + if (!kasan_enabled()) + return 0; + ret =3D cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "mm/kasan:online", kasan_cpu_online, kasan_cpu_offline); if (ret < 0) diff --git a/mm/kasan/shadow.c b/mm/kasan/shadow.c index d2c70cd2afb1..637f2d02d2a3 100644 --- a/mm/kasan/shadow.c +++ b/mm/kasan/shadow.c @@ -125,6 +125,9 @@ void kasan_poison(const void *addr, size_t size, u8 val= ue, bool init) { void *shadow_start, *shadow_end; =20 + if (!kasan_enabled()) + return; + if (!kasan_arch_is_ready()) return; =20 @@ -150,6 +153,9 @@ EXPORT_SYMBOL_GPL(kasan_poison); #ifdef CONFIG_KASAN_GENERIC void kasan_poison_last_granule(const void *addr, size_t size) { + if (!kasan_enabled()) + return; + if (!kasan_arch_is_ready()) return; =20 @@ -164,6 +170,8 @@ void kasan_unpoison(const void *addr, size_t size, bool= init) { u8 tag =3D get_tag(addr); =20 + if (!kasan_enabled()) + return; /* * Perform shadow offset calculation based on untagged address, as * some of the callers (e.g. kasan_unpoison_new_object) pass tagged @@ -277,7 +285,8 @@ static int __meminit kasan_mem_notifier(struct notifier= _block *nb, =20 static int __init kasan_memhotplug_init(void) { - hotplug_memory_notifier(kasan_mem_notifier, DEFAULT_CALLBACK_PRI); + if (kasan_enabled()) + hotplug_memory_notifier(kasan_mem_notifier, DEFAULT_CALLBACK_PRI); =20 return 0; } @@ -390,6 +399,9 @@ int kasan_populate_vmalloc(unsigned long addr, unsigned= long size) unsigned long shadow_start, shadow_end; int ret; =20 + if (!kasan_enabled()) + return 0; + if (!kasan_arch_is_ready()) return 0; =20 @@ -560,6 +572,9 @@ void kasan_release_vmalloc(unsigned long start, unsigne= d long end, unsigned long region_start, region_end; unsigned long size; =20 + if (!kasan_enabled()) + return; + if (!kasan_arch_is_ready()) return; =20 @@ -655,6 +670,9 @@ int kasan_alloc_module_shadow(void *addr, size_t size, = gfp_t gfp_mask) size_t shadow_size; unsigned long shadow_start; =20 + if (!kasan_enabled()) + return 0; + shadow_start =3D (unsigned long)kasan_mem_to_shadow(addr); scaled_size =3D (size + KASAN_GRANULE_SIZE - 1) >> KASAN_SHADOW_SCALE_SHIFT; @@ -691,6 +709,9 @@ int kasan_alloc_module_shadow(void *addr, size_t size, = gfp_t gfp_mask) =20 void kasan_free_module_shadow(const struct vm_struct *vm) { + if (!kasan_enabled()) + return; + if (IS_ENABLED(CONFIG_UML)) return; =20 diff --git a/mm/kasan/sw_tags.c b/mm/kasan/sw_tags.c index b9382b5b6a37..01f19bc4a326 100644 --- a/mm/kasan/sw_tags.c +++ b/mm/kasan/sw_tags.c @@ -78,6 +78,9 @@ bool kasan_check_range(const void *addr, size_t size, boo= l write, u8 *shadow_first, *shadow_last, *shadow; void *untagged_addr; =20 + if (!kasan_enabled()) + return true; + if (unlikely(size =3D=3D 0)) return true; =20 --=20 2.41.0 From nobody Sun Oct 5 10:45:26 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1C2E521ADB7 for ; Tue, 5 Aug 2025 06:24:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754375043; cv=none; b=JAJPXJBfipuxYy6OE051K0X+A5uZwFEbufdm8ovuBKrJLAQDwNsB/r/YQghe9bWj8h5beZJbCFrrieH+wR2g3PyRQBiZcKBPD4SlU+IYfm9t2oGV/JzUYkCyJ1Fimy4WNRuUrmA4kS0pGfGELHxEPqVmS3RKJ7z9miUuAGOVGdQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754375043; c=relaxed/simple; bh=W3R07hzTWZPfShNu2KVLMnA1R6pxahOpnR6skXTPLck=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-type; b=f9+G0q04V9TTe63r31oqpRseQY9H1KJ6k25Rwb/cuBtEcI1829RrEBKbrbGqyj2sEXmOB1LukTLxvAOcwbf8jY5kslFqvPMBotQCVUAWFfERc6fn0AK/oQ2ot4iQh3EjLUJu/BBaeM1r4pnrnzSogwJ8q1/HsNNirEWtSCA0qV4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=OcbWbscA; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="OcbWbscA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754375040; 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=gZBsPQV9kOkkozOpLxZBEzL8oHtewXXrqpcjTZWsiRU=; b=OcbWbscA+tClOSpRJy3gTFFu/oP/XOPYUuUygY4G0Y13kSYD6RaovQviD6ZeBJYDlpOMti 27viEuPaaEMsvzhGoON/BvNZTj3Hcmacd+nGPeQO+/xhMQgs6vClYDOL/NcDne8Aiiuzj0 so4A5XtGGKWvW8KHaKn5jPZgmyQKwY4= 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-26-TZy3PSbmM6WgBfqMCjg2Sg-1; Tue, 05 Aug 2025 02:23:57 -0400 X-MC-Unique: TZy3PSbmM6WgBfqMCjg2Sg-1 X-Mimecast-MFC-AGG-ID: TZy3PSbmM6WgBfqMCjg2Sg_1754375035 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 7E55E180036D; Tue, 5 Aug 2025 06:23:55 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.112.136]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C857B1956094; Tue, 5 Aug 2025 06:23:49 +0000 (UTC) From: Baoquan He To: linux-mm@kvack.org Cc: ryabinin.a.a@gmail.com, glider@google.com, andreyknvl@gmail.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, Baoquan He Subject: [PATCH 2/4] mm/kasan: move kasan= code to common place Date: Tue, 5 Aug 2025 14:23:31 +0800 Message-ID: <20250805062333.121553-3-bhe@redhat.com> In-Reply-To: <20250805062333.121553-1-bhe@redhat.com> References: <20250805062333.121553-1-bhe@redhat.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 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" This allows generic and sw_tags to be set in kernel cmdline too. When at it, rename 'kasan_arg' to 'kasan_arg_disabled' as a bool variable. And expose 'kasan_flag_enabled' to kasan common place too. This is prepared for later adding kernel parameter kasan=3Don|off for all kasan modes. Signed-off-by: Baoquan He --- include/linux/kasan-enabled.h | 4 +++- mm/kasan/common.c | 27 +++++++++++++++++++++++++++ mm/kasan/hw_tags.c | 35 ++--------------------------------- 3 files changed, 32 insertions(+), 34 deletions(-) diff --git a/include/linux/kasan-enabled.h b/include/linux/kasan-enabled.h index 6f612d69ea0c..32f2d19f599f 100644 --- a/include/linux/kasan-enabled.h +++ b/include/linux/kasan-enabled.h @@ -4,10 +4,12 @@ =20 #include =20 -#ifdef CONFIG_KASAN_HW_TAGS +extern bool kasan_arg_disabled; =20 DECLARE_STATIC_KEY_FALSE(kasan_flag_enabled); =20 +#ifdef CONFIG_KASAN_HW_TAGS + static __always_inline bool kasan_enabled(void) { return static_branch_likely(&kasan_flag_enabled); diff --git a/mm/kasan/common.c b/mm/kasan/common.c index ed4873e18c75..fe6937654203 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -32,6 +32,33 @@ #include "kasan.h" #include "../slab.h" =20 +/* + * Whether KASAN is enabled at all. + * The value remains false until KASAN is initialized. + */ +DEFINE_STATIC_KEY_FALSE(kasan_flag_enabled); +EXPORT_SYMBOL(kasan_flag_enabled); + +bool kasan_arg_disabled; +/* kasan=3Doff/on */ +static int __init early_kasan_flag(char *arg) +{ + if (!arg) + return -EINVAL; + + if (!strcmp(arg, "off")) + kasan_arg_disabled =3D true; + else if (!strcmp(arg, "on")) + kasan_arg_disabled =3D false; + else + return -EINVAL; + + return 0; +} +early_param("kasan", early_kasan_flag); + + + struct slab *kasan_addr_to_slab(const void *addr) { if (virt_addr_valid(addr)) diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c index 9a6927394b54..377e9c285a74 100644 --- a/mm/kasan/hw_tags.c +++ b/mm/kasan/hw_tags.c @@ -22,12 +22,6 @@ =20 #include "kasan.h" =20 -enum kasan_arg { - KASAN_ARG_DEFAULT, - KASAN_ARG_OFF, - KASAN_ARG_ON, -}; - enum kasan_arg_mode { KASAN_ARG_MODE_DEFAULT, KASAN_ARG_MODE_SYNC, @@ -41,17 +35,9 @@ enum kasan_arg_vmalloc { KASAN_ARG_VMALLOC_ON, }; =20 -static enum kasan_arg kasan_arg __ro_after_init; static enum kasan_arg_mode kasan_arg_mode __ro_after_init; static enum kasan_arg_vmalloc kasan_arg_vmalloc __initdata; =20 -/* - * Whether KASAN is enabled at all. - * The value remains false until KASAN is initialized by kasan_init_hw_tag= s(). - */ -DEFINE_STATIC_KEY_FALSE(kasan_flag_enabled); -EXPORT_SYMBOL(kasan_flag_enabled); - /* * Whether the selected mode is synchronous, asynchronous, or asymmetric. * Defaults to KASAN_MODE_SYNC. @@ -85,23 +71,6 @@ unsigned int kasan_page_alloc_sample_order =3D PAGE_ALLO= C_SAMPLE_ORDER_DEFAULT; =20 DEFINE_PER_CPU(long, kasan_page_alloc_skip); =20 -/* kasan=3Doff/on */ -static int __init early_kasan_flag(char *arg) -{ - if (!arg) - return -EINVAL; - - if (!strcmp(arg, "off")) - kasan_arg =3D KASAN_ARG_OFF; - else if (!strcmp(arg, "on")) - kasan_arg =3D KASAN_ARG_ON; - else - return -EINVAL; - - return 0; -} -early_param("kasan", early_kasan_flag); - /* kasan.mode=3Dsync/async/asymm */ static int __init early_kasan_mode(char *arg) { @@ -209,7 +178,7 @@ void kasan_init_hw_tags_cpu(void) * When this function is called, kasan_flag_enabled is not yet * set by kasan_init_hw_tags(). Thus, check kasan_arg instead. */ - if (kasan_arg =3D=3D KASAN_ARG_OFF) + if (kasan_arg_disabled) return; =20 /* @@ -227,7 +196,7 @@ void __init kasan_init_hw_tags(void) return; =20 /* If KASAN is disabled via command line, don't initialize it. */ - if (kasan_arg =3D=3D KASAN_ARG_OFF) + if (kasan_arg_disabled) return; =20 switch (kasan_arg_mode) { --=20 2.41.0 From nobody Sun Oct 5 10:45:26 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8321B21ABDB for ; Tue, 5 Aug 2025 06:24:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754375050; cv=none; b=jQzDa+aWJJyMKSSk/5hB/1oQQLdGwUPt9Wrep9X4X+XC4UwG2MKWFmx4kBh8kW3bHhdsPsJcXmg0mRCjbOmpL5cp6LLZlJeU1yKNvu2pilYQiekQL7c+X8efVRNiVN1GMseGX10UQXZY5ICPNtdJLVC3Vs+IzzxG1OJSgsIwzJQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754375050; c=relaxed/simple; bh=lZ+OKkIOkFuedEaabW32pjJAl9o7rxnfTpjfeGfsgDY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-type; b=InuKzErvDhj0Xjjgg5q1KqunOUajzzsBA0vUuAa2R93YL0vnIBb/W3hT2vYYOf0vuY/SJO7TYvnndK2sI6auWv56pRCAXUdRiYV7qgXaVej6r/bBlZT1aqlOCAc0LowYQHo0kl1+N2wCasguuvjLmUzQXr6rLFRQMZ81ncEWNfU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=gv5JyxEV; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="gv5JyxEV" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754375047; 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=c+hY2uT3rtX0jxqTDwr4o0wnNu5PQr3WJ9i3CgsATwQ=; b=gv5JyxEVKqU1++p8yFiJfgtVZ+ZlJ572dpVtrDyj1qTF7eIfubCmho+XYwM5xFkpZw5eym di3wPUbmEa/+0/6EYtIpwPPrF/3ICMj/7bACfvQeRtedAkhlcWwj9qam1kcybNrdzn5g8L 9yynk81A74fWtA1YWifPC0ZCy1q96J4= Received: from mx-prod-mc-06.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-357-zuByUt8SMlOb-KzlFOuhUA-1; Tue, 05 Aug 2025 02:24:03 -0400 X-MC-Unique: zuByUt8SMlOb-KzlFOuhUA-1 X-Mimecast-MFC-AGG-ID: zuByUt8SMlOb-KzlFOuhUA_1754375041 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8C4B71800366; Tue, 5 Aug 2025 06:24:01 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.112.136]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 55DDF1956094; Tue, 5 Aug 2025 06:23:55 +0000 (UTC) From: Baoquan He To: linux-mm@kvack.org Cc: ryabinin.a.a@gmail.com, glider@google.com, andreyknvl@gmail.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, Baoquan He Subject: [PATCH 3/4] mm/kasan: don't initialize kasan if it's disabled Date: Tue, 5 Aug 2025 14:23:32 +0800 Message-ID: <20250805062333.121553-4-bhe@redhat.com> In-Reply-To: <20250805062333.121553-1-bhe@redhat.com> References: <20250805062333.121553-1-bhe@redhat.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 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" This is mainly done in all architectures which support kasan, and also need be done in sw_tags init funciton kasan_init_sw_tags(). And also add code to enable kasan_flag_enabled, this is for later usage. Signed-off-by: Baoquan He --- arch/arm/mm/kasan_init.c | 6 ++++++ arch/arm64/mm/kasan_init.c | 7 +++++++ arch/loongarch/mm/kasan_init.c | 5 +++++ 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 ++++++ arch/riscv/mm/kasan_init.c | 6 ++++++ arch/um/kernel/mem.c | 6 ++++++ arch/x86/mm/kasan_init_64.c | 6 ++++++ arch/xtensa/mm/kasan_init.c | 6 ++++++ mm/kasan/sw_tags.c | 6 ++++++ 11 files changed, 67 insertions(+), 1 deletion(-) diff --git a/arch/arm/mm/kasan_init.c b/arch/arm/mm/kasan_init.c index 111d4f703136..c764e1b9c9c5 100644 --- a/arch/arm/mm/kasan_init.c +++ b/arch/arm/mm/kasan_init.c @@ -212,6 +212,8 @@ void __init kasan_init(void) phys_addr_t pa_start, pa_end; u64 i; =20 + if (kasan_arg_disabled) + return; /* * We are going to perform proper setup of shadow memory. * @@ -300,6 +302,10 @@ void __init kasan_init(void) local_flush_tlb_all(); =20 memset(kasan_early_shadow_page, 0, PAGE_SIZE); + + /* KASAN is now initialized, enable it. */ + static_branch_enable(&kasan_flag_enabled); + pr_info("Kernel address sanitizer initialized\n"); init_task.kasan_depth =3D 0; } diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c index d541ce45daeb..0e4ffe3f5d0e 100644 --- a/arch/arm64/mm/kasan_init.c +++ b/arch/arm64/mm/kasan_init.c @@ -384,6 +384,9 @@ void __init kasan_populate_early_vm_area_shadow(void *s= tart, unsigned long size) { unsigned long shadow_start, shadow_end; =20 + if (!kasan_enabled()) + return; + if (!is_vmalloc_or_module_addr(start)) return; =20 @@ -397,6 +400,9 @@ void __init kasan_populate_early_vm_area_shadow(void *s= tart, unsigned long size) =20 void __init kasan_init(void) { + if (kasan_arg_disabled) + return; + kasan_init_shadow(); kasan_init_depth(); #if defined(CONFIG_KASAN_GENERIC) @@ -405,6 +411,7 @@ void __init kasan_init(void) * Software and Hardware Tag-Based modes still require * kasan_init_sw_tags() and kasan_init_hw_tags() correspondingly. */ + static_branch_enable(&kasan_flag_enabled); pr_info("KernelAddressSanitizer initialized (generic)\n"); #endif } diff --git a/arch/loongarch/mm/kasan_init.c b/arch/loongarch/mm/kasan_init.c index d2681272d8f0..0c32eee6910f 100644 --- a/arch/loongarch/mm/kasan_init.c +++ b/arch/loongarch/mm/kasan_init.c @@ -267,6 +267,8 @@ void __init kasan_init(void) u64 i; phys_addr_t pa_start, pa_end; =20 + if (kasan_arg_disabled) + return; /* * If PGDIR_SIZE is too large for cpu_vabits, KASAN_SHADOW_END will * overflow UINTPTR_MAX and then looks like a user space address. @@ -327,6 +329,9 @@ void __init kasan_init(void) csr_write64(__pa_symbol(swapper_pg_dir), LOONGARCH_CSR_PGDH); local_flush_tlb_all(); =20 + /* 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 =3D 0; pr_info("KernelAddressSanitizer initialized.\n"); diff --git a/arch/powerpc/mm/kasan/init_32.c b/arch/powerpc/mm/kasan/init_3= 2.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; =20 + if (kasan_arg_disabled) + return; + for_each_mem_range(i, &base, &end) { phys_addr_t top =3D min(end, total_lowmem); =20 @@ -163,6 +166,9 @@ void __init kasan_init(void) =20 clear_page(kasan_early_shadow_page); =20 + /* 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 =3D 0; pr_info("KASAN init done\n"); @@ -170,7 +176,7 @@ void __init kasan_init(void) =20 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(); } =20 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 =3D pfn_pte(virt_to_pfn(kasan_early_shadow_page), PAGE_KER= NEL_RO); =20 + if (kasan_arg_disabled) + return; + for_each_mem_range(i, &start, &end) kasan_init_phys_region(phys_to_virt(start), phys_to_virt(end)); =20 @@ -125,6 +128,9 @@ void __init kasan_init(void) =20 memset(kasan_early_shadow_page, 0, PAGE_SIZE); =20 + /* KASAN is now initialized, enable it. */ + static_branch_enable(&kasan_flag_enabled); + /* Enable error messages */ init_task.kasan_depth =3D 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 =3D pfn_pte(virt_to_pfn(kasan_early_shadow_page), PAGE_KER= NEL); =20 + 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) =20 static_branch_inc(&powerpc_kasan_enabled_key); =20 + /* KASAN is now initialized, enable it. */ + static_branch_enable(&kasan_flag_enabled); + /* Enable error messages */ init_task.kasan_depth =3D 0; pr_info("KASAN init done\n"); diff --git a/arch/riscv/mm/kasan_init.c b/arch/riscv/mm/kasan_init.c index 41c635d6aca4..ac3ac227c765 100644 --- a/arch/riscv/mm/kasan_init.c +++ b/arch/riscv/mm/kasan_init.c @@ -485,6 +485,9 @@ void __init kasan_init(void) phys_addr_t p_start, p_end; u64 i; =20 + if (kasan_arg_disabled) + return; + create_tmp_mapping(); csr_write(CSR_SATP, PFN_DOWN(__pa(tmp_pg_dir)) | satp_mode); =20 @@ -531,6 +534,9 @@ void __init kasan_init(void) memset(kasan_early_shadow_page, KASAN_SHADOW_INIT, PAGE_SIZE); init_task.kasan_depth =3D 0; =20 + /* KASAN is now initialized, enable it. */ + static_branch_enable(&kasan_flag_enabled); + csr_write(CSR_SATP, PFN_DOWN(__pa(swapper_pg_dir)) | satp_mode); local_flush_tlb_all(); } diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c index 76bec7de81b5..6961841daa12 100644 --- a/arch/um/kernel/mem.c +++ b/arch/um/kernel/mem.c @@ -26,6 +26,9 @@ int kasan_um_is_ready; void kasan_init(void) { + + if (kasan_arg_disabled) + return; /* * kasan_map_memory will map all of the required address space and * the host machine will allocate physical memory as necessary. @@ -33,6 +36,9 @@ void kasan_init(void) kasan_map_memory((void *)KASAN_SHADOW_START, KASAN_SHADOW_SIZE); init_task.kasan_depth =3D 0; kasan_um_is_ready =3D true; + + /* KASAN is now initialized, enable it. */ + static_branch_enable(&kasan_flag_enabled); } =20 static void (*kasan_init_ptr)(void) diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c index 0539efd0d216..d7e8c59da435 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; =20 + if (kasan_arg_disabled) + return; + memcpy(early_top_pgt, init_top_pgt, sizeof(early_top_pgt)); =20 /* @@ -450,6 +453,9 @@ void __init kasan_init(void) /* Flush TLBs again to be sure that write protection applied. */ __flush_tlb_all(); =20 + /* KASAN is now initialized, enable it. */ + static_branch_enable(&kasan_flag_enabled); + init_task.kasan_depth =3D 0; pr_info("KernelAddressSanitizer initialized\n"); } diff --git a/arch/xtensa/mm/kasan_init.c b/arch/xtensa/mm/kasan_init.c index f39c4d83173a..4a7b77f47225 100644 --- a/arch/xtensa/mm/kasan_init.c +++ b/arch/xtensa/mm/kasan_init.c @@ -70,6 +70,9 @@ void __init kasan_init(void) { int i; =20 + if (kasan_arg_disabled) + return; + BUILD_BUG_ON(KASAN_SHADOW_OFFSET !=3D KASAN_SHADOW_START - (KASAN_START_VADDR >> KASAN_SHADOW_SCALE_SHIFT)); BUILD_BUG_ON(VMALLOC_START < KASAN_START_VADDR); @@ -92,6 +95,9 @@ void __init kasan_init(void) local_flush_tlb_all(); memset(kasan_early_shadow_page, 0, PAGE_SIZE); =20 + /* KASAN is now initialized, enable it. */ + static_branch_enable(&kasan_flag_enabled); + /* At this point kasan is fully initialized. Enable error messages. */ current->kasan_depth =3D 0; pr_info("KernelAddressSanitizer initialized\n"); diff --git a/mm/kasan/sw_tags.c b/mm/kasan/sw_tags.c index 01f19bc4a326..dd963ba4d143 100644 --- a/mm/kasan/sw_tags.c +++ b/mm/kasan/sw_tags.c @@ -40,11 +40,17 @@ void __init kasan_init_sw_tags(void) { int cpu; =20 + if (kasan_arg_disabled) + return; + for_each_possible_cpu(cpu) per_cpu(prng_state, cpu) =3D (u32)get_cycles(); =20 kasan_init_tags(); =20 + /* KASAN is now initialized, enable it. */ + static_branch_enable(&kasan_flag_enabled); + pr_info("KernelAddressSanitizer initialized (sw-tags, stacktrace=3D%s)\n", str_on_off(kasan_stack_collection_enabled())); } --=20 2.41.0 From nobody Sun Oct 5 10:45:26 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5232521CA0E for ; Tue, 5 Aug 2025 06:24:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754375054; cv=none; b=b+XHdLncBnNo6iaU4yAgfjuvdJ94Rx5YOJAi5/oz7okFkl6ULaRVW6i3OPmu9xAAYtWdlJ/rrnBQnS+mb/gghMNnXbRCpwyKrDFfgYDrPKt87tLvFu+h3WS5h/NCft4Q4d/dPw6J38yEeeYnbr4P6KV4/Sp2rKGCdzGsgxFZ6AI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754375054; c=relaxed/simple; bh=RDZ+lfeK7bnVLFbpItWQCYl5cJqk0fDJcJjg/NnHjco=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-type; b=G4CpgsN6y4kH8FZffD+syBoBWD8w1/CFFG9fzwXFagTpGIB2s2fMYtBhRJwiFONYGuOCqkEqQ2zSUUDYFaytHIusvfUH9aI+ccmPWGTnY02N756sDXZ2zPjCojw6sw10J+va57s/Cc3tWzrVLtRwR4Tx5oMFQzfOuSRsXbBU1o4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=fzNTvYIT; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="fzNTvYIT" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754375052; 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=kJO5yIBXXOgt25+uyQhOeCpPCqEaTDSwq6fQ38qy9Bc=; b=fzNTvYIT93IdC/zd0RW/xFuuxw76MJL6/RnQv73vwe5B7LrnDXrQqH1Lh6Z5vmmy+Wso2b 3L5uds0a3+MbEuKbak4c42ONdWBPztfu1SNGbEFR0fHTlnWqIxIAQ+flMRs7RhG2aIeGoa iHalYMlAXBza8v8+fIu/CUPw9XZoOlQ= 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-178-AR-aqPXUOv6YUb-9IY0KQw-1; Tue, 05 Aug 2025 02:24:09 -0400 X-MC-Unique: AR-aqPXUOv6YUb-9IY0KQw-1 X-Mimecast-MFC-AGG-ID: AR-aqPXUOv6YUb-9IY0KQw_1754375048 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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 A0AF61800876; Tue, 5 Aug 2025 06:24:07 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.112.136]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6C6CF1956094; Tue, 5 Aug 2025 06:24:01 +0000 (UTC) From: Baoquan He To: linux-mm@kvack.org Cc: ryabinin.a.a@gmail.com, glider@google.com, andreyknvl@gmail.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, Baoquan He Subject: [PATCH 4/4] mm/kasan: make kasan=on|off take effect for all three modes Date: Tue, 5 Aug 2025 14:23:33 +0800 Message-ID: <20250805062333.121553-5-bhe@redhat.com> In-Reply-To: <20250805062333.121553-1-bhe@redhat.com> References: <20250805062333.121553-1-bhe@redhat.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 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Content-Type: text/plain; charset="utf-8" Now everything is ready, set kasan=3Doff can disable kasan for all three modes. Signed-off-by: Baoquan He --- include/linux/kasan-enabled.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/include/linux/kasan-enabled.h b/include/linux/kasan-enabled.h index 32f2d19f599f..b5857e15ef14 100644 --- a/include/linux/kasan-enabled.h +++ b/include/linux/kasan-enabled.h @@ -8,30 +8,21 @@ extern bool kasan_arg_disabled; =20 DECLARE_STATIC_KEY_FALSE(kasan_flag_enabled); =20 -#ifdef CONFIG_KASAN_HW_TAGS - static __always_inline bool kasan_enabled(void) { return static_branch_likely(&kasan_flag_enabled); } =20 +#ifdef CONFIG_KASAN_HW_TAGS static inline bool kasan_hw_tags_enabled(void) { return kasan_enabled(); } - #else /* CONFIG_KASAN_HW_TAGS */ - -static inline bool kasan_enabled(void) -{ - return IS_ENABLED(CONFIG_KASAN); -} - static inline bool kasan_hw_tags_enabled(void) { return false; } - #endif /* CONFIG_KASAN_HW_TAGS */ =20 #endif /* LINUX_KASAN_ENABLED_H */ --=20 2.41.0