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 89A8CC7EE32 for ; Thu, 26 Jun 2025 15:33:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 29C356B007B; Thu, 26 Jun 2025 11:33:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 226556B0089; Thu, 26 Jun 2025 11:33:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0C6D96B0095; Thu, 26 Jun 2025 11:33:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id E78D86B007B for ; Thu, 26 Jun 2025 11:33:23 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id B74961A02A2 for ; Thu, 26 Jun 2025 15:33:23 +0000 (UTC) X-FDA: 83597945886.09.8FB02F3 Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) by imf23.hostedemail.com (Postfix) with ESMTP id AE932140012 for ; Thu, 26 Jun 2025 15:33:21 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=AeEaJDPF; spf=pass (imf23.hostedemail.com: domain of snovitoll@gmail.com designates 209.85.208.171 as permitted sender) smtp.mailfrom=snovitoll@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750952001; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=+pDrLO6USAZl/TGsifgnkWPVKgGBnMCumXxL7y5KwTQ=; b=NnHRB2gZqUT9EXJrAWRYUoaP6uPWxaftwNkUIOkW4lf/96MIhZz42Sx/AKgBouUtyVQ1gC DaacDjGm6pPuQIbMUbpnTqBy9NqxRUw8qCQCXYudlLPlUJd6jlRs7nA7tJC+FzgNKhQVWQ REi9vQ4FgZE4rPwP+gkOOCExW76KqWE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750952001; a=rsa-sha256; cv=none; b=D8Lk7VRqyNEoLnzzkOh7pSS2uIscOmrrNt8Rl6L17ZKm4GKpc1vqbdBlHKJTa/LLKrf+Qe pvwHe2vC7kXGv9yTLD0G5O6o+LlTfiG7jLlftGYPkFptWYPOXqUaFPcA7oq3WU5kcbVr+u FlhGfBx71qIS7l6xEjX800M1TNhoMNE= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=AeEaJDPF; spf=pass (imf23.hostedemail.com: domain of snovitoll@gmail.com designates 209.85.208.171 as permitted sender) smtp.mailfrom=snovitoll@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-lj1-f171.google.com with SMTP id 38308e7fff4ca-32aabfd3813so9776731fa.3 for ; Thu, 26 Jun 2025 08:33:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750952000; x=1751556800; 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=+pDrLO6USAZl/TGsifgnkWPVKgGBnMCumXxL7y5KwTQ=; b=AeEaJDPFTGH7gs01xM/RWnpSEMxrrr4sG9fCiwpa4R5jl1WoWgPAG/+R1Mzfe/UhDK 2D+14KhJTzTIlxyeHtL3naZ/5WnqNBO8iu9V5lqjyHDhC0cUoVRCUMhVz+SL8Zsfm80g SfXWFLUYZJj9Zhtjj/wZwnr+38WOP9xJnTMUvbTdttQUTi+Ay1kWc7Ga8c/0s4pcCtTW RuKjnj+xH93BA0AYwDvhlT7l7oYm6cEz4M8N64Qc9qnonOcw+R6+jM587yUMFDak8dBy atgTHZOhypXwmAJW/ce7IYT6HMlq7v4pKB1iBOgRsnlSC2iAR8tUmis0d1LIAI3QN8j/ LMvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750952000; x=1751556800; 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=+pDrLO6USAZl/TGsifgnkWPVKgGBnMCumXxL7y5KwTQ=; b=YBD5Bs62wZJ8Km3v3UrqBsm+CtEgPoxhQEcomQWJerphH1pSu9nnr2wDR4t+JctZK/ kC1mFrm61szF8pkq195oE2tCLRQCpbRon5aovXmaxMRx8cVSm8yDTJIDDH+QxVlnmJwv /pWcaVKF8snH2pFsM9L1TXCBkpnR/VaZtsnuNtlzBZo/PxXxI5wN5klLn67PppjYeVaV BxUnd09D9t/eEmrvBsdF+h3nAegyKKMCvDH3wqCIjrhczPZ7UAQTA4Q9kbXl7/OTN2tj 8cBYwpXpwtJoEjIGfGczyNz67i/x61HzciB2tN0OcsuOgSVFNYxvYW+1TvEpFqOYltjd z06Q== X-Forwarded-Encrypted: i=1; AJvYcCXbJhoYJ/FcplKlLVyF3PDTO0xypmj8NP0ovBnEN/rAUJJxF9eRDWtJnVyfMvIjy7Md3IQDVa3bRg==@kvack.org X-Gm-Message-State: AOJu0Yy4XfP9u63M8I2N+pJ+7evagK5b20PoF8C+ddmMl8AR025VrGwj lZ9QWKEmwPnLh+ua71kOTNZwgiXJV4sOOTi7rzd3VpEpaMTEPpxao6FQ X-Gm-Gg: ASbGncuxOC/iww3nWGbqvFE2ZioG7UZxftbHX9IhZh4wBvuOypKQPpBSTWSM/xhGvQG 52AaoV6AQKWsg7NFC4WdDBHo5IiV9NQhUFhYpYZteAUHQEArwncq6p0UJIGnI0jFLcD+eLoa1Gp w3MGuk+DdqVYGon+If1yVbNuKd4AnRrV3WcsJsvlyrfuV1Q/4aO2bUN/ax2/P2Z0xmlDcvmUHAw PzeJ12/ZeTWRIwgOEtRgsez/ASU07qi/D/hi/NutbeHajqm4sChfPfGOYAm8UGhrh/8z486Fdgn jXFZywvs70iRpRl5F3YDlrzV7zvVKEST1lFJvBbS90jdAX8y50aUq1kYcO8vKpFyDP+Tozh8uLJ YwHIxAuZUgVCTxgzTw3o6goK1SeBTWA== X-Google-Smtp-Source: AGHT+IGY311+Wdu3kb/XvX91pk/iQewvyeMEbYN3t0cf6Gst1F46Nt/0GHv4Ja5q8VZUcn9wuGuFjg== X-Received: by 2002:a05:6512:12c2:b0:553:28f1:66ec with SMTP id 2adb3069b0e04-554fdd47009mr2940330e87.31.1750951999683; Thu, 26 Jun 2025 08:33:19 -0700 (PDT) Received: from localhost.localdomain (2.135.54.165.dynamic.telecom.kz. [2.135.54.165]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5550b2ce1fasm42792e87.174.2025.06.26.08.33.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jun 2025 08:33:18 -0700 (PDT) From: Sabyrzhan Tasbolatov To: ryabinin.a.a@gmail.com, glider@google.com, andreyknvl@gmail.com, dvyukov@google.com, vincenzo.frascino@arm.com, linux@armlinux.org.uk, 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, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, alex@ghiti.fr, 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, nathan@kernel.org, nick.desaulniers+lkml@gmail.com, morbo@google.com, justinstitt@google.com Cc: arnd@arndb.de, rppt@kernel.org, geert@linux-m68k.org, mcgrof@kernel.org, guoweikang.kernel@gmail.com, tiwei.btw@antgroup.com, kevin.brodsky@arm.com, benjamin.berg@intel.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-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-um@lists.infradead.org, linux-mm@kvack.org, llvm@lists.linux.dev, snovitoll@gmail.com Subject: [PATCH v2 11/11] kasan: replace kasan_arch_is_ready with kasan_enabled Date: Thu, 26 Jun 2025 20:31:47 +0500 Message-Id: <20250626153147.145312-12-snovitoll@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250626153147.145312-1-snovitoll@gmail.com> References: <20250626153147.145312-1-snovitoll@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: AE932140012 X-Stat-Signature: stamo6s3m7gscgchiiosuforcy6cmr91 X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1750952001-479657 X-HE-Meta: U2FsdGVkX1/EShx4A+wqIU46Fqqji4k7F8Te/5WqKThvSI76WqYva7SHNjfaC2M1mUH5YTSHRQfgdGQDepw++MgrlnFFL8iDKaXyeqfWdl3Bb0WoaheeR1uoUmW927L90jO8Ya2ePbymChNk6aF19zn9LAgzNVnPBWCqx3GNgaq9eDeAi167c+0odWSttG03kvNOOGfXzijpa7a8VgI97JmlFtuSvrszK6JtiPBqduMA9IwEC6AoJiQqMckhUtueQL66+z6es5FpPNbTCbZGl4R1aaOY6GkrAbLiTss/ngb7L5cId9B6XCMG2koDpjOUVaiJJrkgAtQ6qj1IaVvHxcy0lTD5Zmi/tbkszpQ6FkRLggr44D8LetcP+889FJwbEdMeFnt0DoOJSRWbp6SoCprQTbg/qC3WffM0IBEItZVQ18+G6j885AAMgoA8L3TNOurURI+2Vd43G0/CEa8SZ0GoSTG7d6B4Aw4f3FsJmO1BfbvDQuexzcY2B+MBwr4VDbWkIyPcSSPKNf+RAG1LZsOkdx1OjEFmhWHJhhSfBUn3unZ6UewlMqGWVc0SC0q9pErhQMkDoUSVQXroZk8ABnv3URJN9QipHh8Ui8ORVo+MA2ekArX+5kgFcXE875wRYt19pj0suOsXl2EpOicvcGKwImoojpgZumzf8GiPGOTzrTxsqiyDyIYdijOfnx96LrpG55bTUw9gS/aWa7BH/mQdxwAw9uUDhBI8gcT2g59d5ulD9/gt+N04dg0iZ6IqKxn5RmsTj6T8PZ48w1PX8dKuQ5jSjAXZPeFEAvAw25osNuTNUO1PT9vzDWpqT4mba8JPP5FlLi0hG9UCKAFFEQaa+9oJnfpV3ET/iXMwY2e1yYqyKGvwwOJMArr6S/gJFqGh5THaoCMngQmgqZ1JlEbnX2sip0gfbjtqaKXlhZZbRJT6KhqBfnYh+RaogdkeHusj6DdhxECco3iyVzg tPV130FC 4UPvNWxHB4CIzg3gjF/zPAU6E7IxSrV0a0IxsMf1u54YcyY3E63FkGJP8sgnhvmmGt3cIFqr4TEFCe6FGEIy63cHzTAIuwOTGaLRydRhfW9d8DD12qL0yvVzN0cww0pOJ1xzftY1PUkGWkiD2EZgfFhI26hhiaDdhgm2VZCcWSzHN0u3jUmHtA59cNP08XtLyCz5h4jLWcef/4+U8iTXiv84Ixi1yxYoI5wqnaMXAaXGQ9dceVqnhbAPgIG7M56fWrK2mZyOzvO+H0EWIWJ/fAdqO+vPSSefupQmBiEAAGVEP9/CmurU2OBrboikNhZPyLtn1I9o2gKl6rdmLnOlh2twiA8ZOJoQxnVwF3MebEO48D+GrD4os9oC9xRoRc7s5Cc/2ep2pqWj8QrtauyHA1sekp7pktRqawlx6K93Ruzxjq5WmZZaMpN1onG9kNl+keIntIiwWUGmm0F7y1T+Qvjv1cWgGr5V7/OfBF4gagqlPdKz6Ex9nPF9S1bzTRiSe/N6W6awxnYfR54sFqhYRWyjVoHGGVtsTR3ivwurTo+LmQBeVc47OdQWILXyE8NMGrdE3IAC5W3X03XPsg/ttr4gSPh0tG7Ei3vjvJchS37kT3ZK5E0B+wxJQ1A+YZy5QzW0w 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 --- include/linux/kasan-enabled.h | 20 ++++++++++++-------- mm/kasan/common.c | 8 ++++---- mm/kasan/generic.c | 6 +++--- mm/kasan/kasan.h | 6 ------ mm/kasan/shadow.c | 15 +++------------ 5 files changed, 22 insertions(+), 33 deletions(-) diff --git a/include/linux/kasan-enabled.h b/include/linux/kasan-enabled.h index 2b1351c30c6..2436eb45cfe 100644 --- a/include/linux/kasan-enabled.h +++ b/include/linux/kasan-enabled.h @@ -5,32 +5,36 @@ #include #ifdef CONFIG_KASAN + /* * Global runtime flag. Starts ‘false’; switched to ‘true’ by * the appropriate kasan_init_*() once KASAN is fully initialized. */ DECLARE_STATIC_KEY_FALSE(kasan_flag_enabled); -#endif - -#ifdef CONFIG_KASAN_HW_TAGS static __always_inline bool kasan_enabled(void) { return static_branch_likely(&kasan_flag_enabled); } -static inline bool kasan_hw_tags_enabled(void) +#else /* !CONFIG_KASAN */ + +static __always_inline bool kasan_enabled(void) { - return kasan_enabled(); + return false; } -#else /* CONFIG_KASAN_HW_TAGS */ +#endif /* CONFIG_KASAN */ + +#ifdef CONFIG_KASAN_HW_TAGS -static inline bool kasan_enabled(void) +static inline bool kasan_hw_tags_enabled(void) { - return IS_ENABLED(CONFIG_KASAN); + return kasan_enabled(); } +#else /* !CONFIG_KASAN_HW_TAGS */ + static inline bool kasan_hw_tags_enabled(void) { return false; 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