Add PMEM support for RISC-V
v5 cover Add PMEM support for RISC-V
The Linux NVDIMM PEM drivers require arch support to map and access the persistent memory device. This series adds RISC-V PMEM support using recently added Svpbmt and Zicbom support.
First two patches are fixes and remaining two patches add the required PMEM support for Linux RISC-V.
These patches can also be found in riscv_pmem_v5 branch at:
https://github.com/avpatel/linux.git
Changes since v4:
- Simplify PATCH2 by implementing RISC-V specific arch_memremap_wb()
Changes since v3:
- Pickup correct version of Drew's patch as PATCH1
Changes since v2:
- Rebased on Linux-6.1-rc1
- Replaced PATCH1 with the patch proposed by Drew
Changes since v1:
- Fix error reported by test bot
https://lore.kernel.org/all/[email protected]/
Andrew Jones (1):
RISC-V: Fix compilation without RISCV_ISA_ZICBOM
Anup Patel (3):
RISC-V: Fix MEMREMAP_WB for systems with Svpbmt
RISC-V: Implement arch specific PMEM APIs
RISC-V: Enable PMEM drivers
arch/riscv/Kconfig | 1 + arch/riscv/configs/defconfig | 1 + arch/riscv/include/asm/cacheflush.h | 8 ------ arch/riscv/include/asm/io.h | 5 ++++ arch/riscv/mm/Makefile | 1 + arch/riscv/mm/cacheflush.c | 38 ++++++++++++++++++++++++++ arch/riscv/mm/dma-noncoherent.c | 41 ----------------------------- arch/riscv/mm/pmem.c | 21 +++++++++++++++ 8 files changed, 67 insertions(+), 49 deletions(-) create mode 100644 arch/riscv/mm/pmem.c
Signature · 1 line
2.34.1
PATCH v5 1/4 RISC-V: Fix compilation without RISCV_ISA_ZICBOM
From: Andrew Jones <[email protected]>
riscv_cbom_block_size and riscv_init_cbom_blocksize() should always be available and riscv_init_cbom_blocksize() should always be invoked, even when compiling without RISCV_ISA_ZICBOM enabled. This is because disabling RISCV_ISA_ZICBOM means "don't use zicbom instructions in the kernel" not "pretend there isn't zicbom, even when there is". When zicbom is available, whether the kernel enables its use with RISCV_ISA_ZICBOM or not, KVM will offer it to guests. Ensure we can build KVM and that the block size is initialized even when compiling without RISCV_ISA_ZICBOM.
--- arch/riscv/include/asm/cacheflush.h | 8 ------ arch/riscv/mm/cacheflush.c | 38 ++++++++++++++++++++++++++ arch/riscv/mm/dma-noncoherent.c | 41 ----------------------------- 3 files changed, 38 insertions(+), 49 deletions(-)
arch/riscv/include/asm/cacheflush.h +0 -8
@@ -42,16 +42,8 @@ void flush_icache_mm(struct mm_struct *mm, bool local);#endif /* CONFIG_SMP */ -/* -* The T-Head CMO errata internally probe the CBOM block size, but otherwise -* don't depend on Zicbom. -*/ extern unsigned int riscv_cbom_block_size; -#ifdef CONFIG_RISCV_ISA_ZICBOM void riscv_init_cbom_blocksize (void ); -#else -static inline void riscv_init_cbom_blocksize (void ) { } -#endif #ifdef CONFIG_RISCV_DMA_NONCOHERENT void riscv_noncoherent_supported (void );
arch/riscv/mm/cacheflush.c +38 -0
@@ -3,6 +3,7 @@* Copyright (C) 2017 SiFive */ +#include <linux/of.h> #include <asm/cacheflush.h> #ifdef CONFIG_SMP
@@ -86,3 +87,40 @@ void flush_icache_pte(pte_t pte) flush_icache_all(); }#endif /* CONFIG_MMU */ + +unsigned int riscv_cbom_block_size; +EXPORT_SYMBOL_GPL (riscv_cbom_block_size); + +void riscv_init_cbom_blocksize (void ) +{ +struct device_node *node; +unsigned long cbom_hartid; +u32 val, probed_block_size; +int ret; + + probed_block_size =0 ; +for_each_of_cpu_node (node) { +unsigned long hartid; + + ret =riscv_of_processor_hartid (node, &hartid); +if (ret) +continue ; + +/* set block-size for cbom extension if available */ + ret =of_property_read_u32 (node,"riscv,cbom-block-size" , &val); +if (ret) +continue ; + +if (!probed_block_size) { + probed_block_size = val; + cbom_hartid = hartid; + }else { +if (probed_block_size != val) +pr_warn ("cbom-block-size mismatched between harts %lu and %lu\n" , + cbom_hartid, hartid); + } + } + +if (probed_block_size) + riscv_cbom_block_size = probed_block_size; +}
arch/riscv/mm/dma-noncoherent.c +0 -41
55 lines not on this page · raw message
Signature · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v5 1/4] RISC-V: Fix compilation without RISCV_ISA_ZICBOM
Quoted 13 lines · Anup Patel
From: Andrew Jones <[email protected]>
riscv_cbom_block_sizeandriscv_init_cbom_blocksize()should always be available andriscv_init_cbom_blocksize()should always be invoked, even when compiling withoutRISCV_ISA_ZICBOMenabled. This is because disablingRISCV_ISA_ZICBOMmeans "don't use zicbom instructions in the kernel" not "pretend there isn't zicbom, even when there is". When zicbom is available, whether the kernel enables its use withRISCV_ISA_ZICBOMor not, KVM will offer it to guests. Ensure we can build KVM and that the block size is initialized even when compiling withoutRISCV_ISA_ZICBOM.
Quoted 7 lines
Fixes 8f7e001e0325 ("RISC-V: Clean up the Zicbom block size probing")Reported-by kernel test robot <[email protected]>Signed-off-by Andrew Jones <[email protected]>Signed-off-by Anup Patel <[email protected]>Reviewed-by Conor Dooley <[email protected]>Reviewed-by Heiko Stuebner <[email protected]>Tested-by Heiko Stuebner <[email protected]>
I have queued this patch for Linux-6.1-rcX since it fixes compile error for KVM RISC-V.
Regards,
Anup
Quoted 142 lines
--- arch/riscv/include/asm/cacheflush.h | 8 ------ arch/riscv/mm/cacheflush.c | 38 ++++++++++++++++++++++++++ arch/riscv/mm/dma-noncoherent.c | 41 ----------------------------- 3 files changed, 38 insertions(+), 49 deletions(-)arch/riscv/include/asm/cacheflush.h +0
-8@@ -42,16 +42,8 @@ void flush_icache_mm(struct mm_struct *mm, bool local);#endif /* CONFIG_SMP */ -/* -* The T-Head CMO errata internally probe the CBOM block size, but otherwise -* don't depend on Zicbom. -*/ extern unsigned int riscv_cbom_block_size; -#ifdef CONFIG_RISCV_ISA_ZICBOM void riscv_init_cbom_blocksize (void ); -#else -static inline void riscv_init_cbom_blocksize (void ) { } -#endif #ifdef CONFIG_RISCV_DMA_NONCOHERENT void riscv_noncoherent_supported (void );arch/riscv/mm/cacheflush.c +38
-0@@ -3,6 +3,7 @@* Copyright (C) 2017 SiFive */ +#include <linux/of.h> #include <asm/cacheflush.h> #ifdef CONFIG_SMP @@ -86,3 +87,40 @@ void flush_icache_pte(pte_t pte) flush_icache_all(); }#endif /* CONFIG_MMU */ + +unsigned int riscv_cbom_block_size; +EXPORT_SYMBOL_GPL (riscv_cbom_block_size); + +void riscv_init_cbom_blocksize (void ) +{ +struct device_node *node; +unsigned long cbom_hartid; +u32 val, probed_block_size; +int ret; + + probed_block_size =0 ; +for_each_of_cpu_node (node) { +unsigned long hartid; + + ret =riscv_of_processor_hartid (node, &hartid); +if (ret) +continue ; + +/* set block-size for cbom extension if available */ + ret =of_property_read_u32 (node,"riscv,cbom-block-size" , &val); +if (ret) +continue ; + +if (!probed_block_size) { + probed_block_size = val; + cbom_hartid = hartid; + }else { +if (probed_block_size != val) +pr_warn ("cbom-block-size mismatched between harts %lu and %lu\n" , + cbom_hartid, hartid); + } + } + +if (probed_block_size) + riscv_cbom_block_size = probed_block_size; +}arch/riscv/mm/dma-noncoherent.c +0
-42@@ -8,13 +8,8 @@#include <linux/dma-direct.h> #include <linux/dma-map-ops.h> #include <linux/mm.h> -#include <linux/of.h> -#include <linux/of_device.h> #include <asm/cacheflush.h> -unsigned int riscv_cbom_block_size; -EXPORT_SYMBOL_GPL (riscv_cbom_block_size); -static bool noncoherent_supported; void arch_sync_dma_for_device(phys_addr_t paddr, size_t size,@@ -77,42 +72,6 @@ void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, dev->dma_coherent = coherent; } -#ifdef CONFIG_RISCV_ISA_ZICBOM -void riscv_init_cbom_blocksize (void ) -{ -struct device_node *node; -unsigned long cbom_hartid; -u32 val, probed_block_size; -int ret; - - probed_block_size =0 ; -for_each_of_cpu_node (node) { -unsigned long hartid; - - ret =riscv_of_processor_hartid (node, &hartid); -if (ret) -continue ; - -/* set block-size for cbom extension if available */ - ret =of_property_read_u32 (node,"riscv,cbom-block-size" , &val); -if (ret) -continue ; - -if (!probed_block_size) { - probed_block_size = val; - cbom_hartid = hartid; - }else { -if (probed_block_size != val) -pr_warn ("cbom-block-size mismatched between harts %lu and %lu\n" , - cbom_hartid, hartid); - } - } - -if (probed_block_size) - riscv_cbom_block_size = probed_block_size; -} -#endif -void riscv_noncoherent_supported (void ) { WARN(!riscv_cbom_block_size, --
Quoted 2 lines
2.34.1
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v5 2/4 RISC-V: Fix MEMREMAP_WB for systems with Svpbmt
In reply to Anup PatelCurrently, the memremap() called with MEMREMAP_WB maps memory using the generic ioremap() function which breaks on system with Svpbmt because memory mapped using _PAGE_IOREMAP page attributes is treated as strongly-ordered non-cacheable IO memory.
To address this, we implement RISC-V specific arch_memremap_wb() which maps memory using _PAGE_KERNEL page attributes resulting in write-back cacheable mapping on systems with Svpbmt.
--- arch/riscv/include/asm/io.h | 5 +++++ 1 file changed, 5 insertions(+)
arch/riscv/include/asm/io.h +5 -0
@@ -135,4 +135,9 @@ __io_writes_outs(outs, u64, q, __io_pbr(), __io_paw())#include <asm-generic/io.h> +#ifdef CONFIG_MMU +#define arch_memremap_wb (addr, size) \ + ((__force void *)ioremap_prot((addr), (size), _PAGE_KERNEL)) +#endif +#endif /* _ASM_RISCV_IO_H */
Signature · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v5 2/4] RISC-V: Fix MEMREMAP_WB for systems with Svpbmt
Quoted 5 lines · Anup Patel
Currently, the
memremap()called withMEMREMAP_WBmaps memory using the genericioremap()function which breaks on system with Svpbmt because memory mapped using_PAGE_IOREMAPpage attributes is treated as strongly-ordered non-cacheable IO memory.
Quoted 8 lines
To address this, we implement RISC-V specific
arch_memremap_wb()which maps memory using_PAGE_KERNELpage attributes resulting in write-back cacheable mapping on systems with Svpbmt.Fixes ff689fd21cb1 ("riscv: add RISC-V Svpbmt extension support")Co-developed-by Mayuresh Chitale <[email protected]>Signed-off-by Mayuresh Chitale <[email protected]>Signed-off-by Anup Patel <[email protected]>
Hey Arnd,
Does this look okay to you now?
Thanks,
Conor.
Quoted 21 lines
--- arch/riscv/include/asm/io.h | 5 +++++ 1 file changed, 5 insertions(+)arch/riscv/include/asm/io.h +5
-0@@ -135,4 +135,9 @@ __io_writes_outs(outs, u64, q, __io_pbr(), __io_paw())#include <asm-generic/io.h> +#ifdef CONFIG_MMU +#define arch_memremap_wb (addr, size) \ + ((__force void *)ioremap_prot((addr), (size), _PAGE_KERNEL)) +#endif +#endif /* _ASM_RISCV_IO_H */ Signature · 1 line
2.34.1
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v5 3/4 RISC-V: Implement arch specific PMEM APIs
In reply to Anup PatelThe NVDIMM PMEM driver expects arch specific APIs for cache maintenance and if arch does not provide these APIs then NVDIMM PMEM driver will always use MEMREMAP_WT to map persistent memory which in-turn maps as UC memory type defined by the RISC-V Svpbmt specification.
Now that the Svpbmt and Zicbom support is available in RISC-V kernel, we implement PMEM APIs using ALT_CMO_OP() macros so that the NVDIMM PMEM driver can use MEMREMAP_WB to map persistent memory.
--- arch/riscv/Kconfig | 1 + arch/riscv/mm/Makefile | 1 + arch/riscv/mm/pmem.c | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 arch/riscv/mm/pmem.c
arch/riscv/Kconfig +1 -0
@@ -25,6 +25,7 @@ config RISCV select ARCH_HAS_GIGANTIC_PAGE select ARCH_HAS_KCOV select ARCH_HAS_MMIOWB + select ARCH_HAS_PMEM_API select ARCH_HAS_PTE_SPECIAL select ARCH_HAS_SET_DIRECT_MAP if MMU select ARCH_HAS_SET_MEMORY if MMU
arch/riscv/mm/Makefile +1 -0
@@ -31,3 +31,4 @@ endif obj-$(CONFIG_DEBUG_VIRTUAL) += physaddr.o obj-$(CONFIG_RISCV_DMA_NONCOHERENT) += dma-noncoherent.o +obj-$(CONFIG_ARCH_HAS_PMEM_API) += pmem.o
arch/riscv/mm/pmem.c new file +21 -0
@@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2022 Ventana Micro Systems Inc. +*/ + +#include <linux/export.h> +#include <linux/libnvdimm.h> + +#include <asm/cacheflush.h> + +void arch_wb_cache_pmem (void *addr,size_t size) +{ +ALT_CMO_OP (clean, addr, size, riscv_cbom_block_size); +} +EXPORT_SYMBOL_GPL (arch_wb_cache_pmem); + +void arch_invalidate_pmem (void *addr,size_t size) +{ +ALT_CMO_OP (inval, addr, size, riscv_cbom_block_size); +} +EXPORT_SYMBOL_GPL (arch_invalidate_pmem);
Signature · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v5 3/4] RISC-V: Implement arch specific PMEM APIs
Quoted 36 lines · Anup Patel
The NVDIMM PMEM driver expects arch specific APIs for cache maintenance and if arch does not provide these APIs then NVDIMM PMEM driver will always use
MEMREMAP_WTto map persistent memory which in-turn maps as UC memory type defined by the RISC-V Svpbmt specification.Now that the Svpbmt and Zicbom support is available in RISC-V kernel, we implement PMEM APIs using
ALT_CMO_OP()macros so that the NVDIMM PMEM driver can useMEMREMAP_WBto map persistent memory.Co-developed-by Mayuresh Chitale <[email protected]>Signed-off-by Mayuresh Chitale <[email protected]>Signed-off-by Anup Patel <[email protected]>--- arch/riscv/Kconfig | 1 + arch/riscv/mm/Makefile | 1 + arch/riscv/mm/pmem.c | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 arch/riscv/mm/pmem.carch/riscv/Kconfig +1
-0@@ -25,6 +25,7 @@ config RISCV select ARCH_HAS_GIGANTIC_PAGE select ARCH_HAS_KCOV select ARCH_HAS_MMIOWB + select ARCH_HAS_PMEM_API select ARCH_HAS_PTE_SPECIAL select ARCH_HAS_SET_DIRECT_MAP if MMU select ARCH_HAS_SET_MEMORY if MMUarch/riscv/mm/Makefile +0
-0
arch/riscv/mm/Makefile endif · line 34
Quoted 4 lines
arch/riscv/mm/Makefile +1
-0@@ -31,3 +31,4 @@ endif obj-$(CONFIG_DEBUG_VIRTUAL) += physaddr.o obj-$(CONFIG_RISCV_DMA_NONCOHERENT) += dma-noncoherent.o +obj-$(CONFIG_ARCH_HAS_PMEM_API) += pmem.o
Hey Anup,
Might be a silly question - ARCH_HAS_PMEM_API is unconditionally enabled right? It should therefore be okay to make this an obj-y? Thanks
Conor.
Quoted 30 lines
arch/riscv/mm/pmem.c new file +21
-0@@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2022 Ventana Micro Systems Inc. +*/ + +#include <linux/export.h> +#include <linux/libnvdimm.h> + +#include <asm/cacheflush.h> + +void arch_wb_cache_pmem (void *addr,size_t size) +{ +ALT_CMO_OP (clean, addr, size, riscv_cbom_block_size); +} +EXPORT_SYMBOL_GPL (arch_wb_cache_pmem); + +void arch_invalidate_pmem (void *addr,size_t size) +{ +ALT_CMO_OP (inval, addr, size, riscv_cbom_block_size); +} +EXPORT_SYMBOL_GPL (arch_invalidate_pmem);Signature · 1 line
2.34.1
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH v5 3/4] RISC-V: Implement arch specific PMEM APIs
Quoted 39 lines · Conor Dooley
Quoted 37 lines · Anup Patel
The NVDIMM PMEM driver expects arch specific APIs for cache maintenance and if arch does not provide these APIs then NVDIMM PMEM driver will always use
MEMREMAP_WTto map persistent memory which in-turn maps as UC memory type defined by the RISC-V Svpbmt specification.Now that the Svpbmt and Zicbom support is available in RISC-V kernel, we implement PMEM APIs using
ALT_CMO_OP()macros so that the NVDIMM PMEM driver can useMEMREMAP_WBto map persistent memory.Co-developed-by Mayuresh Chitale <[email protected]>Signed-off-by Mayuresh Chitale <[email protected]>Signed-off-by Anup Patel <[email protected]>--- arch/riscv/Kconfig | 1 + arch/riscv/mm/Makefile | 1 + arch/riscv/mm/pmem.c | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 arch/riscv/mm/pmem.carch/riscv/Kconfig +1
-0@@ -25,6 +25,7 @@ config RISCV select ARCH_HAS_GIGANTIC_PAGE select ARCH_HAS_KCOV select ARCH_HAS_MMIOWB + select ARCH_HAS_PMEM_API select ARCH_HAS_PTE_SPECIAL select ARCH_HAS_SET_DIRECT_MAP if MMU select ARCH_HAS_SET_MEMORY if MMUarch/riscv/mm/Makefile +0
-0@@ -31,3 +31,4 @@ endif
Quoted 7 lines
arch/riscv/mm/Makefile endif · line 34
Quoted 3 lines
arch/riscv/mm/Makefile +1
-0obj-$(CONFIG_DEBUG_VIRTUAL) += physaddr.o obj-$(CONFIG_RISCV_DMA_NONCOHERENT) += dma-noncoherent.o +obj-$(CONFIG_ARCH_HAS_PMEM_API) += pmem.oHey Anup,
Might be a silly question -ARCH_HAS_PMEM_APIis unconditionally enabled right? It should therefore be okay to make this an obj-y?
Yes, it is simpler to just add pmem.o in obj-y
I will update and send v6.
Thanks,
Anup
Quoted 33 lines
Thanks
Conor.Quoted 30 lines
arch/riscv/mm/pmem.c new file +21
-1@@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2022 Ventana Micro Systems Inc. +*/ + +#include <linux/export.h> +#include <linux/libnvdimm.h> + +#include <asm/cacheflush.h> + +void arch_wb_cache_pmem (void *addr,size_t size) +{ +ALT_CMO_OP (clean, addr, size, riscv_cbom_block_size); +} +EXPORT_SYMBOL_GPL (arch_wb_cache_pmem); + +void arch_invalidate_pmem (void *addr,size_t size) +{ +ALT_CMO_OP (inval, addr, size, riscv_cbom_block_size); +} +EXPORT_SYMBOL_GPL (arch_invalidate_pmem); --2.34.1
PATCH v5 4/4 RISC-V: Enable PMEM drivers
In reply to Anup PatelWe now have PMEM arch support available in RISC-V kernel so let us enable relevant drivers in defconfig.
--- arch/riscv/configs/defconfig | 1 + 1 file changed, 1 insertion(+)
arch/riscv/configs/defconfig +1 -0
@@ -159,6 +159,7 @@ CONFIG_VIRTIO_MMIO=y CONFIG_RPMSG_CHAR=y CONFIG_RPMSG_CTRL=y CONFIG_RPMSG_VIRTIO=y +CONFIG_LIBNVDIMM=y CONFIG_EXT4_FS=y CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_SECURITY=y
Signature · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv