From nobody Wed Oct 8 18:16:57 2025 Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 68190285C97; Wed, 25 Jun 2025 09:52:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750845175; cv=none; b=D7cx/3dUV7EIAIuK1bhBLUO2acc7GMxepsXUwbgBXP06zfbcooKW9i1qngQqfFBmHtnQFcWC+LTJ/wuz8eOLxtvXD3CbK/YNs2g1mbQ23EOt7bzoefCbep9s7rmBdwr17NASLAN6lLCd00y3yLkqghZGhK1/iUrxzeT1LcZEAZc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750845175; c=relaxed/simple; bh=K343I3qAoPHAanfNFChAhUARVvZ/YL0WcDDqgni6Tx4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=hvcA5BOizHUmnh6SyF9GXboNdilT6khFdQWr+5D9kyfwL6UgH9oxoWgPnkZXC7Nbb9kdsXFjHm/1RyboSkpIsspAMKzrbFxlCNYfORlVO24d6O8XNnfcjt25YP77Euzn4Zq2HAgoeBjqL3Ty/cT/AZ+K/ODEyu1VD8Xp3RtZh2o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=HjJF0ydA; arc=none smtp.client-ip=209.85.208.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HjJF0ydA" Received: by mail-lj1-f175.google.com with SMTP id 38308e7fff4ca-32b3b250621so12816931fa.2; Wed, 25 Jun 2025 02:52:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750845171; x=1751449971; darn=vger.kernel.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=U6SFM5Ezspiku172UK6Utmx+P9PfAPP964pKgViV7lo=; b=HjJF0ydANy4dabES77+FV+cu2Re5FdQIHwd8CaP3X7cGW44ZcGchdjBdAOi9oiquZG rszgRHSsi8wOZWhVgjXbBFxCjOpWcbTNjk3eutQOFFwozaCpXgT4GTSS8bc038IgN2lD 6FjmHlwUwsCX3G7J1z6IClgxCldam52TY7Q/tsRNK7rBmjhzDtHHuxiU1GCqIPG+WmvG jx6EgFiQeymSpqEq0/Vcu0gOZX2IqQfc+seJtcz2CKvOzR+0wHmbQFE3EYPMGlgifDta Nh7Rj7eW14tQhjUKY/be5veQKrHI2OYbdFaHXt7piHnuJyKpa0NE+yzAj05bHXEwh2ck GHTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750845171; x=1751449971; 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=U6SFM5Ezspiku172UK6Utmx+P9PfAPP964pKgViV7lo=; b=ty/oMxfF5sqehbo1HMlWkxh9w7OSbYwRzN0LYz1789yFG6TS6xBFxKxRT0RySzHpLz ip+AGTFl5rz3ixM1BFZTaEmby7HJ5DaJK3UO6cmw1VzE9Qa06uVi+p6zT0Odp/tiGiFa LdwXY3E7yHuSEZ6vu1+DS0kkySbo/f/zRrgDb9ekUlOYGP27Uk+5DikpiI+ocwhlNcNf fC9U4tOaNO2wU3ADcZkRcMZI2H1I/oL/xIEIuRzmW28N1v6yXBbnrVb5krdlWdTovtKg +y+pEhMEN2tB9xieVijjMwtSQBe2m6HWK+bBhqbxwFVBHM2U/AN945Misphbi4m3UxiL HvSw== X-Forwarded-Encrypted: i=1; AJvYcCURwI/eFBYSZKptNb49yxLoL5dZe/QU3OUnyD7+VptVisxmy8IKwGto44sdQ3TVe57ttb7YlNk/CGJrDg==@vger.kernel.org, AJvYcCV01QMBRSuf/iR4Udn98xiKYzj+kkas9Kb0++biiUITy9DMmmDtB7TB9ihMvmrKI3ZTR/TxkFBPnO6XXC8=@vger.kernel.org X-Gm-Message-State: AOJu0Ywi4QgV2FeQnmSFcWMy5v+igTVKcY0c7VYjIkrbL3/ko2dXjKfu r9a9se9hqyV+viAueWe4h9wjxUsgPCY3Q96GDFoUT2/VCUXueQz5iT/r X-Gm-Gg: ASbGncv5/nUNUd9THNcKKtHwigxJaCMcbVrklybI7TZGiEY4wMlvDRbum8cUx0MaTnD bEoSLUWzeUDCpY4qaVFtGM8UE9DI+1pMmBESxi5z0ajD4ifI7Tr5K87GQv2sZCCE5B8cWY0SGtf eV4FcjkZZCQg0xyHbZhZsH8HC4n5VBps3Mg1OfqAjF2qdtPgqG3qcsS40FoMyvcdXcuO9IO7hON t4moDYJPojTKUjUgR/jBy857JdrL8o7Nl5P//Q7FjHgXOfo9i2kR3YSkue9UhEX0PXoneiXuEqC 7mB2kRpsw0zZuCGSPtWOk4pyjfsUa062cdbbtiTVasShyCanadmbnLTW7rZNdSbt/o2Olcj/Pyk BW7kZ45IU3bmw+YiX55iVfSuVtzDwNw== X-Google-Smtp-Source: AGHT+IEfwLa2l5GETasrkBN6s16G3uwHStgfCUXGV9Vb0lViqA4Rs63c7NBMXwsuNAY9/KPq3s8gww== X-Received: by 2002:a05:651c:f03:b0:32b:93fa:2c0b with SMTP id 38308e7fff4ca-32cc64d280emr4286261fa.11.1750845171079; Wed, 25 Jun 2025 02:52:51 -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.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jun 2025 02:52:50 -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 1/9] kasan: unify static kasan_flag_enabled across modes Date: Wed, 25 Jun 2025 14:52:16 +0500 Message-Id: <20250625095224.118679-2-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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Historically the fast-path static key `kasan_flag_enabled` existed only for `CONFIG_KASAN_HW_TAGS`. Generic and SW_TAGS either relied on `kasan_arch_is_ready()` or evaluated KASAN checks unconditionally. As a result every architecture had to toggle a private flag in its `kasan_init()`. This patch turns the flag into a single global runtime predicate that is built for every `CONFIG_KASAN` mode and adds a helper that flips the key once KASAN is ready. Closes: https://bugzilla.kernel.org/show_bug.cgi?id=3D218315 Signed-off-by: Sabyrzhan Tasbolatov --- include/linux/kasan-enabled.h | 22 ++++++++++++++++------ include/linux/kasan.h | 6 ++++++ mm/kasan/common.c | 7 +++++++ mm/kasan/generic.c | 11 +++++++++++ mm/kasan/hw_tags.c | 7 ------- mm/kasan/sw_tags.c | 2 ++ 6 files changed, 42 insertions(+), 13 deletions(-) diff --git a/include/linux/kasan-enabled.h b/include/linux/kasan-enabled.h index 6f612d69ea0c..2436eb45cfee 100644 --- a/include/linux/kasan-enabled.h +++ b/include/linux/kasan-enabled.h @@ -4,8 +4,12 @@ =20 #include =20 -#ifdef CONFIG_KASAN_HW_TAGS +#ifdef CONFIG_KASAN =20 +/* + * Global runtime flag. Starts =E2=80=98false=E2=80=99; switched to =E2=80= =98true=E2=80=99 by + * the appropriate kasan_init_*() once KASAN is fully initialized. + */ DECLARE_STATIC_KEY_FALSE(kasan_flag_enabled); =20 static __always_inline bool kasan_enabled(void) @@ -13,18 +17,24 @@ static __always_inline bool kasan_enabled(void) return static_branch_likely(&kasan_flag_enabled); } =20 -static inline bool kasan_hw_tags_enabled(void) +#else /* !CONFIG_KASAN */ + +static __always_inline bool kasan_enabled(void) { - return kasan_enabled(); + return false; } =20 -#else /* CONFIG_KASAN_HW_TAGS */ +#endif /* CONFIG_KASAN */ =20 -static inline bool kasan_enabled(void) +#ifdef CONFIG_KASAN_HW_TAGS + +static inline bool kasan_hw_tags_enabled(void) { - return IS_ENABLED(CONFIG_KASAN); + return kasan_enabled(); } =20 +#else /* !CONFIG_KASAN_HW_TAGS */ + static inline bool kasan_hw_tags_enabled(void) { return false; diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 890011071f2b..51a8293d1af6 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -543,6 +543,12 @@ void kasan_report_async(void); =20 #endif /* CONFIG_KASAN_HW_TAGS */ =20 +#ifdef CONFIG_KASAN_GENERIC +void __init kasan_init_generic(void); +#else +static inline void kasan_init_generic(void) { } +#endif + #ifdef CONFIG_KASAN_SW_TAGS void __init kasan_init_sw_tags(void); #else diff --git a/mm/kasan/common.c b/mm/kasan/common.c index ed4873e18c75..525194da25fa 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -32,6 +32,13 @@ #include "kasan.h" #include "../slab.h" =20 +/* + * Definition of the unified static key declared in kasan-enabled.h. + * This provides consistent runtime enable/disable across all KASAN modes. + */ +DEFINE_STATIC_KEY_FALSE(kasan_flag_enabled); +EXPORT_SYMBOL(kasan_flag_enabled); + struct slab *kasan_addr_to_slab(const void *addr) { if (virt_addr_valid(addr)) diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c index d54e89f8c3e7..32c432df24aa 100644 --- a/mm/kasan/generic.c +++ b/mm/kasan/generic.c @@ -36,6 +36,17 @@ #include "kasan.h" #include "../slab.h" =20 +/* + * Initialize Generic KASAN and enable runtime checks. + * This should be called from arch kasan_init() once shadow memory is read= y. + */ +void __init kasan_init_generic(void) +{ + static_branch_enable(&kasan_flag_enabled); + + pr_info("KernelAddressSanitizer initialized (generic)\n"); +} + /* * All functions below always inlined so compiler could * perform better optimizations in each of __asan_loadX/__assn_storeX diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c index 9a6927394b54..8e819fc4a260 100644 --- a/mm/kasan/hw_tags.c +++ b/mm/kasan/hw_tags.c @@ -45,13 +45,6 @@ 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. diff --git a/mm/kasan/sw_tags.c b/mm/kasan/sw_tags.c index b9382b5b6a37..525bc91e2fcd 100644 --- a/mm/kasan/sw_tags.c +++ b/mm/kasan/sw_tags.c @@ -45,6 +45,8 @@ void __init kasan_init_sw_tags(void) =20 kasan_init_tags(); =20 + 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.34.1 From nobody Wed Oct 8 18:16:57 2025 Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5007B29ACF5; Wed, 25 Jun 2025 09:52:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750845181; cv=none; b=Azfdn/7dnClUuMp9SG1bRhoy7k3H6gDInEU2uNexJq0JvKHBPd9qXTPlCjh7bgCZHrtQ6o9Rp7zml+fCIuexN4hDajA0t3Vp20QE9Jc3yN75PxBnKLJrSyDgZ5rb483RvGShkubGjtKXMUyB+AviuFLOrreWofsGrdVajqYHu14= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750845181; c=relaxed/simple; bh=3eVKIFY+WsG1SEi5ffClJGhexYokOf5VRAj3sHvFmZk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=W6cLjn143q2BsuCN+cn0VCNPCWPp2M56Az/YGm9cNs/KDQ9j6+q9cib4TzbxnnRFiIpLSfqFxwEmpwBe8oFUMCejSkDwoRgznplao/ETYag352CWBuk29+hpzve2Ddn7p3a5tYNKOwh26LSGqYCVLiF1D/DNfWmMDFPKv3YHSRc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lZYrbKQb; arc=none smtp.client-ip=209.85.208.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lZYrbKQb" Received: by mail-lj1-f170.google.com with SMTP id 38308e7fff4ca-32add56e9ddso52457861fa.2; Wed, 25 Jun 2025 02:52:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750845177; x=1751449977; darn=vger.kernel.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=lZYrbKQbE05WzeNAhL2GzUMcj+7Hsx4+UHndRDLjZmJoh3ncYAbg3id2nFaNA07G0O 2KFXjRxIBKT+3L74mWW6rzgMTDhCU7toOTbYpu0hK0KiX3bHN2/CmQMlLAcAiBqx3p+d fT9/3SBID+YZMyi96KgtHSOOTyM30Ypq9KEtwNcKhWXy3TKXS8dKs4J8vYjMW+ztVOwi pJ5E+Oo82Tnb6CNoE3xKZSP4qNPp9JvylYtb6jWdAEVLmpLk2TeccALn6CvZAWjnQXuo VDzxwvnbjRRSyM8LOgBjOYfdP9dJ4Q9aaGW+B7JI7tDpPE6lq+JRhV+I3nzc2RsP+qFm TyTQ== 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=jhXkMrfK+VQjn0kU6kAeZjzPPpqVWRs8SG9bXMdvPfua2DZW98spYOMlP4BCdginoY b4EaxdGrMPg/lJ71kDKGFmlHNLUh/yGmzLbXpKLNx7yju3FTh9rqdhjMboINFTgYlwRj LufY4m1gN0UJEEDLjWuD2aRm9UdCI4arMVfGgnKaXJ+OECx6Yxl8icAPne7JTfM+Xilw CyYCl7Ldl/g0bWIX9hS7svAA2pnWyOvmTkMmHuFlvXDxlFziq7M5S+dLf+jHeduPq2Up gukLbo7Gw1U88ZVmwg/FsEfd28oISWJqv4d4UwFk/AoSqxnCMEkrB4TM+GOZXTYBz/hA 0oHQ== X-Forwarded-Encrypted: i=1; AJvYcCVmymCJs0b+SOrlCcrkRbyA7wS6eeFmUodNT7Ynsroi8VSeS/6NJwSk3Adlub1qLOZaxJQA1lk09wNhzQ==@vger.kernel.org, AJvYcCWqmDrB7crLTjWeAsgQpmBmqZbaMkCYTpOAd9F7J1MeEDmv7fbT7r4jujSuJqv9LOAVxe3YF1qJoi4+lSU=@vger.kernel.org X-Gm-Message-State: AOJu0YyLvv8j2Pm3WFa6PBau2Q7UcK/fWh05CIEiorq3g+pmJN5qwtqK QX9ssDyfOny/Qds4c/TGe9+Td8DfnvNVNf8pPM8VkX0sTXR7q2itADBz X-Gm-Gg: ASbGncur78GUXnA0i3n0sequZIjVsib7oF46uVUwjrkQ4JxiMAl1K6ZYLgbaNrMahSm LgAqW+EJ1eMyt8ZR9m53zrLvlyjeNt4tQ8XwBuTqFLcZsfkj8YH47+aNv+cxj5SfGM1/d8Osxdi QWuVHEMnMeGrTDXhfU0f77ZM/58Pb07dOJSUGlK7da0fS6vcZ7cqBTydK8+MBy8BDxumD1wg6gT 97iWxRv7hSbiE5AwzePbCoR+JrY01IMaHeXV26UZFl+vPFXLar7+MvuSFgH/dlIIwNlAvAwPAYm AYcMkaLgGbHk/1tM3dvzpeul8KhgQd5gn50mMxcp1Ai9rbv9+ubmd/ZqSoDYLfPvhAWWde+Z849 JQdMeol3o2r5XJicEkoOHU5evA9N9/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> 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 Content-Type: text/plain; charset="utf-8" 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=3D218315 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, vo= id *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; =20 poison_slab_object(cache, object, init, still_accessible); @@ -289,7 +289,7 @@ bool __kasan_slab_free(struct kmem_cache *cache, void *= object, bool init, =20 static inline bool check_page_allocation(void *ptr, unsigned long ip) { - if (!kasan_arch_is_ready()) + if (!kasan_enabled()) return false; =20 if (ptr !=3D page_address(virt_to_head_page(ptr))) { @@ -518,7 +518,7 @@ bool __kasan_mempool_poison_object(void *ptr, unsigned = long ip) return true; } =20 - if (is_kfence_address(ptr) || !kasan_arch_is_ready()) + if (is_kfence_address(ptr) || !kasan_enabled()) return true; =20 slab =3D 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 v= oid *addr, size_t size, bool write, unsigned long ret_ip) { - if (!kasan_arch_is_ready()) + if (!kasan_enabled()) return true; =20 if (unlikely(size =3D=3D 0)) @@ -204,7 +204,7 @@ bool kasan_byte_accessible(const void *addr) { s8 shadow_byte; =20 - if (!kasan_arch_is_ready()) + if (!kasan_enabled()) return true; =20 shadow_byte =3D READ_ONCE(*(s8 *)kasan_mem_to_shadow(addr)); @@ -506,7 +506,7 @@ static void release_alloc_meta(struct kasan_alloc_meta = *meta) =20 static void release_free_meta(const void *object, struct kasan_free_meta *= meta) { - if (!kasan_arch_is_ready()) + if (!kasan_enabled()) return; =20 /* 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 voi= d *address, size_t size) { =20 #endif /* CONFIG_KASAN_GENERIC */ =20 -#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) =20 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 val= ue, bool init) { void *shadow_start, *shadow_end; =20 - if (!kasan_arch_is_ready()) + if (!kasan_enabled()) return; =20 /* @@ -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 =3D (u8 *)kasan_mem_to_shadow(addr + size); *shadow =3D 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; =20 - if (!kasan_arch_is_ready()) + if (!kasan_enabled()) return 0; =20 if (!is_vmalloc_or_module_addr((void *)addr)) @@ -560,7 +557,7 @@ void kasan_release_vmalloc(unsigned long start, unsigne= d long end, unsigned long region_start, region_end; unsigned long size; =20 - if (!kasan_arch_is_ready()) + if (!kasan_enabled()) return; =20 region_start =3D ALIGN(start, KASAN_MEMORY_PER_SHADOW_PAGE); @@ -611,9 +608,6 @@ void *__kasan_unpoison_vmalloc(const void *start, unsig= ned long size, * with setting memory tags, so the KASAN_VMALLOC_INIT flag is ignored. */ =20 - if (!kasan_arch_is_ready()) - return (void *)start; - if (!is_vmalloc_or_module_addr(start)) return (void *)start; =20 @@ -636,9 +630,6 @@ void *__kasan_unpoison_vmalloc(const void *start, unsig= ned 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; =20 --=20 2.34.1 From nobody Wed Oct 8 18:16:57 2025 Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3D03729ACF5; Wed, 25 Jun 2025 09:53:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750845187; cv=none; b=oVp+GAOAt4w8Sx9jFPy1Wk/J5IBprd+zHYc/tU5bhPRuokt9b22WPGTJVle+Koq/vXWnjxAZGkmqYjkQTUtSyDF3xMjN8QSuMvWLjW8KhTMe0+BjpEFXNe//ilaRpZmKmEEPYI8oZxjmRq3MiOyp6TaRVLBlU0TnYQo9onk7Yzo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750845187; c=relaxed/simple; bh=sGXp482ePzEbOSqj6Oo7pSTRt0qdWiaHv14lzRVBHx8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gYSOT8yanxdOy0LZxz5VnzFGqjoRJF64etzXfACvzxMKBYh2NrkBp1FPHIJrVybgeMaa27FI0Ve9mi9XpmFYRq+3d7ANSA+rdX1OUmKJK4ElYz2WqjGYRyl1nBE/V/cuKFKuRk+LF9YTSQ1IGdyi0Sze7QWGO5i9EMqkmaKKoPU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=VPfQNopn; arc=none smtp.client-ip=209.85.208.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VPfQNopn" Received: by mail-lj1-f181.google.com with SMTP id 38308e7fff4ca-32a9e5b6395so12342021fa.0; Wed, 25 Jun 2025 02:53:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750845183; x=1751449983; darn=vger.kernel.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=m8+Li4ZqAZW0QY7sIIldmBLFf6VQ+4AeP6Iv95ugt8g=; b=VPfQNopnBR/H8mCrLkMzOeoUi8YEKxX8J0NxADzm6FjQkAnv9J7KZ52LGGcV2wWQEP c4XPzQMSGKFCozQp+JNxytmuKF+CtuRe3GPjmqR2MLhVQy21VxiHVfOxvujZsNV5ntgN uTG4P1VEWZcNqnmrvOoI/fl3adGbEcE7xzj6eQPz14vXORd+QuP0re6oDmA/tqeZoWAD nyFtICp2tMbpEoaCcQhscSCRQIHXSshP0Exy3bAFStb0sSF605RDCAiacOC+6AD+JV97 4hZ8mGJRZj0CCj4Jv5jKSfMvNzaGnWyziLGG0Xhzb3+QzRRZ7uTCrdmc1CDYGuS0Ch1P Idaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750845183; x=1751449983; 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=m8+Li4ZqAZW0QY7sIIldmBLFf6VQ+4AeP6Iv95ugt8g=; b=Yu5qw/LOjPHyxSTtFvxK83zGE6EDOJ3UIEjxMNzFN77X0uZ1uDHjatb+Ns78WIKM0C 8sDdBo9x52w9fJ/QrfPVGxS7ixhXcFNTIbgQjSQA5RlCoG77pUvAL3Fv3EaNzBkzo2J5 W3fmvvun477M3OMIsIYp46LtFfO4pIF8FYjTRpNuNCYkorj2WDBp5pIcCVx97Fk9XuUz Qa3UhGxUHCWwtWWhaq2bTsSzTGlBd6mWLtOazfiflYYYegW+UyK/EquClSgKjhsCWtQ+ 7Sbm8dzU2QN/V+jRD9SitQ1zvRbSV5Bm4xfimgMNhyk1extrEJOJfPwlMkfjMx+PkQ0N PkrA== X-Forwarded-Encrypted: i=1; AJvYcCVFnd79BpeKbnL55XpqUTdVeTnNfyzKCnnqhPvj2PmVHzAtJc7i7ToztMmRsmC26KvuDZ02qWUQBhiDng==@vger.kernel.org, AJvYcCXrTnwvyWZh7hznVRnRsg6+/NQgiWLSw1k+VyhqNSurDoLzPgX4s456U2rzHv9N8nAWQah+VJc48dWYlc0=@vger.kernel.org X-Gm-Message-State: AOJu0Yxh+5jhmBxPVyRTfNb3czlx+4JqJaYh1Xhxjzwo6X8nKRRhrJRu 2PhUfkvPjn9vHn8bOMJxWagOpQjUjCoo2LeDeD0x2BdNrk1iAEWmQtHP X-Gm-Gg: ASbGncsmZ76lJL7ot+sROzXe8oH1wrlTXkkDhT5SVCkIvzZNzMW10MpS7n4jnsnLSrx dHfiC5RXavICY9hc8c0yyxpvt21xWhliYhlhf2jDXFT+J/JLbYAg6N/nqpNvNjHl6Zf2NOhiyEe BIcPAV+F1ZDcuVtB9FvvPyk/3quyCoanfKzFtPW7F4C+zla+6sry7wFHCH/PRptkmdMwZC7alcr 2q85BXWFuVbwAbWXUp8aboGcFoywXtduR+7WfO5LFmFr3n97ya7zF0imHfNyEebaEqQNuJn0xsw IPwBqxyAF6WJR5TkIU6fsuz3qpcQekO6RTYq1lYqdKx0vpFHlAmQlUvJ1wK8PtQRs+9Z8Z15LAA Gip+YFo7f6BQc3SEmC0h+rXHBWUgsSA== X-Google-Smtp-Source: AGHT+IFM+6Gp9FKNRVxfpjNXcdXOUjE/qQpWABAqK3bSElIsQlHP18BbIkRAqZ9Oq2fiOL+vDX3DJA== X-Received: by 2002:a05:651c:e11:b0:32a:714c:12d1 with SMTP id 38308e7fff4ca-32cc649716bmr4987311fa.1.1750845183165; Wed, 25 Jun 2025 02:53:03 -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.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jun 2025 02:53:02 -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 3/9] kasan/arm64: call kasan_init_generic in kasan_init Date: Wed, 25 Jun 2025 14:52:18 +0500 Message-Id: <20250625095224.118679-4-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> 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 Content-Type: text/plain; charset="utf-8" Call kasan_init_generic() which enables the static flag to mark KASAN initialized in CONFIG_KASAN_GENERIC mode, otherwise it's an inline stub, and the flag is enabled in kasan_init_sw_tags() or kasan_init_hw_tags(). Closes: https://bugzilla.kernel.org/show_bug.cgi?id=3D218315 Signed-off-by: Sabyrzhan Tasbolatov --- arch/arm64/mm/kasan_init.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm64/mm/kasan_init.c b/arch/arm64/mm/kasan_init.c index d541ce45dae..abeb81bf6eb 100644 --- a/arch/arm64/mm/kasan_init.c +++ b/arch/arm64/mm/kasan_init.c @@ -399,14 +399,12 @@ void __init kasan_init(void) { kasan_init_shadow(); kasan_init_depth(); -#if defined(CONFIG_KASAN_GENERIC) + kasan_init_generic(); /* * Generic KASAN is now fully initialized. * Software and Hardware Tag-Based modes still require * kasan_init_sw_tags() and kasan_init_hw_tags() correspondingly. */ - pr_info("KernelAddressSanitizer initialized (generic)\n"); -#endif } =20 #endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ --=20 2.34.1 From nobody Wed Oct 8 18:16:57 2025 Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 991EC204C1A; Wed, 25 Jun 2025 09:53:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750845193; cv=none; b=q966ukwjLsxZa4RUkJlPRDMMyc1hTNQU290WanB2olSRX9QWNYiimRgpuQbbo0WRdXd3I/LUrr7JrPFVV1bukGZKvRipNKJFqgHGG5n4tR7jPue+GMIngFMeRpW9S6yABj7ZS/uquiAwKBXFnUauW7/CTilyhaPP7MFU6u/e3Qc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750845193; c=relaxed/simple; bh=zq/W/p2aekVSufwziK4dkt9mQbwxASXZ/X4u9Ay/wd0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=f8ZE5YFOrxXYbUR8dXJsmP+F2wRF60JAETs05YKPwC0LPQixoosjpMhJTtZvMOH1Oi/6oNRkL2L8H6KWCblQ6/9uuh9jB0ysmI4gvb2vAQc0DjMGG30AlNUDtI72G4pDzFZ3xqnxmiG2819V/61y3pxqndVPZQn8mtXp09BOTJo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=leuT0pnk; arc=none smtp.client-ip=209.85.208.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="leuT0pnk" Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-32addf54a00so50566421fa.1; Wed, 25 Jun 2025 02:53:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750845190; x=1751449990; darn=vger.kernel.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=GQiI3pji6r3skZCyeT+2q6FDZmdcyPERVGy1ENHzh48=; b=leuT0pnk8FneFMyWYyrss8YH98jRjYN7SrEViGNawLfrJYrsjDGhVCdmZPxqLJvx7N eNu6B2MYNPe9IkTz0ExLXWoD8n+Gjo3XOrLskxPc5iZegGomLtpplV3fpvFU0acSoqU/ I9WQoCUBD0g+kkB0A7VW0l0uMV2iMGNT5KMn/tPuH3ZXrym5MEz36Mf0IELN3+4vWkQl 8JSVPCo5MUT48u3aANtOH3ObTkdZg1PMomd7fdG3yj5WyzZU57nk/3n2nE/Ud+5zuEY6 xQhgasSAtENwQProz07KgJrSYs1sYikRhn6btvu2xX/yoa0oAUqYEnns5BOuCHe8jV/T P5oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750845190; x=1751449990; 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=GQiI3pji6r3skZCyeT+2q6FDZmdcyPERVGy1ENHzh48=; b=GgEVqZTMmSD+Ccq4sR5zPcIboEmyncXYzXVFYlHOgJu0j/S/5hQ/u43t2ro/U8CQ3/ Q1J7qklQnzG+RcBXdk3aMvxyMpMASEX2j6eCIFUk3ajvYVIyeuGyVTSM5xHaOZl3DsVn /m6k47H9NnyYgq9vOq29iMh6/T8WwtgUwmugkeujSFB0uNS9xYWDzLv0/G1R5YpZBb76 V48gngNWmmfmc96Y8v/DibOiZrG6ajVNyq5NvaM+WQ7Tb1vMAN9ah1N7BqftMA8L37ZO M8Qm400oOas0zsR54Il4n6siQ0Jj5Nbw/U9ix+AEVS24amR/9/ACQS0vaAFVvj7/FNBS g/Qg== X-Forwarded-Encrypted: i=1; AJvYcCUpFNhbijJfAKGYSXyrb1aa8WA68hEdm0W98K37T0aXUrCUrFgd6wl5tOPAa4EPAK9bQWTgcSXqGoEUXw==@vger.kernel.org, AJvYcCUx1hKoNW9Q6wcgU63ZH70BM67s+XF4tCKP1jv71LpCUsNAyT5K5Vez/JBz4yju5sZQa1mGn0xGYtYPkyM=@vger.kernel.org X-Gm-Message-State: AOJu0YxvZ2Z4MFV/5QAuy7zDXhisaG3sFX8P5xAGyTmjkzN/xZzN3lKc Yu6327uOr2HjszgCvWIux2ZBCBpuyBeQa1akb8dW7GGVhbwyd5EQeZiY X-Gm-Gg: ASbGncv37SCkfKh8oQujfrSaaFrxhARe082Geu3tMqZI0TQQ/GK5YX1RaafZPILflYt sirKoTmgXMG4e7FwQUf9cET/hdjmxElA8JIjVzC9EPIINRhSpu8hymuFRwcuI+weSKc2QyUbRrr JtBth897SKY8u6Mnp2e1kH55smH7W7V/lZ6s8CxXrGTPF/JU13+q9nMau84E2fkaKOJKmzH/Dok sG2Dl2QLmJTIOz8yuglxPoIv1Apnkqufu7v1MDg/wEhcR+/Ax8qtayKjXrx0kui6EX/lOXA3PC/ 5y+2Lo8I/fnQoKnWJt7Re8FsvDhySCISlhtpxQuFI1rZ6RDyLnpomaL8QvOQPioXIFnRDsTgNAI upFkjYPnSyS2hkFktr7Wg380EZYai3MzMONS5utam X-Google-Smtp-Source: AGHT+IEfK1Xq7ZnXyT0Os2Uk+Tl7A2yRnzkJG2IvrwiF+G9b2Q8GisEMs1F3MxkK27tqhocl20BnLg== X-Received: by 2002:a2e:a54d:0:b0:32a:7270:5c29 with SMTP id 38308e7fff4ca-32cc6421a2bmr9358961fa.2.1750845189565; Wed, 25 Jun 2025 02:53:09 -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.53.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jun 2025 02:53:09 -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 4/9] kasan/xtensa: call kasan_init_generic in kasan_init Date: Wed, 25 Jun 2025 14:52:19 +0500 Message-Id: <20250625095224.118679-5-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> 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 Content-Type: text/plain; charset="utf-8" Call kasan_init_generic() which enables the static flag to mark generic KASAN initialized, otherwise it's an inline stub. Closes: https://bugzilla.kernel.org/show_bug.cgi?id=3D218315 Signed-off-by: Sabyrzhan Tasbolatov --- arch/xtensa/mm/kasan_init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/xtensa/mm/kasan_init.c b/arch/xtensa/mm/kasan_init.c index f39c4d83173..0524b9ed5e6 100644 --- a/arch/xtensa/mm/kasan_init.c +++ b/arch/xtensa/mm/kasan_init.c @@ -94,5 +94,5 @@ void __init kasan_init(void) =20 /* At this point kasan is fully initialized. Enable error messages. */ current->kasan_depth =3D 0; - pr_info("KernelAddressSanitizer initialized\n"); + kasan_init_generic(); } --=20 2.34.1 From nobody Wed Oct 8 18:16:57 2025 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E3078288CB7; Wed, 25 Jun 2025 09:53:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750845200; cv=none; b=i0piOT1RSjW7Z/ciiP42kO6z78FlK2Y9d/+ryDIC0gCb1ez9CRm1c/kXbSUsN4+Wzy7IZrIJozayRU2g26pD6jR3U8cJAdJ2/ay74lo4x/LqRGAUO3FXhXeb23luatIkDFTxdgfLB9k0/D3sYBFpaIkPF2laO0npCL9CPdsuE4w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750845200; c=relaxed/simple; bh=YSrfFiO3wmIem/Z+PiAU/NMaBQktcErgh1DaWKXnlpo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=huFs8AtA7HCq7nkw3apolZFlY/6b4Gpdz9BG2QjImTjTuv0Wjfl4UFE4R1mdruTrfr3jtbQHZ+TYpEWSFCAPyDFxl718qSml9zhgHF67tOfj5I+kt0eXLUANLQloPqZY23GOpxGFiRDgbVeQRuwnfQFf49RRWNshbcLIsJ0a6Uo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Pan7sCYm; arc=none smtp.client-ip=209.85.167.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Pan7sCYm" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-553644b8f56so1373735e87.1; Wed, 25 Jun 2025 02:53:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750845196; x=1751449996; darn=vger.kernel.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=aOegpAuvdkFcZey7AJnC2ppf18uuNZebWg0aRe4Uqy0=; b=Pan7sCYmRjD+SsNNft9sNR4wt1HY9qjuesdPh3cON2tr79/M4k3kkQVo84XFlZMVwY Ydb4HHolU0G3tSp3SLenF9/JE/GfdgcFJLnvypCdTVNG0KGrFB1z9XXbjZa4T/0wdcwS w3LT6glFqfOMVFOdnWBIlbltDlUz25LIU7oAvy8s7AMuQ6yjxT//xWe4NKwk8dHuCGOF XLbV04LB/PDYhaO+SHwaKmaE5lwp8sove84ETaz7pfgxJFaLYvFeXb96B/kq0RTO0CV3 scHzKroI2LLYPN+FBwnYpt1RiqVS0LMuRcKIN8OP5I5edRG9yeY0jO3AQZWSNnXne1lk ql2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750845196; x=1751449996; 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=aOegpAuvdkFcZey7AJnC2ppf18uuNZebWg0aRe4Uqy0=; b=wgBlQiu41mm4SBasOA+Zk4vdhVwCzw/mNirmIRDOkbCuVpUA1Zx7SeMd6l5XTb+RBW IASad9pfXXsFtP3jrmPlv64bAvLuX2FDP0XzKmPaGEZTJzoWIwbbXnQM3MRE0lAmw1Tp z/XOve060iGqjNwisHJCA55IFWcpgOLXPkiSNivmwONBU20XJhXb25DPzSauG6HmJUK6 aMZ3bkGOH9DmEj507O55LidGTxU5RYHLwoEH6oKUtHOdWvUUCTjh/+Z6uOKjbFy7sWt2 ElkJca8Zga5/3/yZvZdsDiE1HW++YccO8YSaXmneUWhKAJJY9/KAW3ps0sjvmqtkwmFH zdiw== X-Forwarded-Encrypted: i=1; AJvYcCVzbYxHwBl2jIdmxvI+jFAPmM5J62RfnlahioXAJDQIAUoJUC7IRxouo7bpP+6CzfaVYeq8vPmaV82CKlU=@vger.kernel.org, AJvYcCXeotVtec3t/2hAbUpd9AHEBf4upJUsOn50HPK0Rf3Q859Wqg7lxnqwbRF3oAzGlKTwXmXcIF4rUWPSNw==@vger.kernel.org X-Gm-Message-State: AOJu0Yy2HWrnqdbIT3K4vlQAwfqSoV9mJz9PvHbeK02ZBh8E8Izgoipt MtqablVsLg1ibLv6kGAir411IjXLDkwvvPY6uDH07cvASfGglWKhNHTX X-Gm-Gg: ASbGnctMTJzPyFqBoCVWGE5Frh75uA1IUXow9BjiEFc3uYL4cGnqGk1T8WrSlZP5cAr c5DvF2Amjt60R7z0q5t4r4jhW8B1wOXVEj4S52oYV/Sh1Ne+THkH0EFmp2z3yN7ZmI10nCImA5v 7IPYAiz074fchab6TB3opHHe8Ac0PIpeiEsskrt90n5xlIS+S9oWPrUEfhSoO96+UYWPFGv1ErG 6gF6FJ7mjH5bczoAgw1qP9BJoV1T9zSdWdB41uvFIO4wcBztOHczb8mylvD1iBM0ZiZ2dmylAb1 CimRm3UaQDYXBi5eJ8gEybyQ84ti3Bh7Y9o5wg8h/GXZv6a4Rd4+/iKEhUT2/1Jl5POcAiuk+xV MJvQNcw2+l4YQcey8PSFbx6U/sIdAYQ== X-Google-Smtp-Source: AGHT+IH5sVpXWqNvgigVbtHVAfe6SjaMuU3V6+6bSDasNHNXTwQEDyYqvBChJ5Rb3116y8fRmuAdlw== X-Received: by 2002:a05:6512:b1d:b0:553:ccef:e31f with SMTP id 2adb3069b0e04-554fdd428c7mr668464e87.13.1750845195630; Wed, 25 Jun 2025 02:53:15 -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.53.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jun 2025 02:53:15 -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 5/9] kasan/loongarch: call kasan_init_generic in kasan_init Date: Wed, 25 Jun 2025 14:52:20 +0500 Message-Id: <20250625095224.118679-6-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> 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 Content-Type: text/plain; charset="utf-8" Call kasan_init_generic() which enables the static flag to mark generic KASAN initialized, otherwise it's an inline stub. Replace `kasan_arch_is_ready` with `kasan_enabled`. Delete the flag `kasan_early_stage` in favor of the global static key enabled via kasan_enabled(). printk banner is printed earlier right where `kasan_early_stage` was flipped, just to keep the same flow. Closes: https://bugzilla.kernel.org/show_bug.cgi?id=3D218315 Signed-off-by: Sabyrzhan Tasbolatov --- arch/loongarch/include/asm/kasan.h | 7 ------- arch/loongarch/mm/kasan_init.c | 7 ++----- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/arch/loongarch/include/asm/kasan.h b/arch/loongarch/include/as= m/kasan.h index 7f52bd31b9d..b0b74871257 100644 --- a/arch/loongarch/include/asm/kasan.h +++ b/arch/loongarch/include/asm/kasan.h @@ -66,7 +66,6 @@ #define XKPRANGE_WC_SHADOW_OFFSET (KASAN_SHADOW_START + XKPRANGE_WC_KASAN_= OFFSET) #define XKVRANGE_VC_SHADOW_OFFSET (KASAN_SHADOW_START + XKVRANGE_VC_KASAN_= OFFSET) =20 -extern bool kasan_early_stage; extern unsigned char kasan_early_shadow_page[PAGE_SIZE]; =20 #define kasan_mem_to_shadow kasan_mem_to_shadow @@ -75,12 +74,6 @@ void *kasan_mem_to_shadow(const void *addr); #define kasan_shadow_to_mem kasan_shadow_to_mem const void *kasan_shadow_to_mem(const void *shadow_addr); =20 -#define kasan_arch_is_ready kasan_arch_is_ready -static __always_inline bool kasan_arch_is_ready(void) -{ - return !kasan_early_stage; -} - #define addr_has_metadata addr_has_metadata static __always_inline bool addr_has_metadata(const void *addr) { diff --git a/arch/loongarch/mm/kasan_init.c b/arch/loongarch/mm/kasan_init.c index d2681272d8f..cf8315f9119 100644 --- a/arch/loongarch/mm/kasan_init.c +++ b/arch/loongarch/mm/kasan_init.c @@ -40,11 +40,9 @@ static pgd_t kasan_pg_dir[PTRS_PER_PGD] __initdata __ali= gned(PAGE_SIZE); #define __pte_none(early, pte) (early ? pte_none(pte) : \ ((pte_val(pte) & _PFN_MASK) =3D=3D (unsigned long)__pa(kasan_early_shadow_= page))) =20 -bool kasan_early_stage =3D true; - void *kasan_mem_to_shadow(const void *addr) { - if (!kasan_arch_is_ready()) { + if (!kasan_enabled()) { return (void *)(kasan_early_shadow_page); } else { unsigned long maddr =3D (unsigned long)addr; @@ -298,7 +296,7 @@ void __init kasan_init(void) kasan_populate_early_shadow(kasan_mem_to_shadow((void *)VMALLOC_START), kasan_mem_to_shadow((void *)KFENCE_AREA_END)); =20 - kasan_early_stage =3D false; + kasan_init_generic(); =20 /* Populate the linear mapping */ for_each_mem_range(i, &pa_start, &pa_end) { @@ -329,5 +327,4 @@ void __init kasan_init(void) =20 /* At this point kasan is fully initialized. Enable error messages */ init_task.kasan_depth =3D 0; - pr_info("KernelAddressSanitizer initialized.\n"); } --=20 2.34.1 From nobody Wed Oct 8 18:16:57 2025 Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E19061EA7EC; Wed, 25 Jun 2025 09:53:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750845206; cv=none; b=V92VFf6kPxZ/IH5EKRGcx1XCSvsbv4nxmVU7bfyDYmgyiZFrFpLVPHa0Yg/0Ry7riWYnVf8cyARAC1y3FqsM6bgqUud22f6zfLTr5ujE7dCzrL04jprA2UoJT1AmRkD20vEJhwTFGKW3Dbf4+r4+3ec++fJO0YwrmTIa6VlZFNo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750845206; c=relaxed/simple; bh=ZIM5Z8nhsFV5W+hsX3dV876oHiSX20+bmYuDafoyB6E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZreZq0/ym3SvbqY3rsIiPc7S2yfZBAIFfB7mtgk4kKju43SsPyfo7Bh+rlD+GH31UdxMjIZ1cn55iOFFJixBHXF4yZX1EGclz2kaNjEHq3HVlMRUXJpKLfetprXNDDIS5iyvr4lSoTepBSGLhT1OSsfAlu/6QtQep9vyYJKsrp4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=F9YFQCa1; arc=none smtp.client-ip=209.85.208.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="F9YFQCa1" Received: by mail-lj1-f171.google.com with SMTP id 38308e7fff4ca-32b553e33e6so54954101fa.2; Wed, 25 Jun 2025 02:53:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750845203; x=1751450003; darn=vger.kernel.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=8HfJTJJcJZY7/fCA0Tiz5Rc62kUV3pDrNC7eedpHA74=; b=F9YFQCa1je2jU6cRDtyTB2WZXB80P1fjBHfqbo2jLc/HmZyadHoDdh7DttBJwIwFCf z7gFV9QZo1HPDJ1DiGlPgrgIOpNvx1XpLoQNF6Dcz1MvXFv4nbvq372pugKMjxckJiN1 F9nH+qoCd4g3t6bGPck99mLfUArbmJNwzeTW9gMle0pRdLb3nDRSPWORh4nbKTQGIm4f iNoIUqzK5j4VXjBWFv5Jsc2Xr+9VvVsddmDH8U7Qi8TbcZwIOG+z7VTp4ysrPdDQx4pT nIWX1plYM/jmbp+9jZXh1AldmvXztaD2R4MPCcaS7Q3WOPgAWYYdPtlPoXxIxaxfrWdI Og3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750845203; x=1751450003; 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=8HfJTJJcJZY7/fCA0Tiz5Rc62kUV3pDrNC7eedpHA74=; b=g+JY3GQs2CZanKHAghnYFKc9TPVfoQUHnCerUhwwjmRn2vguHUHfYU+AgNsy06XVzc boa0eyZPofob00N+uBrwSSoxmsvdMYiuunokrHX5cpcB/BVl9njWFfUDSXCsqhICJubm D4iZo/atB0PEzYbJ7vszz9cTqsTEnqiRTm4QaCYNxAYJvxP+F3SmXrm5BZbwdAJ5J1S4 Pedh6CpGFznsgzjjuSI8dwSX6gN2mjPgoqN+FBd4v62h8OhICmxOYjlx8fX6aTBK66lw kbotvi0R8qk+fVI4Lb3TkbmYvEIvJf7wwBdrozXFLIN2QskG8j19P1StOHp4eFPXIoRs 1Xng== X-Forwarded-Encrypted: i=1; AJvYcCVTk+acJUhb7qqYIKNuXiRjKGjY9VRg4yGDI/n6OsOcyttmdutIiT1OeBozPNnzioGK2DlEGlu+jxFcbkI=@vger.kernel.org, AJvYcCVzsGlFEr66x6egrrCLkkxC+WZ+49vk9cCK4zhKvUBzGrmqOwA4qP18bKztyWEcHVz+EM8JoVuZuiNgPQ==@vger.kernel.org X-Gm-Message-State: AOJu0YzawgFeRuPuPO+2DkW/4d2qG6V6ZRbJz2055DRp8zeWhiRpellU 1KgN/oABAYxI02UZbiG1SNuXbJ1D73bJdwHGg9xHnQgQdi0Sruj8lSGi X-Gm-Gg: ASbGncvdQ2GqPyy9+c8rDNviNgto9mvPnidyCnrS1jKqic8/S306iZBACWIp9elYov0 eZC+Oxcz8DsGqqHKk21Ypa+w2U0NHG8JLgMWhx5laxsBR8lzXHRH5VghMWgwaZx7y4Bb2Vig81M 3m98Qu8iJ2v5OHLk4UlxL5SbFHbtTcGea5/zafeQlZbHARfpSEuQcTYQ4oCS5BrMFZ18jsPNiCT T4dJu0hF1hb3XXI4y1OQplNHPn6K96cP6RXXOUbafNkdJNI+9j9ENffF3dqgoz6cD20yYa8lBYj QwsZyTf6pxquDg45kblSicQrMaQtpByrStac6trF9E8XfDhIB3fX8fs8Wbep/LZHHd/4PDx5Gxu wyYho2pqrzBAME7hkqk7kRF+zbnd3GA== X-Google-Smtp-Source: AGHT+IGryY1FCOgoaOa1ABgKWf+F5LHoFKkqdltui071JTPn8wvOuq6kBWhaIRALdveundDdtHS+Sw== X-Received: by 2002:a05:651c:31c:b0:32c:a771:9899 with SMTP id 38308e7fff4ca-32cc648af6cmr6208261fa.9.1750845202774; Wed, 25 Jun 2025 02:53:22 -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.53.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jun 2025 02:53:22 -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 6/9] kasan/um: call kasan_init_generic in kasan_init Date: Wed, 25 Jun 2025 14:52:21 +0500 Message-Id: <20250625095224.118679-7-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> 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 Content-Type: text/plain; charset="utf-8" Call kasan_init_generic() which enables the static flag to mark generic KASAN initialized, otherwise it's an inline stub. Delete the key `kasan_um_is_ready` in favor of the global static flag in linux/kasan-enabled.h which is enabled with kasan_init_generic(). Closes: https://bugzilla.kernel.org/show_bug.cgi?id=3D218315 Signed-off-by: Sabyrzhan Tasbolatov Acked-by: Johannes Berg --- arch/um/include/asm/kasan.h | 5 ----- arch/um/kernel/mem.c | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/arch/um/include/asm/kasan.h b/arch/um/include/asm/kasan.h index f97bb1f7b85..81bcdc0f962 100644 --- a/arch/um/include/asm/kasan.h +++ b/arch/um/include/asm/kasan.h @@ -24,11 +24,6 @@ =20 #ifdef CONFIG_KASAN void kasan_init(void); -extern int kasan_um_is_ready; - -#ifdef CONFIG_STATIC_LINK -#define kasan_arch_is_ready() (kasan_um_is_ready) -#endif #else static inline void kasan_init(void) { } #endif /* CONFIG_KASAN */ diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c index 76bec7de81b..2632269d530 100644 --- a/arch/um/kernel/mem.c +++ b/arch/um/kernel/mem.c @@ -21,9 +21,9 @@ #include #include #include +#include =20 #ifdef CONFIG_KASAN -int kasan_um_is_ready; void kasan_init(void) { /* @@ -32,7 +32,7 @@ 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_init_generic(); } =20 static void (*kasan_init_ptr)(void) --=20 2.34.1 From nobody Wed Oct 8 18:16:57 2025 Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B8CA829E0F9; Wed, 25 Jun 2025 09:53:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750845211; cv=none; b=hcUq5BhA3qY1eeUMuSqRUrTtNHQNqw7vTnTpjvKGCyE/hha19TyP5KUOOgShVncJXvye0Nk0+as3LYApWtoL1LMzVRA8oKoeoGgAIIysY1aXfybWUndiPcckwlnbL4TrExmMq8cZUlpbmEJNowE05Ba2H1HUK3nDHcGDpf1Btv0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750845211; c=relaxed/simple; bh=lhF1+oDAAfZTQLsvxX1VmCxIOVKQmNCDXyIFJsn0eiM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uihtDvAPlJbOmaGjJ8ivtaq7ga/RM7XYZBsb4fYQzSFUo3N6+xYcHe7EDEVKMKgAVMTb4ldshPmOOiYHAVCoqx7sc4jTehjpH58IK8/AcS8DoJu7/TgndIvXqtSISQyGuske1fjrMUVpBdm+QZBktCinKB8wTx943T0RqbQctUU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=nPqjimk7; arc=none smtp.client-ip=209.85.208.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nPqjimk7" Received: by mail-lj1-f176.google.com with SMTP id 38308e7fff4ca-32b595891d2so12947931fa.2; Wed, 25 Jun 2025 02:53:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750845208; x=1751450008; darn=vger.kernel.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=iNdRW1IbQwaJLK3IU9ZGilulsvtFwP6FJhql802bOZE=; b=nPqjimk7/FsQJjAoB24yytSbXNE7dfVB2tzUSdlNHgzr5O+BcocuFtLPykTMWJl437 /wLinRyH4w+jPobMpMRY3vSEaAAcV5mwtXuby6gSfUNcs8aRpLYGF9lq8iBjzqMcMTa/ 2CYlnrS6uvNJSb1kMH5ivIHbj0TVkW9aXUINEUZsWkQw5kaAe5IGvJj/TasBihGq6NrT UQfVGxHO5evwCMUfmtUhGGhHx0SefoxbdOZt4RdSnK5Ez37N8Q+suY4M3TguevIGWcT1 XsvWnOhCu2R8IFls1QKRxyIfnysaSIvVTm54nzmKGdKm7XQQ6KrdjF4lhTPg1Kcod30l O5uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750845208; x=1751450008; 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=iNdRW1IbQwaJLK3IU9ZGilulsvtFwP6FJhql802bOZE=; b=GZS0oQdb7NMrzTHqUitU/aYvNVpSRXMGgJvqfZOZOt924wiTJWJaKqsvuj0DvkGbGs OvaVc9gUD7gsQ0pdPqD1JQS9wQru9L2JkO9npkDmEkQYELv/oNzFYeQpX6eZxPkdgrut oRjIH7Yjzel91ZMsxi18HFPsNj88ORpDsJXWiwMjvb0U8ovq6xS9ouZxyB54bqeVHojl 7QTwF6i2YAlv8b3RNEDWo986yTdKOaKVTMJDjRHGxsfIiKocX8RKafz4ky1AOyr1XjMz b8x/mtI0gRQxCRxoBvY5WR3we3qYuP/7j3TrXNwAA9iQBYVpi6CYp08Ejm1jmbS+eqQQ k5kw== X-Forwarded-Encrypted: i=1; AJvYcCWFd8jfv0ZEp2m+dULB8t/YWLZTkdCv38sVtXA01AJPqHZux0PIi4bp826MRaVtBzR+8KZgRBe4nDvkKQ==@vger.kernel.org, AJvYcCXCF+hESLKUZOgB4rjk/ZfCdWF/14K3m/KiD6luVrDsoSXbJqrxHyi1zmkkkWvm8PJVC5YchD8p8iTvFUQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwyPpYVPhAwGEximwJ5Nq+7vTE1lVwwUAX4ETH4tHyauPcKlTcP 06CuJXOUBZLH/8l+Fj2j4yZvTl4/35EOs4iYQw2f6x2bxQRsSCf2Spgn X-Gm-Gg: ASbGncuml7t7ydik+XjVdlv4iLCSJQSod3oBvvr/vH+5dtf+fU+OEX2NnY7OnZt6/4J W2sVGoLVlYABFiVsWqlnkZCMgwPgwPOXvn1PfYse90JUQLji+wnDQRRlkd1BKtFIW+JSxL8V/kz AAQJXeAFUSWOuqP4dwpvtS1ct+C5dpU808+OC6/7zqxumZ68ZZpqSKjG+15hWEm1HZPgF6JH2qa BxV8+Vy0lJqREEvjS3KrIJRfb+13mqDT318i4zsV1vItABi7Ln3CBzc8zCRivvpJBUpwAyjiNr/ 5rUEO85hnO9ckmr89WX6ap+Nvy+qF3iLyOYO3sLK3rqtvDr1Ooi1u3SE+rUkEUVvyUuHw3NcQVs trb6P4Hzng9tsVCPnb/5PvzVHedXtsw== X-Google-Smtp-Source: AGHT+IEEyG7BglU4Us5Yezwlbfk1A7iCiSut02wYI0QnYJbbPrBalxPgrrZo+Iohs0E8JQ9l3Ex35w== X-Received: by 2002:a05:651c:31cf:b0:32b:33c7:e0c9 with SMTP id 38308e7fff4ca-32cc64b7c27mr7419481fa.16.1750845207836; Wed, 25 Jun 2025 02:53:27 -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.53.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jun 2025 02:53:27 -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 7/9] kasan/x86: call kasan_init_generic in kasan_init Date: Wed, 25 Jun 2025 14:52:22 +0500 Message-Id: <20250625095224.118679-8-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> 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 Content-Type: text/plain; charset="utf-8" Call kasan_init_generic() which enables the static flag to mark generic KASAN initialized, otherwise it's an inline stub. Also prints the banner from the single place. Closes: https://bugzilla.kernel.org/show_bug.cgi?id=3D218315 Signed-off-by: Sabyrzhan Tasbolatov --- arch/x86/mm/kasan_init_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c index 0539efd0d21..998b6010d6d 100644 --- a/arch/x86/mm/kasan_init_64.c +++ b/arch/x86/mm/kasan_init_64.c @@ -451,5 +451,5 @@ void __init kasan_init(void) __flush_tlb_all(); =20 init_task.kasan_depth =3D 0; - pr_info("KernelAddressSanitizer initialized\n"); + kasan_init_generic(); } --=20 2.34.1 From nobody Wed Oct 8 18:16:57 2025 Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C728B2877F8; Wed, 25 Jun 2025 09:53:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750845220; cv=none; b=YrWx11fNOTmv5ixXPWmXinj5GB1XMitTduxo98jS9Wu5POUZU95Q/lfuF7Iu8m8+oh4G/KBq/4Jo6CXVaEH+MwfICyY8TuwfEc6isCTmWYCGZHWWsjvO6CNq7LR2dAQW7bPw6xPYN7rl02vZrBbnRoS7m/mQXM4HJb7y/MXlvvs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750845220; c=relaxed/simple; bh=9TRhdQ972K330SQZmWrhzPzVpDmeg4Vy1yztZoga44U=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=YPn/VzhqvxoUSAlYU0z/PtIHfrsd/A1NnlkmqSZzCEHYgHwR6vKYg9cITHOYLUO8UheCAqFfCd5zhyRgjqBd/UfhnL6wDLit6+MHocnyXyOEXnboW4caxUFLH62nktzq10eZtRdXDD45RtRYbOSCiuhZiIKd1PgvBwJt/nPhNqI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Jprfp27f; arc=none smtp.client-ip=209.85.208.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Jprfp27f" Received: by mail-lj1-f181.google.com with SMTP id 38308e7fff4ca-32b78b5aa39so65438521fa.1; Wed, 25 Jun 2025 02:53:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750845214; x=1751450014; darn=vger.kernel.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=BEyx1UFRvpVo+G4N42POvQdsD1hWzSpAcJ0U0Tlc1dQ=; b=Jprfp27fzlQQT7CxVTX+Od8aXOtzPsyzUnDT8NtfibwdVJ704rr6nflSkeizla1+fJ /Atj9QQ+AePV403dtsztyiyenRxawn0vcggHFpvoDsKNBUMByVAk/7oE674M22+looRV c9z0F060eOWrcPIQzajNtZGQ7vSU0EWKNw0m1UwPUnM8p5VSyixwbia+UQHLRTuC+t1m hUuDA9nZ891C2a5SadY7gWMxE+LFeQ4UG6Of+51YCDWDORYYmhjA9Ufbjupu/y2BHiNe vHT6xo2y+jRI+bi0I6mBAewDL6uXicOh45fW1dCHHxZTA+zuIC1iZxl6dBXaLya+g7ze EFqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750845214; x=1751450014; 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=BEyx1UFRvpVo+G4N42POvQdsD1hWzSpAcJ0U0Tlc1dQ=; b=lmwl6pXA8OEmXVK2A5JUVjbofgxfC13XPzA39byhyvcsHq8v7O9/I6atwXvRGcUPD8 iEJWhnhqzz3F2QjtiTcJfLqQMCxENMNo/9BWfd+g433dkvAhZq45/Jcmf05HWn1EMZsV OEz5g59xyicqx1cAFFSeiFogqwYwqbAwOXemKH6fAK0pQMYRWn7FW5/5xX4GVxUPaPi0 n9m15gmEt2UR9HFrW93iQvHKdqluW14IsuJJzPvA/p4APKDEbuChb8ZBhpwa0nVotJfd KriAXgBjvIYlAm3rUHonskeZHGjhNjJMAgOoA7woCJASLUbjD0y4js2CLlsZNLxwWsJD 46dA== X-Forwarded-Encrypted: i=1; AJvYcCWjxQo5W+ifcaSjKMu8Z7SRtNoNCRkAnTXEcKexw8pf8rikD/YnWmDk2R5Dr4vINO1G5l8/bHKqLDwovO4=@vger.kernel.org, AJvYcCXNSsUby5IcUtsREV1RTiba45UwvVHnqSHf2XytpCi+Z40oYjEpZr6/EpxpcKZPI8Xik3fX/5J8oGBMLQ==@vger.kernel.org X-Gm-Message-State: AOJu0Yzjz3oICco50rAqU+BpRqeGQnl2FQ6eN52RGk3PSenchDPt99kA Lt3DQRQ1yMyjYZyCZYPG8bQBVCVwPq4UD62Rns88bt+ksk28Bet3+Ye0 X-Gm-Gg: ASbGncvVi4QEmdy/7SXs+1zybuFECBnJZXd8izkZ/o0moYWVsrdQIKX4K7sYC0KlC54 XHPVK5x3H8Co0x7BNqx8q5kvmd371oN48eeHL54lpzOVxtqO6JDUBixLuMDNjyGMTjUY6+TZZ84 wPZEXpJpPgFLERlOUHhVO5bMHsCPuLkMBDIkz7+7h6XevtDmDoocoopY9XbeLd02n+CVIfklXuS ngoKm4T6rbGyfXZO+x6Otv7K5Q9dNkz12YsY+PPBF1P7Cuvb7rTxQQDU2Q099l5wqkeZTnBwWMj 0TYR3CU8MMhsVTqUWgoVevnjMugWPB6vzJMNB4pBkmzcCJl1Rzk3Jq7cfja4DIYd0OEduv2o6gx /T4rgAOgBmhhu/rF/UBCfJ8DoICttmg== X-Google-Smtp-Source: AGHT+IEcjLY1beu9wht7welDNsEE9aAi3GLekIAB8d1qrA4KC0EwxtCdVmkKJY06lTM1Yl9RfqTm0Q== X-Received: by 2002:a05:651c:514:b0:32b:3c94:992d with SMTP id 38308e7fff4ca-32cc65755dbmr8009981fa.28.1750845213516; Wed, 25 Jun 2025 02:53:33 -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.53.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jun 2025 02:53:33 -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 8/9] kasan/s390: call kasan_init_generic in kasan_init Date: Wed, 25 Jun 2025 14:52:23 +0500 Message-Id: <20250625095224.118679-9-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> 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 Content-Type: text/plain; charset="utf-8" Call kasan_init_generic() which enables the static flag to mark generic KASAN initialized, otherwise it's an inline stub. Also prints the banner from the single place. Closes: https://bugzilla.kernel.org/show_bug.cgi?id=3D218315 Signed-off-by: Sabyrzhan Tasbolatov --- arch/s390/kernel/early.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c index 54cf0923050..da7a13d9ab7 100644 --- a/arch/s390/kernel/early.c +++ b/arch/s390/kernel/early.c @@ -65,7 +65,7 @@ static void __init kasan_early_init(void) { #ifdef CONFIG_KASAN init_task.kasan_depth =3D 0; - pr_info("KernelAddressSanitizer initialized\n"); + kasan_init_generic(); #endif } =20 --=20 2.34.1 From nobody Wed Oct 8 18:16:57 2025 Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C379E29AAF9; Wed, 25 Jun 2025 09:53:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750845222; cv=none; b=SDR3/2xz9+v94zloCRKQt270DSZdDBuCvm2yZzyl3kPAc8rzv7DoZbDkUKMLwtObob04oUStdcbvYmQpWxFWwq9SDfWN+aLoe9CDAXnrtFgqhTsgeMS/HpsdkHbhiOoN+CVpxJhLKoA1YxDWz+DmnS+8TO3SDZ2vAU9DAxtON44= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750845222; c=relaxed/simple; bh=LmYJYUckHoTag0ZtlFjSwbcxbgwbsaAwVj2xOxG+evk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hapfW0nU6aEs368bBwv7dRQddPm2tv+SoDgv1fs5XzUos+N41ejeQlowhT4Klim07rKEqUjHCP+8hZc7T9gr0dT0sEDzP8JkU5iIexwqW6iTnsEKgMu6/Jnt+Cv3yyj+9HajzWUB+k0i581jRFjlquF1+dKGhNSnfsEfT6x+zpM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=FBtzcsaM; arc=none smtp.client-ip=209.85.167.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="FBtzcsaM" Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-55220699ba8so6788084e87.2; Wed, 25 Jun 2025 02:53:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750845219; x=1751450019; darn=vger.kernel.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=ovwzGubQ7EZCWb++7xcfiusg6EJnFDR8lh6aTJ/PpoI=; b=FBtzcsaMQxL3WLlGLt37z4YqhrUYrO9rgGb+KjekWJY0rLDpE9F+DoLtqIPWB85MsO 3xxDVbAhZbfj52FVsT3+k49xBqoLcRAOm/zBAN5hjUNipJNL3qxGoq+Czg4iDR/owykd LlvkLX9sUphLpIFFIu5l4Q0IWJ8b8OLFgEi+Us+MvmsGXkygkOC7YOIeKhd1Zs5xwuj9 +yJy3h66WJtt8Y/pxbHqK080pqeifDvLR+xovdVQuqogi6SZkA7O8SyMu8UAdzD01XdV Qqx6i6kZ3q1fwWKwGTmJcNFhwcg31ruOPLolnSZKyvQ3jhFXsjamFM5HFHOdMvnbczTF 8rtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750845219; x=1751450019; 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=ovwzGubQ7EZCWb++7xcfiusg6EJnFDR8lh6aTJ/PpoI=; b=id2JLI/8RUzc4xkjEwMM9j+1+6WHzTuArcDiBfVf/unBm1lD7oX5L7finsXfHV3Lds y6QzmwI6nP2MYWXWYOdQCYG/1g3LHgF+KaD2QdOwvdilYske3iqSeV9EChv7V3wZ9624 ywmNAxJHQdymj0CnuaphUltih3kC3MgjHgMJ0xpd9AwrREj7dESfCPswvooa7syOFZeU deBtDphXKYa2mm4mGksPobHziP2Fg3sl4SWQOr+DV2CdrOX1a0yuqiTWhxsdUYhaDqU9 Op0aJHHTMQxq/G0tOXuU7IVSYhzOBmYQX8McDVYact+09kgNSzX351PxDHd494CZIlmc S0mA== X-Forwarded-Encrypted: i=1; AJvYcCUW0FvbM/p4ucjVyBapvHQutDP6IpEhMz/dIDlDMu4D0anG+m11ExPHYhXNz0eszE0zsAzqgENeX5SExg==@vger.kernel.org, AJvYcCWXTcKiLNSNHZinCbzKkXnqkEJSAeNOtYdfRxk9V3Duh+VucV/hwoiysHwtrOGbOew15Txvn5sHaVzZELk=@vger.kernel.org X-Gm-Message-State: AOJu0YxUnGcWst5cFKo6VtkX20aMBfORe+2owj286TDY+Rx4QHX4B/5q HGLK40kZo+orMsw5+yGMxdxw6ijqO00lCDdG/xhawPkLc8SeimzeDiF6 X-Gm-Gg: ASbGncscigSCrfwz+BAcH/ehDzlX12jfsuRIvpU68OZK1bA7lizj9zLCn3Wu3s1jvGq 61DO2G70YiUkBroSE+VOt5ppc/+btx9pJ2We0yf83UIduLXBcFWecbIs6a7u+qc172pfXl9bNks AgZXjwTQX/wi8Je6yh7OHSmgNC8lwVodx8LrEcIZnJGLOAW7yUc6WZvGYqma6cR0BmSrt8kdy2f t83fgsdhLWM+oYb82fwTTu/85Z1CzJ1qceupGQolNYPAdnGO3j0bAP7fRNXidJdch1mzsfPIDu+ ndAuIcIK+HSG8MMm7U+hL0MDgq89TcSKSzSl0LiPaZzF7UqFZHMCyZgxsLTHIqLzNXaoTvOpUbG XEb47fsZzAz5l3UX9Lva0s7+Lnb12og== X-Google-Smtp-Source: AGHT+IHEtWnCbJrLGTsCzIsOmvfz7XrCUuinYoJ1YMkmnRrIevIL2qUouOt7T42E5UqDFgQKhJfguA== X-Received: by 2002:a05:6512:3dab:b0:553:26f6:bbfd with SMTP id 2adb3069b0e04-554fdce00cdmr639671e87.8.1750845218713; Wed, 25 Jun 2025 02:53:38 -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.53.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Jun 2025 02:53:38 -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 9/9] kasan/powerpc: call kasan_init_generic in kasan_init Date: Wed, 25 Jun 2025 14:52:24 +0500 Message-Id: <20250625095224.118679-10-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> 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 Content-Type: text/plain; charset="utf-8" Call kasan_init_generic() which enables the static flag to mark generic KASAN initialized, otherwise it's an inline stub. Also prints the banner from the single place. Closes: https://bugzilla.kernel.org/show_bug.cgi?id=3D218315 Fixes: 55d77bae7342 ("kasan: fix Oops due to missing calls to kasan_arch_is= _ready()") Signed-off-by: Sabyrzhan Tasbolatov --- arch/powerpc/include/asm/kasan.h | 14 -------------- arch/powerpc/mm/kasan/init_book3s_64.c | 6 +----- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/arch/powerpc/include/asm/kasan.h b/arch/powerpc/include/asm/ka= san.h index b5bbb94c51f..23a06fbec72 100644 --- a/arch/powerpc/include/asm/kasan.h +++ b/arch/powerpc/include/asm/kasan.h @@ -52,20 +52,6 @@ =20 #endif =20 -#ifdef CONFIG_KASAN -#ifdef CONFIG_PPC_BOOK3S_64 -DECLARE_STATIC_KEY_FALSE(powerpc_kasan_enabled_key); - -static __always_inline bool kasan_arch_is_ready(void) -{ - if (static_branch_likely(&powerpc_kasan_enabled_key)) - return true; - return false; -} - -#define kasan_arch_is_ready kasan_arch_is_ready -#endif - void kasan_early_init(void); void kasan_mmu_init(void); void kasan_init(void); diff --git a/arch/powerpc/mm/kasan/init_book3s_64.c b/arch/powerpc/mm/kasan= /init_book3s_64.c index 7d959544c07..dcafa641804 100644 --- a/arch/powerpc/mm/kasan/init_book3s_64.c +++ b/arch/powerpc/mm/kasan/init_book3s_64.c @@ -19,8 +19,6 @@ #include #include =20 -DEFINE_STATIC_KEY_FALSE(powerpc_kasan_enabled_key); - static void __init kasan_init_phys_region(void *start, void *end) { unsigned long k_start, k_end, k_cur; @@ -92,11 +90,9 @@ void __init kasan_init(void) */ memset(kasan_early_shadow_page, 0, PAGE_SIZE); =20 - static_branch_inc(&powerpc_kasan_enabled_key); - /* Enable error messages */ init_task.kasan_depth =3D 0; - pr_info("KASAN init done\n"); + kasan_init_generic(); } =20 void __init kasan_early_init(void) { } --=20 2.34.1