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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2FE77C7115C for ; Wed, 25 Jun 2025 09:53:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C34306B00B3; Wed, 25 Jun 2025 05:53:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BE3946B00B4; Wed, 25 Jun 2025 05:53:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AB2956B00B5; Wed, 25 Jun 2025 05:53:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 978486B00B3 for ; Wed, 25 Jun 2025 05:53:01 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 171CF1A1AD5 for ; Wed, 25 Jun 2025 09:53:01 +0000 (UTC) X-FDA: 83593459362.04.A22ADF0 Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) by imf15.hostedemail.com (Postfix) with ESMTP id 1757DA0004 for ; Wed, 25 Jun 2025 09:52:58 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=FrcDSrGL; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf15.hostedemail.com: domain of snovitoll@gmail.com designates 209.85.208.175 as permitted sender) smtp.mailfrom=snovitoll@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750845179; a=rsa-sha256; cv=none; b=mhHsHJ2PyjCASbbAVpq6dLqNaM80hlIWUoVYaqKwYYMod6LFdGSzUphyWSN/6zxgQx3ixd pYBWTTVtd9eR9gAMmx6TIfQeJ0VhSBurebw4dntP9fb1gzQXhMBFVsPsXM+vZnEo0bDX7S aYEFVqDUWUtxs3IZE0D/JiCTRP1rS84= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=FrcDSrGL; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf15.hostedemail.com: domain of snovitoll@gmail.com designates 209.85.208.175 as permitted sender) smtp.mailfrom=snovitoll@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750845179; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=spnPWYrTCugBtv3C0I1/Y7oTbF6XlJIePRXoFmRkZ78=; b=C0fLwW7/vJC8Lwhp4VaNWPEU4tcjNT9xcCNizaZJ1NGNLm17+VHPq8pHVixKn8K23/CTHW 8m8ExSkCwJQN8v6b9CMr/y7Lip9t16fSWZrrLvTKoMrFi/TlOwKxAlje8HJt6aRqezmC5E EawyziKpB8hmdNp61w1VFYiWd+LeNuc= Received: by mail-lj1-f175.google.com with SMTP id 38308e7fff4ca-3105ef2a071so76650901fa.1 for ; Wed, 25 Jun 2025 02:52:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750845177; x=1751449977; darn=kvack.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=spnPWYrTCugBtv3C0I1/Y7oTbF6XlJIePRXoFmRkZ78=; b=FrcDSrGLuVGaBuOM2bMQSQQ17Nc04vm7XCciftASl+qCBaEmLvewDYy9ih11nGo5cs fZ6jkBAokepUFBdCnHUic+d8hXssOAIroBpUUErOUbtA3TR5tuVF3SRoYDWwqdOLayUf aoz8G+UqI6CpPS7bvLYodtblmXKuZSFwzrqFinrGvlRs6VvJkfivMEP81sOpqZQy5yoc 8g7QVOIUBfDM83k0LILIWfEVzIfjqoIs4wk+iQh8yCUU+SL4hoSxgLW92wAmpVzFa6IR dIPFzPdyg3Et+bB47DPVi0ZqbJFyt7Wce0bh1dmEEfNv8Dy0iUU/pHvUvxafkzn6hHCy pvfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750845177; x=1751449977; 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=spnPWYrTCugBtv3C0I1/Y7oTbF6XlJIePRXoFmRkZ78=; b=Dr9y/WM7lS2H9pV4miw0fmS96gu8dqAsr7OjOXnpEdR4U3vZ1Tcnyn5+h/yvBCtlDW Z+IojcQUyHOtnnXS22FiF7QPIPatqXQ3bCj1eMomNagYDnwzuRbeQwZVaVP9Up1a1mHQ ij2rQ4G9Us9qgWfujEus7Gxh6b9q6uut3UNt5pEEvYPsDcC0YW3NEhzBuehiuQ8G8jPL MXt3zkPg99Ll00hcq1KeQ72nTJD/8nU4B5zr2r4Txnb9Wh0JBRli9GgBAMfjIbj/+0yp uhTKCKiHmTw+whLxOgioEzeqj0vDuv2RWboPigiZ+MASJRbzeSSUbJuceYOHLxvPNZKs z2Pg== X-Forwarded-Encrypted: i=1; AJvYcCVjO4C0cNkd/x5+witkxovRUmcuCmoYTogaz0wZsPlZR9Hc8de7HFQBDQfS6MUiki+zL/jCGAWo2w==@kvack.org X-Gm-Message-State: AOJu0Yys6Jq7NO+yFkpfIrdHF/tvCtMO2WvHrmrmuH0f4QFq3TQkLj6C pS3GoPib8JZqwnGSfURWbolDx6qY3e0WSVmLfAjJdeJrunp4hMMlamPe X-Gm-Gg: ASbGncv3eBEhDqcEYOCdOOUD0J5tJrLla0xKDoJle3pxWdnQY6uZT1Mgyt/d7cDADTk 7ML/Lny3LzMTmPpA0+4T8aD1FTXcPKyvVZA6fwYPCUD35wL7udjdwtn1z8E2cbi8ZCS/RTt/vKv Fhj89R5m8+vDwdCXJvpIMkcswzr7cAkgKJOD93wxUjGP9bWPgXDDmyfR8ua2Htv1y5MAVK5LQ5Y 3T7hWMYmLVhAAdQniMTLl2OrkM7OGnFr9ttXFVOPGHgSx29taiG3BKe80dTYl352qqZ3aSw/inN jN8rndvcLdwZIwaRf3I8X4+4Z28kv3enKtWKovvveLBZM4qkSWUuTMvt74Mdv0Ooc1NbdeHrP3r BFR3GFhKTM84+T4lDVIWqeo0T4vOD/w== X-Google-Smtp-Source: AGHT+IF6eiwi1xoALYtMAE1ncL4ibtGAQqo+HifrEVfcQXGb5lhuCkRcCK0fus3Knli+XAnux0nRaA== X-Received: by 2002:a2e:7806:0:b0:32c:a709:80ee with SMTP id 38308e7fff4ca-32cc6582a2emr4097091fa.39.1750845177105; Wed, 25 Jun 2025 02:52:57 -0700 (PDT) Received: from localhost.localdomain (2.135.54.165.dynamic.telecom.kz. [2.135.54.165]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-32b980a36c0sm19311851fa.62.2025.06.25.02.52.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jun 2025 02:52:56 -0700 (PDT) From: Sabyrzhan Tasbolatov To: ryabinin.a.a@gmail.com, glider@google.com, andreyknvl@gmail.com, dvyukov@google.com, vincenzo.frascino@arm.com, catalin.marinas@arm.com, will@kernel.org, chenhuacai@kernel.org, kernel@xen0n.name, maddy@linux.ibm.com, mpe@ellerman.id.au, npiggin@gmail.com, christophe.leroy@csgroup.eu, hca@linux.ibm.com, gor@linux.ibm.com, agordeev@linux.ibm.com, borntraeger@linux.ibm.com, svens@linux.ibm.com, richard@nod.at, anton.ivanov@cambridgegreys.com, johannes@sipsolutions.net, dave.hansen@linux.intel.com, luto@kernel.org, peterz@infradead.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, hpa@zytor.com, chris@zankel.net, jcmvbkbc@gmail.com, akpm@linux-foundation.org Cc: guoweikang.kernel@gmail.com, geert@linux-m68k.org, rppt@kernel.org, tiwei.btw@antgroup.com, richard.weiyang@gmail.com, benjamin.berg@intel.com, kevin.brodsky@arm.com, kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, loongarch@lists.linux.dev, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, linux-um@lists.infradead.org, linux-mm@kvack.org, snovitoll@gmail.com Subject: [PATCH 2/9] kasan: replace kasan_arch_is_ready with kasan_enabled Date: Wed, 25 Jun 2025 14:52:17 +0500 Message-Id: <20250625095224.118679-3-snovitoll@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250625095224.118679-1-snovitoll@gmail.com> References: <20250625095224.118679-1-snovitoll@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: 1757DA0004 X-Rspamd-Server: rspam10 X-Stat-Signature: tzzhxf1gt7md3yt6jj4ty1briwhnr373 X-HE-Tag: 1750845178-425858 X-HE-Meta: U2FsdGVkX18WEj1nxgqpXiiFqAL7yF6hWIYwEfo1TqJS9EAxkzKMjbg5nN0O33jFsBribOOkDnGNpU/KzqQxA4LNdakYjF3IngBlyfJF9KVHXLOdv7rr7YZxZIQeItzX9ZwBucy4DwVbGepz8NIHOwDGt7UO6H/L8q5/Y6tJqMWvWgISOiKHbxGTkEY+DYkLmjH+g8Ts9VQMuA1yKc5q+6QKDrLEUzmfeNikIFfa95YtxX5/XdPn1e4Pj7jhU9i6ynLapHPM+ffjArRecrFJsqwHvEr+25Zh/AEVnmwpVpvB21dmbDiFSXvk+so6VkMa4j4pCUrL/M3urtHdsf8m/bCoRJvstygrlFrr+fntcdFV5EEIemBLanphZKAL3N8IKw3Yw85aotHBI+a9OWBnt6Tli68gYGAD71z9egw32CDVBgMZ6/E0u4dqAhX8ITX9lPCsej/JE+LsdfeyHr0G1tKy60p/msaYl+mya5KaxQSTJfp5YLnIMGqE+4+zIv+JXpNXZVQ2zJ6SDplr05Ts1ydbbbXHFAK4eJMzIw8sHx5Uzq0seNL6asmFp62kYCq1P86g5+PUHocKgy4gzb2sArWXijXoYb//ZGyfiowFKXaXbmkij3i1UxTUhecmjBnVKbCaKdxnvQkUk0+HPb3tTvsH/zqc2BXwLy0/QnKqgMqM3ruxr5JesKds/HFjzbxmnMa9Sebjjf8RPBO4F2gsIEbmFim6WKVgLUCOHpLpuhIufVyQFs368cPZavXxf8PDJyzkk7UIas/zSzHPn94t2eWx77nJsF371WgyL2/oSBoci6eCUE3TJYo+Z4xezE439MsAMuj0GzNQS9IhYUiXMXkYK5TxhrI23HliOI1tjgWDnpyE+UOeVU8ybBiL9PT45bFT3uLtNMifWtJo1h8b/APQp9IeWfHiGd+zCDLwKoHwEZeJhFv0cT1b5r1G4ywSmJj8y6M144GDSOAAxCn VTU0gluf uumd8KcFmgBS0QAcpmxe4e0LMgUubRo6/dIEkUHGk9dbLVve1Ve9uyO1p5gKp0ZA5l5BZ0Pzswj0Mbl+1IHUjOshWdMQXIshr0B+0AmZgW++OG850Y+5i5/vPMCiplhrrik/WGhkaCShtasdLsypZytrLPlo/cPRV33fp7cKLQ71sF6eATdyTiH5aCMiUeGXshMlMpAjunCjfSLJNh/ZcCVrmubCv4MQoWm5lP89m4sSuk5nBdDqNd+Z7147reQ8XLXrpWeGLFkUh82cnxBGZ+bLCpjFJmaGznFn2uEhD7EVonA3oYJVnWiMMxWHSctfch8wYJq6ACavXgyOiGVxGFqD505oRNFYmMT2PEpKWrtySSOWF8N1F/yceiulf4SoGnc7w0nnRks1FkoVTrEYIS/FHz4AQmcmtB8q41YITJmVJF+6USLiDrQ/IhPLz6bEEw0uvQzo3ZooKc1gGj5eCruM4X2dpgfHf2gY3Vyy7HMT5vaLSYu5Aezrm0wJZJeDXFxWoAR6LaTT1cdas18s/XOL1nV4TFvKQ/TfPH5eSiTENO0Y= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Replace the existing kasan_arch_is_ready() calls with kasan_enabled(). Drop checks where the caller is already under kasan_enabled() condition. Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218315 Signed-off-by: Sabyrzhan Tasbolatov --- mm/kasan/common.c | 8 ++++---- mm/kasan/generic.c | 6 +++--- mm/kasan/kasan.h | 6 ------ mm/kasan/shadow.c | 15 +++------------ 4 files changed, 10 insertions(+), 25 deletions(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 525194da25f..0f3648335a6 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -257,7 +257,7 @@ static inline void poison_slab_object(struct kmem_cache *cache, void *object, bool __kasan_slab_pre_free(struct kmem_cache *cache, void *object, unsigned long ip) { - if (!kasan_arch_is_ready() || is_kfence_address(object)) + if (!kasan_enabled() || is_kfence_address(object)) return false; return check_slab_allocation(cache, object, ip); } @@ -265,7 +265,7 @@ bool __kasan_slab_pre_free(struct kmem_cache *cache, void *object, bool __kasan_slab_free(struct kmem_cache *cache, void *object, bool init, bool still_accessible) { - if (!kasan_arch_is_ready() || is_kfence_address(object)) + if (!kasan_enabled() || is_kfence_address(object)) return false; poison_slab_object(cache, object, init, still_accessible); @@ -289,7 +289,7 @@ bool __kasan_slab_free(struct kmem_cache *cache, void *object, bool init, static inline bool check_page_allocation(void *ptr, unsigned long ip) { - if (!kasan_arch_is_ready()) + if (!kasan_enabled()) return false; if (ptr != page_address(virt_to_head_page(ptr))) { @@ -518,7 +518,7 @@ bool __kasan_mempool_poison_object(void *ptr, unsigned long ip) return true; } - if (is_kfence_address(ptr) || !kasan_arch_is_ready()) + if (is_kfence_address(ptr) || !kasan_enabled()) return true; slab = folio_slab(folio); diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c index ab9ab30caf4..af2f2077a45 100644 --- a/mm/kasan/generic.c +++ b/mm/kasan/generic.c @@ -176,7 +176,7 @@ static __always_inline bool check_region_inline(const void *addr, size_t size, bool write, unsigned long ret_ip) { - if (!kasan_arch_is_ready()) + if (!kasan_enabled()) return true; if (unlikely(size == 0)) @@ -204,7 +204,7 @@ bool kasan_byte_accessible(const void *addr) { s8 shadow_byte; - if (!kasan_arch_is_ready()) + if (!kasan_enabled()) return true; shadow_byte = READ_ONCE(*(s8 *)kasan_mem_to_shadow(addr)); @@ -506,7 +506,7 @@ static void release_alloc_meta(struct kasan_alloc_meta *meta) static void release_free_meta(const void *object, struct kasan_free_meta *meta) { - if (!kasan_arch_is_ready()) + if (!kasan_enabled()) return; /* Check if free meta is valid. */ diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 129178be5e6..e0ffc16495d 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -544,12 +544,6 @@ static inline void kasan_poison_last_granule(const void *address, size_t size) { #endif /* CONFIG_KASAN_GENERIC */ -#ifndef kasan_arch_is_ready -static inline bool kasan_arch_is_ready(void) { return true; } -#elif !defined(CONFIG_KASAN_GENERIC) || !defined(CONFIG_KASAN_OUTLINE) -#error kasan_arch_is_ready only works in KASAN generic outline mode! -#endif - #if IS_ENABLED(CONFIG_KASAN_KUNIT_TEST) void kasan_kunit_test_suite_start(void); diff --git a/mm/kasan/shadow.c b/mm/kasan/shadow.c index d2c70cd2afb..9db8548ccb4 100644 --- a/mm/kasan/shadow.c +++ b/mm/kasan/shadow.c @@ -125,7 +125,7 @@ void kasan_poison(const void *addr, size_t size, u8 value, bool init) { void *shadow_start, *shadow_end; - if (!kasan_arch_is_ready()) + if (!kasan_enabled()) return; /* @@ -150,9 +150,6 @@ EXPORT_SYMBOL_GPL(kasan_poison); #ifdef CONFIG_KASAN_GENERIC void kasan_poison_last_granule(const void *addr, size_t size) { - if (!kasan_arch_is_ready()) - return; - if (size & KASAN_GRANULE_MASK) { u8 *shadow = (u8 *)kasan_mem_to_shadow(addr + size); *shadow = size & KASAN_GRANULE_MASK; @@ -390,7 +387,7 @@ int kasan_populate_vmalloc(unsigned long addr, unsigned long size) unsigned long shadow_start, shadow_end; int ret; - if (!kasan_arch_is_ready()) + if (!kasan_enabled()) return 0; if (!is_vmalloc_or_module_addr((void *)addr)) @@ -560,7 +557,7 @@ void kasan_release_vmalloc(unsigned long start, unsigned long end, unsigned long region_start, region_end; unsigned long size; - if (!kasan_arch_is_ready()) + if (!kasan_enabled()) return; region_start = ALIGN(start, KASAN_MEMORY_PER_SHADOW_PAGE); @@ -611,9 +608,6 @@ void *__kasan_unpoison_vmalloc(const void *start, unsigned long size, * with setting memory tags, so the KASAN_VMALLOC_INIT flag is ignored. */ - if (!kasan_arch_is_ready()) - return (void *)start; - if (!is_vmalloc_or_module_addr(start)) return (void *)start; @@ -636,9 +630,6 @@ void *__kasan_unpoison_vmalloc(const void *start, unsigned long size, */ void __kasan_poison_vmalloc(const void *start, unsigned long size) { - if (!kasan_arch_is_ready()) - return; - if (!is_vmalloc_or_module_addr(start)) return; -- 2.34.1