From patchwork Mon Jan 29 21:06:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Desnoyers X-Patchwork-Id: 13536393 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 2BA18C47DA9 for ; Mon, 29 Jan 2024 21:06:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AD63B6B0095; Mon, 29 Jan 2024 16:06:52 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A87246B0098; Mon, 29 Jan 2024 16:06:52 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 94F6F6B0099; Mon, 29 Jan 2024 16:06:52 -0500 (EST) 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 863486B0095 for ; Mon, 29 Jan 2024 16:06:52 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 5A755120B07 for ; Mon, 29 Jan 2024 21:06:52 +0000 (UTC) X-FDA: 81733583064.17.5AA1D89 Received: from smtpout.efficios.com (smtpout.efficios.com [167.114.26.122]) by imf05.hostedemail.com (Postfix) with ESMTP id A0F4910002B for ; Mon, 29 Jan 2024 21:06:50 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=efficios.com header.s=smtpout1 header.b=cc6AJwaW; dmarc=pass (policy=none) header.from=efficios.com; spf=pass (imf05.hostedemail.com: domain of mathieu.desnoyers@efficios.com designates 167.114.26.122 as permitted sender) smtp.mailfrom=mathieu.desnoyers@efficios.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706562410; 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=4eglKSuP5hRMgJDtYBM8e3IeHgtqbXrVeDIAVtroytM=; b=76v7jbdUzF9m6FNOb0CivcOYzecenUhXEH+a5wly8T5bIde7Vh1AVuZ2Lw4mdHSYRcS5Rs bdio95BX9osGYZDCQfe/TNdPSgsJXH+NXNkECZUOFiiXwZ/RTLenRGAmEYRTu9+sqo+qsb 1P1Lt1J5oQBdg//4mGuWoNecE8sLfg8= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=efficios.com header.s=smtpout1 header.b=cc6AJwaW; dmarc=pass (policy=none) header.from=efficios.com; spf=pass (imf05.hostedemail.com: domain of mathieu.desnoyers@efficios.com designates 167.114.26.122 as permitted sender) smtp.mailfrom=mathieu.desnoyers@efficios.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706562410; a=rsa-sha256; cv=none; b=Cyw58mX3gDZgZOQ2+lxEixoK5XYCYz59N1q8utYL2E2acAElAB+iA4DQ5MKDQGxA6OWkBu 0aPBlGJbPR655KuJjljAbUHmTVj4z5RG7imzoUMfQn38SVN8URxaPsM0kGr+IKk1eurY03 7uj0J8L4KfLGeud9NLyxlvreCtW2sRs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=efficios.com; s=smtpout1; t=1706562409; bh=J/9xbvTV5OyXm1sKq5praOxLctUBdW1K5E3YjxgQCJw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cc6AJwaW53TEJB1C0GzSIJUzCi5gxtxRJraR4hxkjY2GxsNHMVrz6uJxMLtQ1zned Ef7iRius/wZhslKg0oQywqcSmk3PGgBdxZ6oGNhuk6jdn6fcLfQujEzp+MVsRJYcUF uZmpH2/Ys3VNZHySEu2ZNYw6+XPlXE7A6OAufT+0Z0TfLAG4YNuhZg/kbKrmnO2n+p PwONvdsMk5OkCjaSh4FhYhYkWT++n20q/PymRiR4jJ+xTPBMtcSZ+gDyadMQZ/xQ5A noWAjPXRAugfKSLLGG14W5SJRQMfmB/jnZWHGL5PKMdfiqGwl2IpZboxy9HzJZhR8p q4TbPNIbozRyQ== Received: from thinkos.internal.efficios.com (192-222-143-198.qc.cable.ebox.net [192.222.143.198]) by smtpout.efficios.com (Postfix) with ESMTPSA id 4TP17s32c2zVYT; Mon, 29 Jan 2024 16:06:49 -0500 (EST) From: Mathieu Desnoyers To: Dan Williams , Vishal Verma , Dave Jiang Cc: linux-kernel@vger.kernel.org, Mathieu Desnoyers , Andrew Morton , Linus Torvalds , linux-mm@kvack.org, linux-arch@vger.kernel.org, Matthew Wilcox , linux-cxl@vger.kernel.org, nvdimm@lists.linux.dev Subject: [RFC PATCH 1/7] Introduce cache_is_aliasing() across all architectures Date: Mon, 29 Jan 2024 16:06:25 -0500 Message-Id: <20240129210631.193493-2-mathieu.desnoyers@efficios.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240129210631.193493-1-mathieu.desnoyers@efficios.com> References: <20240129210631.193493-1-mathieu.desnoyers@efficios.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: A0F4910002B X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: xuo6pk9gitmnzarsrwuxfcnzzwy4ryrk X-HE-Tag: 1706562410-580998 X-HE-Meta: U2FsdGVkX192ZBEWfEFoKbaL3lbBW4u9Ffuvl1j8C1ug1yrhsRFsMvsQsg/wuKJTdG+6xyymN1ERyDFYIaLwN3d3+/ij879UiDrS8O7EbWmjQAvgmFOYS/n/1/AgyeXS0urT+Io1R0XFuxZ0WjpWjWIJeRR7CNWLxLNYRrKnwvx+P/IXQ3qFaSPcAODjLWaPD9lh+tbl1rKrOhAydPxp4BvwAdsTAUC0Ije1+0g9Ks3FC7O9tsI2fguMYEj8ax4QCNwIksiaHNN9Ijk6ap9nNtyvJ8JONIbsoo6qFpWYfDMCCQzvToSgY4MR17wfnXUr9Nr+rXUUtz39TiDLw1PnhOuydC1Z2v+eMCsSoBcqEu/vsYtzixMnBNQZkgV5GrI1WIvg4N82yFDBU4ueEBWdlLY1fZY41Wq6+qLVrwCgssx2qBUqtlpEcmmI0qWxEc9bl5qQtqx2y+id7s970LkMgos3xML1iTYQ4dwXRHbeL35l4vVqD3ii+McO6rY9+FfD87XO8NfNrd76Un6ac/aFSYAs7jsgdOttS3cuhfQ/puugux9Ytpp/2cEVIiyFZVBh4rCL/NMaqz7MrSYi8dbiEFDoDRuwX8LRvekOk6I6TXO2rG9pOCrFexckqoUKwuWNS4YObrn7ihFYUubaGKqOPV6Z4Jk99Rfl0Ph8FWLABQnljHItFugD1XO36OjSLhm4du7fmvpkV/5lTEFw+MDeJb+YvrDRm5ayRhRShCY76nhKHPGhtAKbp2LQPJVGVBMuO6+RFpTMElT9a7DPrqdCRpPRw2TWitt0FoVKKVkTFlipXe7fE2Vg53/Pdad+Jyr4mbYhbaPx0SZnpmFJp7jV1CECHnnKWXYrKzQ+pPBD40eTFNmsIYUZSQSD4DBQOWSjm06s58grXJMox/5+PoVDsWo6XhiV/mT7iaLuZux8ml/ohSWqKWO1HsdU0hYs9kFPPP98bxNmnSpa+i+9S0r K4uMcAKB hkvVJmG7GmvIS+7lUiAJ1N5koQ6qWp9CkldN6pcKpnDtX2H5DM5nbW+9lcuE1lWQg9TgrpS6PMjCZ/ar0z0ce6Fw/RobhiIVXscJ6CJFEh/ReltPHW2XioNcaN4xyWQjmq6wSCXJLL+K+Nx+nu91DFMKuTD0UUm++mut8SBMDTVyM+BGsSA7vRNb1k/J1aJX+uSkmpml90q4EjUipGFuMdlgH+oZxYlu76t3MkIi6KlSDtKvi57pr3HZIQv8BKv4V8eSy8AOVb8xA6uC5s8lWini+FMXping3s4fgQSGRxnSJVcwW4v1hJs3Kre43z8Aw/6EvDAzZygU9w++N9L4uN/cSJimQdWaBF7fEHqKJkRFBNVTyio+Cw/xdPhthxqTtdQnLH9cPrXC76Npa29kaKwrK3djmyR00XwvbHQSIa019fWxMy1uzDII9gzVBsCgjZqayxVJBq5brHhZiu/1OHkT9F3OvvrN8nSQDbHr5XNs+YOZ00M+52UiNYC2c0kSzpsZ4oq9WOXIAA7Ckk0heHlwT0LYyP6bb6SHUyn7poeDkn5+naMs5Y6wK9DjCquCU8CX/YV1jQs6VFYDXsfie7OiL8tzOtl7mTSENe/rwomuUlJGCFK8RI7JHPV6Y5UwA2AYffNPcGExAwfA= 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: Introduce a generic way to query whether the dcache is virtually aliased on all architectures. Its purpose is to ensure that subsystems which are incompatible with virtually aliased caches (e.g. FS_DAX) can reliably query this. For dcache aliasing, there are three scenarios dependending on the architecture. Here is a breakdown based on my understanding: A) The dcache is always aliasing: (ARCH_HAS_CACHE_ALIASING=y) * arm V4, V5 (CPU_CACHE_VIVT) * arc * csky * m68k (note: shared memory mappings are incoherent ? SHMLBA is missing there.) * sh * parisc B) The dcache aliasing depends on querying CPU state at runtime: (ARCH_HAS_CACHE_ALIASING_DYNAMIC=y) * arm V6, V6K (CPU_CACHE_VIPT) (cache_is_vipt_aliasing()) * mips (cpu_has_dc_aliases) * nios2 (NIOS2_DCACHE_SIZE > PAGE_SIZE) * sparc32 (vac_cache_size > PAGE_SIZE) * sparc64 (L1DCACHE_SIZE > PAGE_SIZE) * xtensa (DCACHE_WAY_SIZE > PAGE_SIZE) C) The dcache is never aliasing: * arm V7, V7M (unless ARM V6 or V6K are also present) (CPU_CACHE_VIPT) * alpha * arm64 (aarch64) * hexagon * loongarch (but with incoherent write buffers, which are disabled since commit d23b7795 ("LoongArch: Change SHMLBA from SZ_64K to PAGE_SIZE")) * microblaze * openrisc * powerpc * riscv * s390 * um * x86 Link: https://lore.kernel.org/lkml/20030910210416.GA24258@mail.jlokier.co.uk/ Signed-off-by: Mathieu Desnoyers Cc: Andrew Morton Cc: Linus Torvalds Cc: linux-mm@kvack.org Cc: linux-arch@vger.kernel.org Cc: Dan Williams Cc: Vishal Verma Cc: Dave Jiang Cc: Matthew Wilcox Cc: linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev --- arch/arc/Kconfig | 1 + arch/arm/include/asm/cachetype.h | 3 +++ arch/arm/mm/Kconfig | 2 ++ arch/csky/Kconfig | 1 + arch/m68k/Kconfig | 1 + arch/mips/Kconfig | 1 + arch/mips/include/asm/cachetype.h | 9 +++++++++ arch/nios2/Kconfig | 1 + arch/nios2/include/asm/cachetype.h | 10 ++++++++++ arch/parisc/Kconfig | 1 + arch/sh/Kconfig | 1 + arch/sparc/Kconfig | 1 + arch/sparc/include/asm/cachetype.h | 14 ++++++++++++++ arch/xtensa/Kconfig | 1 + arch/xtensa/include/asm/cachetype.h | 10 ++++++++++ include/linux/cacheinfo.h | 8 ++++++++ mm/Kconfig | 10 ++++++++++ 17 files changed, 75 insertions(+) create mode 100644 arch/mips/include/asm/cachetype.h create mode 100644 arch/nios2/include/asm/cachetype.h create mode 100644 arch/sparc/include/asm/cachetype.h create mode 100644 arch/xtensa/include/asm/cachetype.h diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index 1b0483c51cc1..969e6740bcf7 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -6,6 +6,7 @@ config ARC def_bool y select ARC_TIMERS + select ARCH_HAS_CACHE_ALIASING select ARCH_HAS_CACHE_LINE_SIZE select ARCH_HAS_DEBUG_VM_PGTABLE select ARCH_HAS_DMA_PREP_COHERENT diff --git a/arch/arm/include/asm/cachetype.h b/arch/arm/include/asm/cachetype.h index e8c30430be33..b03054b35c74 100644 --- a/arch/arm/include/asm/cachetype.h +++ b/arch/arm/include/asm/cachetype.h @@ -16,6 +16,9 @@ extern unsigned int cacheid; #define cache_is_vipt() cacheid_is(CACHEID_VIPT) #define cache_is_vipt_nonaliasing() cacheid_is(CACHEID_VIPT_NONALIASING) #define cache_is_vipt_aliasing() cacheid_is(CACHEID_VIPT_ALIASING) +#ifdef CONFIG_ARCH_HAS_CACHE_ALIASING_DYNAMIC +#define cache_is_aliasing() cache_is_vipt_aliasing() +#endif #define icache_is_vivt_asid_tagged() cacheid_is(CACHEID_ASID_TAGGED) #define icache_is_vipt_aliasing() cacheid_is(CACHEID_VIPT_I_ALIASING) #define icache_is_pipt() cacheid_is(CACHEID_PIPT) diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index c164cde50243..23af93cdc03d 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -539,9 +539,11 @@ config CPU_CACHE_NOP bool config CPU_CACHE_VIVT + select ARCH_HAS_CACHE_ALIASING bool config CPU_CACHE_VIPT + select ARCH_HAS_CACHE_ALIASING_DYNAMIC if CPU_V6 || CPU_V6K bool config CPU_CACHE_FA diff --git a/arch/csky/Kconfig b/arch/csky/Kconfig index cf2a6fd7dff8..439d7640deb8 100644 --- a/arch/csky/Kconfig +++ b/arch/csky/Kconfig @@ -2,6 +2,7 @@ config CSKY def_bool y select ARCH_32BIT_OFF_T + select ARCH_HAS_CACHE_ALIASING select ARCH_HAS_DMA_PREP_COHERENT select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_HAS_SYNC_DMA_FOR_CPU diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 4b3e93cac723..216338704f0a 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -3,6 +3,7 @@ config M68K bool default y select ARCH_32BIT_OFF_T + select ARCH_HAS_CACHE_ALIASING select ARCH_HAS_BINFMT_FLAT select ARCH_HAS_CPU_FINALIZE_INIT if MMU select ARCH_HAS_CURRENT_STACK_POINTER diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 797ae590ebdb..46981c507ceb 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -4,6 +4,7 @@ config MIPS default y select ARCH_32BIT_OFF_T if !64BIT select ARCH_BINFMT_ELF_STATE if MIPS_FP_SUPPORT + select ARCH_HAS_CACHE_ALIASING_DYNAMIC select ARCH_HAS_CPU_FINALIZE_INIT select ARCH_HAS_CURRENT_STACK_POINTER if !CC_IS_CLANG || CLANG_VERSION >= 140000 select ARCH_HAS_DEBUG_VIRTUAL if !64BIT diff --git a/arch/mips/include/asm/cachetype.h b/arch/mips/include/asm/cachetype.h new file mode 100644 index 000000000000..ce16ccde1841 --- /dev/null +++ b/arch/mips/include/asm/cachetype.h @@ -0,0 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_MIPS_CACHETYPE_H +#define __ASM_MIPS_CACHETYPE_H + +#include + +#define cache_is_aliasing() cpu_has_dc_aliases + +#endif diff --git a/arch/nios2/Kconfig b/arch/nios2/Kconfig index d54464021a61..949dcf99e147 100644 --- a/arch/nios2/Kconfig +++ b/arch/nios2/Kconfig @@ -2,6 +2,7 @@ config NIOS2 def_bool y select ARCH_32BIT_OFF_T + select ARCH_HAS_CACHE_ALIASING_DYNAMIC select ARCH_HAS_DMA_PREP_COHERENT select ARCH_HAS_SYNC_DMA_FOR_CPU select ARCH_HAS_SYNC_DMA_FOR_DEVICE diff --git a/arch/nios2/include/asm/cachetype.h b/arch/nios2/include/asm/cachetype.h new file mode 100644 index 000000000000..f52a16cdb496 --- /dev/null +++ b/arch/nios2/include/asm/cachetype.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_NIOS2_CACHETYPE_H +#define __ASM_NIOS2_CACHETYPE_H + +#include +#include + +#define cache_is_aliasing() (NIOS2_DCACHE_SIZE > PAGE_SIZE) + +#endif diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig index d14ccc948a29..e8c217744d83 100644 --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig @@ -8,6 +8,7 @@ config PARISC select HAVE_FUNCTION_GRAPH_TRACER select HAVE_SYSCALL_TRACEPOINTS select ARCH_WANT_FRAME_POINTERS + select ARCH_HAS_CACHE_ALIASING select ARCH_HAS_DMA_ALLOC if PA11 select ARCH_HAS_ELF_RANDOMIZE select ARCH_HAS_STRICT_KERNEL_RWX diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 7500521b2b98..6465ef80c055 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -2,6 +2,7 @@ config SUPERH def_bool y select ARCH_32BIT_OFF_T + select ARCH_HAS_CACHE_ALIASING select ARCH_ENABLE_MEMORY_HOTPLUG if SPARSEMEM && MMU select ARCH_ENABLE_MEMORY_HOTREMOVE if SPARSEMEM && MMU select ARCH_HAVE_NMI_SAFE_CMPXCHG if (GUSA_RB || CPU_SH4A) diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 49849790e66d..a5edcbfaf6f8 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -13,6 +13,7 @@ config 64BIT config SPARC bool default y + select ARCH_HAS_CACHE_ALIASING_DYNAMIC select ARCH_MIGHT_HAVE_PC_PARPORT if SPARC64 && PCI select ARCH_MIGHT_HAVE_PC_SERIO select DMA_OPS diff --git a/arch/sparc/include/asm/cachetype.h b/arch/sparc/include/asm/cachetype.h new file mode 100644 index 000000000000..8871e461cf23 --- /dev/null +++ b/arch/sparc/include/asm/cachetype.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_SPARC_CACHETYPE_H +#define __ASM_SPARC_CACHETYPE_H + +#include + +#ifdef CONFIG_SPARC32 +extern int vac_cache_size; +#define cache_is_aliasing() (vac_cache_size > PAGE_SIZE) +#else +#define cache_is_aliasing() (L1DCACHE_SIZE > PAGE_SIZE) +#endif + +#endif diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index 7d792077e5fd..ae99aa88595a 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -2,6 +2,7 @@ config XTENSA def_bool y select ARCH_32BIT_OFF_T + select ARCH_HAS_CACHE_ALIASING_DYNAMIC select ARCH_HAS_BINFMT_FLAT if !MMU select ARCH_HAS_CURRENT_STACK_POINTER select ARCH_HAS_DEBUG_VM_PGTABLE diff --git a/arch/xtensa/include/asm/cachetype.h b/arch/xtensa/include/asm/cachetype.h new file mode 100644 index 000000000000..4329c885fe5f --- /dev/null +++ b/arch/xtensa/include/asm/cachetype.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_XTENSA_CACHETYPE_H +#define __ASM_XTENSA_CACHETYPE_H + +#include +#include + +#define cache_is_aliasing() (DCACHE_WAY_SIZE > PAGE_SIZE) + +#endif diff --git a/include/linux/cacheinfo.h b/include/linux/cacheinfo.h index d504eb4b49ab..86f9a099fd5d 100644 --- a/include/linux/cacheinfo.h +++ b/include/linux/cacheinfo.h @@ -138,4 +138,12 @@ static inline int get_cpu_cacheinfo_id(int cpu, int level) #define use_arch_cache_info() (false) #endif +#ifdef CONFIG_ARCH_HAS_CACHE_ALIASING +#define cache_is_aliasing() true +#elif defined(CONFIG_ARCH_HAS_CACHE_ALIASING_DYNAMIC) +#include +#else +#define cache_is_aliasing() false +#endif + #endif /* _LINUX_CACHEINFO_H */ diff --git a/mm/Kconfig b/mm/Kconfig index 57cd378c73d6..08f6ca0b465a 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -1016,6 +1016,16 @@ config IDLE_PAGE_TRACKING See Documentation/admin-guide/mm/idle_page_tracking.rst for more details. +# Architectures which alias the data cache (VIVT or VIPT with dcache +# aliasing) need to select this. +config ARCH_HAS_CACHE_ALIASING + bool + +# Architectures which need to query at runtime whether the data cache is +# aliased need to select this. +config ARCH_HAS_CACHE_ALIASING_DYNAMIC + bool + config ARCH_HAS_CACHE_LINE_SIZE bool