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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D1823C83F34 for ; Thu, 17 Jul 2025 15:03:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=VRWtCqN4gGqd6yPrpIGE+tNFX85GZHYF3fcEoa01OeA=; b=uK/gTGTGh4GtOl dTjfcThc0Je2sP7/nCzDSDXIdXKvVYiJYLAp4NTBeT8L0CE3MR3LKZuVcsnKusTBjwE2jcjl4AUKA UC5XZ1Pzvlk0htJM/4qagZmaLMTlvNrKByla7O6coihfalB/1Qswa/zKuyNgd+3FOVBkGcLD5jY5e IMNpDQkSqZV6vR2Y3ZrfR3IbIsvK3TZywZ8yLB2Lj7tdK298CsbtB5T1GawFqckgNoQkmegL3sd9O wEImofImmLCtT3OsUmsbBZqADM6/5psn/WeXAr++dze5Dhxuc6WDbR/KoCQowfmGrW4Pu31cUmmQZ Ff2506Ut/uqmtTD8j1lg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1ucQ97-0000000ASK3-036a; Thu, 17 Jul 2025 15:03:41 +0000 Received: from mail-lf1-x135.google.com ([2a00:1450:4864:20::135]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1ucPaf-0000000AN4v-3fMi; Thu, 17 Jul 2025 14:28:07 +0000 Received: by mail-lf1-x135.google.com with SMTP id 2adb3069b0e04-555024588a8so978352e87.0; Thu, 17 Jul 2025 07:28:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752762484; x=1753367284; darn=lists.infradead.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=VQlEQnJy2HJRDhHnfkaTRfud2Lma6wEowy/1dG9z9wI=; b=dIlR1TAPBg2NxqxtVrAnEvdUnZPmxr5DBNuvXC/gJy/b82HkUJTrAgcaZWzqNRtSEz jyOvv6nSIZokyHXhBlkHPMWmAnr5BpfiuGdCpjYsYPMrbFOFVmc3bCW/Jcvjg0QPqkX9 HpqKe/D4qb8Za0GJ54d0gyQ8zl+MsmhJMGzmzb5wu9Nffg4/42b6nQq59KiREH7Kgi4r dPgyM5Z1eqOVsOyo5KZK3KthW1UdqV9/Si5DQEeZuwBnekGqSymlB+icZH1eZXdPdS/M dyCQaYpjaPHWydzTl8D/Wq+NLrIVU2kHi40AI53iCneXjz5fxo8zG3OS1NhH6nRicJAl dbwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752762484; x=1753367284; 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=VQlEQnJy2HJRDhHnfkaTRfud2Lma6wEowy/1dG9z9wI=; b=I2N6RKqpEHgKZqiN/iWGgtP04PtBvppaf2zCtR94wPqv+xG3WBI3VLSHYTPqgJ5Ahj CT/09scHK3a2PE46TWjr2WyHXL17TKGBIIShsBdAdfMd9cdQIZehllXbGZJjSUaH9hxR pvuqINY1JCRLr/49fQ4deFZFDAWcLyuf5z1ZaV62ipTcQftFJRlFOtc6+uhnIRG8diZS bVt/Ux2FhyAeoe/CASbwswgmd4o4kqeAHh+apI0a83eGCzSdLdvjL+b5ElfI8EIgee67 p+kTK29dyT+DbBWIPnxD8HqEsSVp3XRhLqonoVXPyAMsBFGdjhWced9NY+XkJcsknSn/ nxfw== X-Forwarded-Encrypted: i=1; AJvYcCUdTQrY4L01UQxnyisB3AlpEQLXNifMYOoXJ/yVKvxXQ6Xw3KHaI4YKRHjRsVkJ7N9qA39y3EAQiQA=@lists.infradead.org, AJvYcCV9OkIRBV5Vfr0+Q0smK1gjAalPg2Wuw5HFX8M+fAOCZDNnOEOjXHs+l4PINcKfd+XKXhIosRCCR2PTVA==@lists.infradead.org X-Gm-Message-State: AOJu0YyGVUSGBtM4tWdwxfn38ZpH1G42i/MoNkuiu2+KArgsQIsGLQBD eaR/2/uYMr07F5MKdYEIPGB4Ftp022fNno4YH5HDaodi9QEjzRHDKaJ3 X-Gm-Gg: ASbGncv5DlmpMhp1J5J0GvOmxJkrmRxJBG1dHF0y0DKwVyA4JOFJ5po1Q2PHxdtiowy mJlF2GobeRQbksnI0h1vmXrcYlDNyl8aP7sOwerDS2bn1BonQrRn7nZlJClMI8gL0YA49K3xF69 UZKsXO88JXKt7A2V5baU1evbxdcnp3scWIiAnVw9hUyCkIBIO4e9r1NvkJQ0G7b1LAoJ5BEVbdD R+5aa0QFcp4R1SMMOmwsqSFiimq3RiZ3zAqmon7X0+f5RRZF9oVDYc0U+1epVfXo6ki5xT8tdib cUE9OnzTGz7SKijnUBf+hel6gQVqW5NTCCRgbf9cJOSFwHgZp9k8CyjwYBqI8kqvDnYnS15KzKD H676WF1NG69V2eJC2NZ+uXbUSRUeLadkztnUvE/G1PzovIbMD/XXUKidSAmgXcd/1HnjZ X-Google-Smtp-Source: AGHT+IGXa3L1SWxkZTnlyx1w4BEvo8LnYJCQl11jQhxF60PeWT+4RjpJebmC/Vi8BeBawEBpCpZoXA== X-Received: by 2002:a05:6512:2310:b0:55a:271e:965c with SMTP id 2adb3069b0e04-55a271e97f2mr1332318e87.55.1752762484050; Thu, 17 Jul 2025 07:28:04 -0700 (PDT) Received: from localhost.localdomain (178.90.89.143.dynamic.telecom.kz. [178.90.89.143]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-55989825fe3sm3022975e87.223.2025.07.17.07.28.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Jul 2025 07:28:02 -0700 (PDT) From: Sabyrzhan Tasbolatov To: hca@linux.ibm.com, christophe.leroy@csgroup.eu, andreyknvl@gmail.com, agordeev@linux.ibm.com, akpm@linux-foundation.org Cc: ryabinin.a.a@gmail.com, glider@google.com, dvyukov@google.com, kasan-dev@googlegroups.com, 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, snovitoll@gmail.com Subject: [PATCH v3 07/12] kasan/loongarch: select ARCH_DEFER_KASAN and call kasan_init_generic Date: Thu, 17 Jul 2025 19:27:27 +0500 Message-Id: <20250717142732.292822-8-snovitoll@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250717142732.292822-1-snovitoll@gmail.com> References: <20250717142732.292822-1-snovitoll@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250717_072805_936175_46BD9143 X-CRM114-Status: GOOD ( 13.06 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org LoongArch needs deferred KASAN initialization as it has a custom kasan_arch_is_ready() implementation that tracks shadow memory readiness via the kasan_early_stage flag. Select ARCH_DEFER_KASAN to enable the unified static key mechanism for runtime KASAN control. Call kasan_init_generic() which handles Generic KASAN initialization and enables the static key. Replace kasan_arch_is_ready() with kasan_enabled() and delete the flag kasan_early_stage in favor of the unified kasan_enabled() interface. Note that init_task.kasan_depth = 0 is called after kasan_init_generic(), which is different than in other arch kasan_init(). This is left unchanged as it cannot be tested. Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217049 Signed-off-by: Sabyrzhan Tasbolatov --- Changes in v3: - Added CONFIG_ARCH_DEFER_KASAN selection to enable proper runtime control --- arch/loongarch/Kconfig | 1 + arch/loongarch/include/asm/kasan.h | 7 ------- arch/loongarch/mm/kasan_init.c | 7 ++----- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig index 4b19f93379a..07130809a35 100644 --- a/arch/loongarch/Kconfig +++ b/arch/loongarch/Kconfig @@ -9,6 +9,7 @@ config LOONGARCH select ACPI_PPTT if ACPI select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI select ARCH_BINFMT_ELF_STATE + select ARCH_DEFER_KASAN select ARCH_DISABLE_KASAN_INLINE select ARCH_ENABLE_MEMORY_HOTPLUG select ARCH_ENABLE_MEMORY_HOTREMOVE diff --git a/arch/loongarch/include/asm/kasan.h b/arch/loongarch/include/asm/kasan.h index 62f139a9c87..0e50e5b5e05 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 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv