From nobody Mon Dec 1 22:04:02 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 CC5CC2737EE for ; Fri, 28 Nov 2025 03:33:50 +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=1764300832; cv=none; b=np1LzvFZ0qF/C2L+UFVFtemYx3pX3QcUyyVv584J0LPIDxCrEcomxAoJO9LIePewnEQJsNKzVGYc6VU6UUxZn0rL9OoJRmxLfwASCr9ecfLN1ye/j9I2GrE71C1gGG9K38gCB35M1jpbJLeDUEDPmcGC60ctGs5EeTuvJ5Wx6wA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764300832; c=relaxed/simple; bh=g8aA0z89EvC3fOUDLEZk6U9+/+xzlvUEZF9yhIieeeM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-type; b=Udsqi+YuX5eYefCkJ4LYc1nmZ6IsmAf5aeAGwQIt0c+49F7UQSmigMMYcXMszqzgFzI6eqrW1MC+4xeDv3RvASQvLb+72Sh7rdWTGSMBoipuIGhv6pQaTo5v3Hclclx07U0m2MxiXWyX4AHJp7fmnnWVdiqxQK/1RCaDNqiLktk= 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=Skgr8bCv; 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="Skgr8bCv" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764300829; 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=UdCEhX0QnAccjf1ifoDBiGeeToccBUA00HLj78ygtME=; b=Skgr8bCvUlk4LrJxBuqj0vaZiRdFadGtwZCRS6qOLtAoKoWBWM1qCxTUE49hmEJm/yIem1 m9QjchoLvYNaxBV7loHOj814LxeCkWV+dSGv6KepSF4JGjjRHORFbqzYClMCnCZg+jdrr4 zitu7YoK+yguy9R47flO+ilcvL4HNno= 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-561-UOimTxoJOkekNTmxQjBXig-1; Thu, 27 Nov 2025 22:33:46 -0500 X-MC-Unique: UOimTxoJOkekNTmxQjBXig-1 X-Mimecast-MFC-AGG-ID: UOimTxoJOkekNTmxQjBXig_1764300824 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 AE5031956095; Fri, 28 Nov 2025 03:33:43 +0000 (UTC) Received: from MiWiFi-R3L-srv.redhat.com (unknown [10.72.112.7]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 003BC19560B7; Fri, 28 Nov 2025 03:33:34 +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, elver@google.com, sj@kernel.org, lorenzo.stoakes@oracle.com, snovitoll@gmail.com, christophe.leroy@csgroup.eu, Baoquan He Subject: [PATCH v4 01/12] mm/kasan: add conditional checks in functions to return directly if kasan is disabled Date: Fri, 28 Nov 2025 11:33:09 +0800 Message-ID: <20251128033320.1349620-2-bhe@redhat.com> In-Reply-To: <20251128033320.1349620-1-bhe@redhat.com> References: <20251128033320.1349620-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.12 Content-Type: text/plain; charset="utf-8" The current codes only 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 three kasan modes. Signed-off-by: Baoquan He --- mm/kasan/generic.c | 17 +++++++++++++++-- mm/kasan/init.c | 6 ++++++ mm/kasan/quarantine.c | 3 +++ mm/kasan/report.c | 4 +++- mm/kasan/shadow.c | 11 ++++++++++- mm/kasan/sw_tags.c | 3 +++ 6 files changed, 40 insertions(+), 4 deletions(-) diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c index 2b8e73f5f6a7..aff822aa2bd6 100644 --- a/mm/kasan/generic.c +++ b/mm/kasan/generic.c @@ -214,12 +214,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 @@ -239,6 +240,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]); } @@ -369,6 +373,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 @@ -518,6 +525,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 @@ -543,6 +553,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 f084e7a5df1e..c78d77ed47bc 100644 --- a/mm/kasan/init.c +++ b/mm/kasan/init.c @@ -447,6 +447,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 @@ -482,6 +485,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/report.c b/mm/kasan/report.c index 62c01b4527eb..884357fa74ed 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c @@ -576,7 +576,9 @@ bool kasan_report(const void *addr, size_t size, bool i= s_write, unsigned long irq_flags; struct kasan_report_info info; =20 - if (unlikely(report_suppressed_sw()) || unlikely(!report_enabled())) { + if (unlikely(report_suppressed_sw()) || + unlikely(!report_enabled()) || + !kasan_enabled()) { ret =3D false; goto out; } diff --git a/mm/kasan/shadow.c b/mm/kasan/shadow.c index 29a751a8a08d..f73a691421de 100644 --- a/mm/kasan/shadow.c +++ b/mm/kasan/shadow.c @@ -164,6 +164,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 +279,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; } @@ -658,6 +661,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; @@ -694,6 +700,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 c75741a74602..6c1caec4261a 100644 --- a/mm/kasan/sw_tags.c +++ b/mm/kasan/sw_tags.c @@ -79,6 +79,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