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 BAEA3C7EE31 for ; Thu, 26 Jun 2025 15:32:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5F63B8D0006; Thu, 26 Jun 2025 11:32:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5CD908D0001; Thu, 26 Jun 2025 11:32:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4BD5A8D0006; Thu, 26 Jun 2025 11:32:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 3826A8D0001 for ; Thu, 26 Jun 2025 11:32:41 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id E48EF1D36E5 for ; Thu, 26 Jun 2025 15:32:40 +0000 (UTC) X-FDA: 83597944080.09.B3ADC88 Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by imf04.hostedemail.com (Postfix) with ESMTP id CBD5340010 for ; Thu, 26 Jun 2025 15:32:38 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=IKPlzico; spf=pass (imf04.hostedemail.com: domain of snovitoll@gmail.com designates 209.85.167.52 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=1750951958; 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=dIODlzXqnC6bR1NnIlD5Ra9HGYOoS6BNr32H/5XQfhE=; b=LuTfYMiADrSm7+wIOOMcppbvolv16hRmZCJW1A9IgU0s8K/vNWMBsJOf7G4ladTlZZBV39 bSO/wu9QhjziJX4WAl3wOi1xJNto36al/6QkDBZILoCYNpCv7o0Dbk0Wf2AbaKgbfm36Wn ALcyVVDd9auPZPj6Nrhz7W/x4y7hoGo= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=IKPlzico; spf=pass (imf04.hostedemail.com: domain of snovitoll@gmail.com designates 209.85.167.52 as permitted sender) smtp.mailfrom=snovitoll@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750951958; a=rsa-sha256; cv=none; b=q2RJvEzHfy7CeHSOlsTr/z9JPWUvjU+cYh7yjoNPVXQmPeRHlcaaKbvwXOOmgOnpoFEqnE megRXH/bVdi/oBTY9pTQ3viP6ddRYQbu8Bf1mBGI2Aew6cT87niyIbwkeoQZ3HAql4Jp8V lrwhsWJ2ONO1A8qKwI5Q8vuhpM/DM3w= Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-553b16a0e38so1245547e87.1 for ; Thu, 26 Jun 2025 08:32:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750951957; x=1751556757; 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=dIODlzXqnC6bR1NnIlD5Ra9HGYOoS6BNr32H/5XQfhE=; b=IKPlzicoCz15Tm6+TyFc18FgEpKQTHxbNhfgYnhz2jX/DzJ9T3GvdZsPvhkbRM4caN ADEquLPYgxJ2ASb7XWjSloby1XHOS8iTTqMC4mfPU6O8fH1B9M8VWZ6W9jN5tj/fUg0v D7488ZhvBc/+8BFOGahUXvTaUpzcw5yH68Ec+O8XIf0/GB0dArwqqqIIMtzlXlHe48Z8 GpYjsQiukXlW/Nh4r4DfSaUCslGJDh0Tu10d8IAD2Pp4vuG4VEUVlJzTEIz6//6ALMvf vHzFT1Ips/QrWxo0wS3vaEBFN94AQFVe6uIQ1pD//MEVPsxhr5gyHsvgkYXDXIqLkkfH fjJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750951957; x=1751556757; 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=dIODlzXqnC6bR1NnIlD5Ra9HGYOoS6BNr32H/5XQfhE=; b=OmcWtFPTHnyKeRa79v2ls1Q3WA1v4pFi8Yog3lfQi81sW4jCPYFBMSux4CArHvJvfY Xjc0IM2Pe+BgU5P+IacAWAGcvCG3W5/MBDTCJgWYeVpLC0mKSoqim9TKIt4nom0IaHsR XDt4UBfFNpTq55qPOJwTBkhHTP2cH5Vc5wonSRIe7IyfoOs7LlERPuIt76vASy02Ok57 OVmd9JkQy3Lhi2NLpmrazYJXZifWLEl1ju+iP3ddrzNQNxLzrancH17z6SlwdVy0v4xj WXfosJHh9u5jRD4zVSaqRWv1AFh4Fx7KCXgGx6tShGX4CWJmRUojG32amzenV0J8KnoR cHwA== X-Forwarded-Encrypted: i=1; AJvYcCVmC5U3Tu1tTtf/X36i9ftBSqvzZYdJOLdXF1lfK/3lHIpVEaynfK7nHrFdSzJCG4jbGOtMloNJ1A==@kvack.org X-Gm-Message-State: AOJu0YylzTLmFYok4vL30DT9kFYZ5XDTYkgcSYG7SHdPnlIpQOnYnps5 NHYr7MT8ngVoFsVR8ms2lrA1FpAARd0UNs+xr5G3XoHK7jm5ZG+38vCI X-Gm-Gg: ASbGncuFe0/pJPwOhioiUBIEONctOh086cCVKlKfWcUC/DqchA58vto47BWpvgzk4wo wIX9TRwXYWFA/j/ylF+JI+iI1gsb6BBXdKatyt1804b3zAwcBKMi5htDoC9LGMw3CEzLh7ipBlj ve/QIQBseWgSUFkfFEidiImHpQHAzWVursc1zK2c5k5fR32br3/X3IaXRIeNwq4Os2cvzJxDzxv Hj77iJUZfr6eeMkw61GhxaD4WWKEx4vxKZqDvcuj86/fDizl1CWbN6vRULoLa9k1gARmoOJw7jg m6VgBb1xydL+pRFzY0dsXLNGRfw4jarVPG9Qyjf7kk42RGi98W27VnrdwL+fRrGoryDBLBIIonh 9zCO/HaZSnZCGMYTl+7TaVBaIRqnMnQ== X-Google-Smtp-Source: AGHT+IGOOgR6U3IUglZM4Cl6ycrypcWsOKlsDtFSbRY/qbGVasvQKBWsuTTYRYjSxtgLuzO8PX+T5Q== X-Received: by 2002:a05:6512:b8a:b0:553:a490:fee0 with SMTP id 2adb3069b0e04-554fdcf457bmr2652845e87.10.1750951956874; Thu, 26 Jun 2025 08:32:36 -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.32.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jun 2025 08:32:36 -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 05/11] kasan/loongarch: call kasan_init_generic in kasan_init Date: Thu, 26 Jun 2025 20:31:41 +0500 Message-Id: <20250626153147.145312-6-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-Transfer-Encoding: 8bit X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: CBD5340010 X-Stat-Signature: m6x4ueu7yu3cebt3sndk3qhyynnxm19q X-Rspam-User: X-HE-Tag: 1750951958-64512 X-HE-Meta: U2FsdGVkX1/qGNmJ7HIKcjfAPxyczq68c7Wg7+HB6Mb0BVxNaQlW95nufMILMtA8pRAFZqJ6vQw/x7eMPv3wE96lxqGJFHOhrRo/Avh7SN2JVKyiNhoeWU/M1LMQ7SogWhsTuERIb4+RH6nQP5TbXP54pvnjaurIQTdVPx1XvAaytfYiMOhoLLRo1TD5JbBWDhx2tcYrYY4W3b+x9DJvujnKQVhTR20RhGYLoWKUS0PXyRTt92I6RspTyhE6i9raPzboEg9iV8sn9RKxm+39ocwpvakNzjTYa31FGD8rJ/SHxrWcRBEvCRwXhCxSvaXQlx49rGNaYKHJt8ZM2VpLREy+O9IwwW7HQcOkstmOpGh1p2qcp+XtpGEwLgmdtQdw3hhVRSXZMI4AQ+FFplPscYcgUxuG+rLWUgUZasRTkpLJHVRrQBx9Ya0UNEfJzh3bHKFPgwdDNCqYl5KQvQAV/PHGitkV6o79Wvd543z5/gO7gcAlv6vphpFY7B6CVjd9nzBgjjrlJDBitOka6A5un95ZQTUoPyR2mmcEyc8FSX4eA3A2EavrCsyf5VnhDq6KqSzgQrZe9CrOfaAsrJjKAYjMHxy3qjvsDj6goTAIsH6hLhHPsYi5+RfGhBtYH3Hvx1OMfd+74dNBfXi10TggXotdULLAE7kZWgf+jEEpYHkODX++QWrTbyrtn4hiZYMENr+9BpdDtUg5guvRYsZdXUbJuXWsKnJBvBMdZHSjlUNdjkGYWkktB1nHdPFw6Whp1vc63MskE7GhncPPBeXkmIpn8LBDGLMhHoXEq6FA0FWt/NleL6Wuv5nIUOmRMSvs5kq41ShdEEdH9pabG+FKeFk6HaY3X6t/+O7aKZwut1YSKIM2lIR8OdXkTGMZIkKc6/gC8NVuC+gj+ApImbT1onZUNXgZKhhfCMzET5sfoBbKP7ieVuiPjxEz2QS9wkv3v4EiZgvs0DbxtWXBolG 24CSA3Za iJlGJtz484CM7PBEhGo8jPgpcBXpeaMFm4T7l4g4a6UqiqxYbeYjyYLTxEkeiN1Hx2jsVDMahNsxdBwxaN9BetVZRlpdoVJXOlmKo/v8/7Ai06HEhvnWlO6zTNnnx7Wam5YAkHE6xcX6MQmS3pgvrhDTQrnA1LcuZTyfhV1BszG3SlxsIfC67/Yy9zZpIhxJ0KDHKOlpCFMe0HCKPSdCnoRC70PbMDjWoN+9JO6ufDMw8Cr43mrfW7QY6yUnPEbaKgXR6LAqT9yBctzCY40DJ+POpjIacj5/iXhrwLHz03T1yejbW/UXukgXLO25w6+oA2sxqj8y7V/gTZ8zM54g2VYlA2n3v7A5Fojjce4bdLzNWyY8BRR9ltzmlpKZ04p852OUrwZjk/p0r3J7H8p5F/8JuCaUQ28lb/sfE6eTJFvdMVE54CzUc8yNz0ZK2h9kC1ukdKcaIuJodHG1GVl57h0g1FGRVPSYv3+Zog/yjc+uK5WsXGm/eCH3POg2C7hv/9Cfio1dtWvSJvs2R0vpg5BwkBDdeYHvAO96lQFziYBlPjda8sHGXAL+8Lw== 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: 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. Note that `init_task.kasan_depth = 0;` is called after `kasan_init_generic()`, which is different than in other arch `kasan_init()`. I've left this unchanged as I can't test it. Defer to loongarch maintainers. Closes: https://bugzilla.kernel.org/show_bug.cgi?id=218315 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/asm/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) -extern bool kasan_early_stage; extern unsigned char kasan_early_shadow_page[PAGE_SIZE]; #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); -#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 __aligned(PAGE_SIZE); #define __pte_none(early, pte) (early ? pte_none(pte) : \ ((pte_val(pte) & _PFN_MASK) == (unsigned long)__pa(kasan_early_shadow_page))) -bool kasan_early_stage = 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 = (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)); - kasan_early_stage = false; + kasan_init_generic(); /* Populate the linear mapping */ for_each_mem_range(i, &pa_start, &pa_end) { @@ -329,5 +327,4 @@ void __init kasan_init(void) /* At this point kasan is fully initialized. Enable error messages */ init_task.kasan_depth = 0; - pr_info("KernelAddressSanitizer initialized.\n"); } -- 2.34.1