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 532E0C7EE30 for ; Wed, 25 Jun 2025 09:53:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EA5086B00B9; Wed, 25 Jun 2025 05:53:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E55096B00BA; Wed, 25 Jun 2025 05:53:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D1CD66B00BC; Wed, 25 Jun 2025 05:53:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id BDD1E6B00B9 for ; Wed, 25 Jun 2025 05:53:19 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 7D758141BBB for ; Wed, 25 Jun 2025 09:53:19 +0000 (UTC) X-FDA: 83593460118.08.2BE67E5 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) by imf19.hostedemail.com (Postfix) with ESMTP id 877491A0005 for ; Wed, 25 Jun 2025 09:53:17 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=intKr70M; spf=pass (imf19.hostedemail.com: domain of snovitoll@gmail.com designates 209.85.167.54 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=1750845197; 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=aOegpAuvdkFcZey7AJnC2ppf18uuNZebWg0aRe4Uqy0=; b=Fe28IcW+g6QKniNJNrOmpNSk19oJr5EBi3dPLISBTuiSHsI+YLenbpj5i2rJrhPN9L5j27 aJqX89xL1BkGjduzZ6KavyQKyF7qmwL6C2QzEkTeCBYsbsOcKbwingmVeN/ezPNsW3ZHOg EakCXzXtngCs1PdZUnaX3wjbFr6WqBU= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750845197; a=rsa-sha256; cv=none; b=VU5qaD2fd1Rkz+W3FJmnBYLZw+/Az1/5k6x1Yfc/iuWJpQpwFy2CNZHvVDc8Ie5qHFksMM w4qNHlYGg6PQtIjRYE6tl/PVcGpnOdjnyWsJjmqoW2GzxFniT6BvnL3p6bYw5zMhClL7rZ 9Lu5givRqE+PdUIH49bfzDs4+UQQoj8= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=intKr70M; spf=pass (imf19.hostedemail.com: domain of snovitoll@gmail.com designates 209.85.167.54 as permitted sender) smtp.mailfrom=snovitoll@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-553644b8f56so1373731e87.1 for ; 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=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=aOegpAuvdkFcZey7AJnC2ppf18uuNZebWg0aRe4Uqy0=; b=intKr70MnagAWLyKeHevYdmBA4gycawIR49+9gJE5/nYWYDamf1kVocNHlmXXWI2zu CR08Kv6/Pftn07EPXvjnitOmEdDL/jdUmpAAsdepNSeqUqr5aCTCSRcC86cDSsWe/Y7i Om02dSAs2xPBuQ+HMVuO41n4ZLiJlNYMNonjmd3FU0nrw22JIf957sCGOzo1BQmhE3vU Ok0YZINrT8QmzidQSQSKXWDzNGb0pIkXgYnWwzX5+UR7/9AYNuiQlDiaaD6qJ1kkmLNm nVz7YUyunU2qdk1BzuDnJK94gUhPQ4FCwXomExWd60XbZKUrnxrIBSE3Rm3PPo7MFNCA XVRg== 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=dlTtNL/knJyWfvC4nDGf6ewqPUiTP7X2tqhWIxFWkIB2zZI/HzPJP4mQdgfj4AGbDN 7/TNmjIWTnXvKyH1gpLzrmtEHXOVo6M8OioZQdM5+Yv+7H/zLKlm0b22r6Qrw0hV4dys ryz+wC5hLJCMeJf37nV/JTTOaL2+eXieBFM66ffITCFNA5A4ZjnZ7dPGYaZxQyaeYDy1 B7uHc6mHLeLfzeMzDswnIOMBfJx5Z2buaNFmPmcWjT6Fu6AoCrwj2I/d8Lor/Pjwla0C 03+CUPjByvdI6MtH9sk8TX9OolN3L7plhA2/C1i0f74Yk7trGmnBhkg6VEszefQ3uWxD yyRQ== X-Forwarded-Encrypted: i=1; AJvYcCVlWiEqO2wiEwKHuf9SUjDizoeptQjw1HhQ4p5CvBXLjyNvtvZkQkM8Fdasfccdcz157vNwMCGZCw==@kvack.org X-Gm-Message-State: AOJu0YxRHesu9/gpzWTXJCxFbp+wOyvov3Fi+EjuyNWirHgtDJAMhma2 aQQue/PlrRneLygl/PpziKyqo/V33SrxUmt0PepdE/USBJyItzTmC66+ X-Gm-Gg: ASbGncsDbpDq0T6U7KhRYa+oX/2i+e2mBbYKIiAdqJqsYvBHXyUc4n63sa8ap46y1hL gFZXuXKeYUtXs8pZiH1VDgFWF480lzbk/qqpsXF1hoEK8mtv14iw43Pr2dSD9gCwjCPAeDwdXek zWHOAiIOTiom+y0S2I0Nj1ci+0pVINAmDUbAsFtPAqXT16Lq+95oYG7pmWaD4ISAqazlyFO6q4R GhGvKSNyQNMmUbYwoF1zWeWZttjZ4dkcwEF1hGKO+mRqUPbA7dYBAsY3Q8k0eRnbGnrqtmcf+2+ JDq05osFMJXOOGDsNUeVKuUGxW6OnukdyqPo//BxhxnDpEjlL/pYHoClSAmm8Nptoi3JgzWIBhW yhzMC35AA+LGV1btOADXHxldrY6QWgA== 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> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 877491A0005 X-Stat-Signature: 9m5k6eqhauptr3pt8z7bd9n5wrb1reg3 X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1750845197-103007 X-HE-Meta: U2FsdGVkX1/X/BJ+BYIAto0kvKMNiC9QVw8CjIaaNrAsJgGz0abySeaFkbMaIWDrvc0NChjqCsjQ6rMZcsykP5jsU4ct4Hj6FZqTrcek2pdScAXyGTNTcEqsQ7zTMsyAxheMskBmh66QtxShlHLL0t9kfBlpBcOqa9mgYIdhgYZ1Irw2VhCWnZ7rieCJJeIgKPVMu3q7DfuSqReD/ztlou3BdmgxEs+kfMPS+haGPWH9v3Osz0fKNo2rVrB7BcpU+wxfiY7AaBk43E/DCdOt246+iDM0ff0zxHma/6MrdxdR7ffJIjF8PzAwTGtIJggVizmH3PKxuTptLiHEUdysZ0V5n6PbpbxhhP4FJwbIdJzzG7Ly91juw7rm+iJgzkyqBDNBF02KcJVteObX0wsG2dzdMrI47UqsvL2pDs1UjiW9A3ls+9msrg2j8Slh4isRpSV0uQOj06lq/n+62+FnXBDqx7TnbEE/dUQosKUrtQNPvtoTX7RVW8UW67s0Z6/n/wCi0nozLoqAqFk+C8BaHJBugNZ13BX/AoZtxQg1WShxbzgxF4X8G3zHQMEEkstDiJfIjIKMNYrhdscR4X0OjOUR87MEU+QIdLE5ABwIfGfo7NulYOG0blQTepkOGKXW8OoP1w90KV+sQPirmUMHuoO8jHtZVYlCSFYf7sRejKgG4S4HPansARBbZgTvY+FjnuCaZTp/6sFAwO/eLD/8ktsHfdjhM8bH5XKSXfS3F5GcjHdsK6b6hK7egOuoR4A1npVS8oC5P0DI0d9MLjHsnzJnx2viRPhF7b/3Y6fRv1+QekwKjwsniAzBEGyvr/9kfR98q0unuEVtdcSoO7PRWYaSLPLpp/6aLPgMWRLAhP8Y0jurVuaCRwXA+aQIV9d4xc98cRLv3Ens0VvdVb3wKfnMj4hKdj5hKLXS86x8Y6ZhAa+45vPiPj83G2jtne2bh6WJeuWlJpngvxiUtE9 H93tnv28 Vr5Nun74CWvaRcvG7YPAiS2VRxeuafKaqL+VMky8EJyHezY1CWVrNPV02TxgcRUi9b+etRsI0zZ5PPoErClcY2VuNvRy3QyAr1srJaGgH86P1WD8s9bw4eNoRz7wRSVfILys9hBUUTrUSo3PbvUSYVnMDEPnT5hizwIMTbVXI9bD3BQXJhKsClEklVkDdW4Nq7LBgwuSsDLb75C5HDU80MV6yuXiyMFFlJdue8xpwQ/roiPrQn3LA5MjnIozg17+zyrpWB9Onnhws5dFeqGxkfbbq58dzyLqrCMboMLUGO2wShphPTrNheFnVmGLncgMRUM50IwZoSKYX+YiDlNjntg2i00+wZgZuqbdgFfcrKTShT3polsYufj/s2NysEDeBtZcDNYHrsa5g9l9Uxl7gxHuK/ro6QYK75hkKL4jApW9CMihd7muwq9pZ0yfSPygzwDzYao337otcTlyOsJsohuS9YpuksRJjmFP30hEJDzsF/MPnVZ+8/adainypFZnov+OUPS6YqNxTXgHkms9UCJrAaVxnpXKc8anj3tWlD1tIRGzsbXf1Qkg2Zw== 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. 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