From nobody Wed Oct 8 16:43:50 2025 Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) (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 106632EA48F; Thu, 26 Jun 2025 15:32:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750951961; cv=none; b=pSDEIq+YeATSdymNNtDt0XvBQzKAMi2WBLom2tpBj5PcnEP57rV89WVX3Zw5oHhRiw3ok56rZELZ0TN3RrJhqMhnBA1PoXzL1JuLbUCIKIxaVeIhouXQzHhYGNn7jvAtQQ/jnaWG67XkUiy6KZyw9/li10xlclKzA01FW3zd1zA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750951961; c=relaxed/simple; bh=HNUbUpTuj2kTdby5SxEvjf70Sdazkxj0CBQjBAN+2gA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=N+FdCQ/gLIOOw/UwSsfgz4Gpsar5CuUZl9U4+PBr/oHpHAKD/rh23FX9zamB51HAV3sbdYDl0ubzmdwpDL90B+vvY183uw6t3422v3aqOJgjuuGrKapaC2qKsNHmauBtHjHf9JxwnTE0+DL+mNNOS9uS3cqhj0DQGobwonhV1qY= 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=eC0EeL63; arc=none smtp.client-ip=209.85.167.50 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="eC0EeL63" Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-553b16a0e38so1245548e87.1; 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=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=dIODlzXqnC6bR1NnIlD5Ra9HGYOoS6BNr32H/5XQfhE=; b=eC0EeL635S42Qkjrd0/61tdCHmUZ0Jx5sy78EkOWzTIWDmg5W1QV7KPof9nLw6Sudo 8j8oSF+CMwneQta3Q3+fK8hc9d5+OhvQWyNMcocGAYB9N3DAACHvLwOZ7Lr2ypXj/bfY FZiFeFbSmyi09i5Qca/iUhY+ZipHj/dEp4Afb67nceyBWKwZopZSreLJBrvTeSJ4Ugid GT/3jY6O7gRkYzXsJeOlM8NkJIbInAISDqvbgxigXuHeRKSwHsaap5FS5cWQ5I9Qd5f3 9VnPT4CIOqC8auqxMzZa96Kf+016hUhPV9iKmtz237P7CrS1vN6wus2HTEKdprOd4BDn 2QeQ== 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=TpRDGSOBwDDwVQu1Do8WfWFTq6CokBOsClPyiIARe9TtYTtV9bAsZvcXVjc0ufMZET i/g6r8UCsOkJQ98kVCMMg5HWDB6Ma1q6o/+940eDI7ze0TPUZ/KQZyRIBM2YDnRLr81Z Sg+x5s3vPnKJAM+f3FHJ+oXFnlVE8KKXWnIoNSvwSUqWnnRWBhXsJ3z2p968r8TB9HyO JwKR0UP8YwvgzlofhhlTPlV3ZG4mHtfuGbv4eLWtsPpWbvLcbTX4nVNi/ZNXz/7u7SEd tIM8nULjpORiE60qjdhGpOfP69SXD6Ax3VDyn1jEUMLV8roweyktBo4jUmM2SuiirmZ+ bw8A== X-Forwarded-Encrypted: i=1; AJvYcCV5JIKjL3dZvLZ6k9m2hY9STMrEvATHDyUFb96LOftqHNkvf9vLTsOz/8/82iY0L2fU9mg4ismLG7M64w==@vger.kernel.org, AJvYcCVsQP3auF1ibHemvnuBe02E0tEkEDYIL/N+FBsQmWOhvO84domyveW7ANo8XUD+uaco4jXU0KPkI59yhGk=@vger.kernel.org X-Gm-Message-State: AOJu0YxeDSj5SNSIcHK7aBz7y/f2eJOYHFATeidSGBOqfkkd1udyHK6E nxT+GTp1B65VymesuT1If8WVG2wszGDmtmFx1SgNpmRIGbjF8BrwVaKS X-Gm-Gg: ASbGnctDAvkghJu0MQRcxz5o+/istMJPe4YmUit4ZlT+wJdNW+J5Th2K1QABdavOO2X SSWAj8hF0KaSzAaAnU+0I2gS7Uz8he6MvH5sDMIS6zqhqTkvQHBhb+NyDvtSwOwchnp+YTL28AT OB3OHA20mPQF5PqaZCTLrukIVvW5kRErj7hlKTKjxhfNbglV1vJD3ANB5AN9D0iaB21mTd4dks4 xhXtZu+Maq6JzMlZsqMRRCTKeg8WCOxQCUYKtbKssd+lop/nl/yfRtEnDuvs2QqZnTvnLvHBAyb YS5pndkjpAdmSywIX7z4BqkR7rv4JVvvYGH6sSJezthCZmzFdjR/Yq4lRFGZT8z4RWawB/L+VpG gnUNjUjiCjE8S+H5nNaWkYttn0Z6Rlw== 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> 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. Note that `init_task.kasan_depth =3D 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=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