RISC-V: KVM: Fix compilation without RISCV_ISA_ZICBOM
Subsystems (2)
PATCH v2 1/1 RISC-V: KVM: Fix compilation without RISCV_ISA_ZICBOM
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 (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 · 1 line
2.37.3
Anup Patel
maintainerPATCH v2 1/1 RISC-V: KVM: Fix compilation without RISCV_ISA_ZICBOM
Quoted 11 lines · Andrew Jones
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 3 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]>
This is quite similar to the code movement patch I had in the PMEM series.
Looks good to me.
@Palmer, let me know if you are okay with this going through the KVM tree.
Regards,
Anup
Quoted 144 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 (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, --2.37.3
PATCH v2 1/1 RISC-V: KVM: Fix compilation without RISCV_ISA_ZICBOM
In reply to Andrew JonesQuoted 10 lines · Andrew Jones
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 4 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]>---
Grr... Second time I forgot my changelog on a patch this week...
v2:
- Instead of #ifdefing the use of riscv_cbom_block_size in KVM always expose it by moving it to cacheflush.c and change Fixes commit. [Palmer]
- Move riscv_init_cbom_blocksize() to cacheflush.c and always expose it since KVM can offer zicbom to guests even if the host kernel chooses not to use it (RISCV_ISA_ZICBOM=n) [drew]
- Rewrote commit message
Quoted 143 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 (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@@ -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,Signature · 1 line
2.37.3
PATCH v2 1/1 RISC-V: KVM: Fix compilation without RISCV_ISA_ZICBOM
In reply to Andrew JonesQuoted 1 line · Andrew Jones
RISC-V: KVM: Fix compilation without
RISCV_ISA_ZICBOM
nit: I know that this is what it fixes, but I think the commit subject is a little misleading when it doesnt touch arch/riscv/kvm & has some meaning for non-kvm too.
Quoted 2 lines
riscv_cbom_block_sizeandriscv_init_cbom_blocksize()should always be available andriscv_init_cbom_blocksize()should always be invoked
Yup, I like where this is going...
Quoted 5 lines
even when compiling without
RISCV_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.
...right, I'll take your word for this part. You're the kvm people :)
Quoted 6 lines
Ensure we can build KVM and that the block size is initialized even when compiling without
RISCV_ISA_ZICBOM.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]>
Is cacheflush.c the "right" place for it? idk. But shaving that yak is a waste of time imo. I like the unconditional availability & if ZICBOM is off in the kernel I figure it should not matter that we set the blocksize.
Quoted 149 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 (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@@ -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,Signature · 7 lines
2.37.3 _______________________________________________ linux-riscv mailing list linux-riscv at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v2 1/1 RISC-V: KVM: Fix compilation without RISCV_ISA_ZICBOM
Quoted 7 lines · Conor Dooley
Quoted 1 line · Andrew Jones
RISC-V: KVM: Fix compilation without
RISCV_ISA_ZICBOMnit: I know that this is what it fixes, but I think the commit subject is a little misleading when it doesnt touch
arch/riscv/kvm& has some meaning for non-kvm too.
Yeah, in hindsight I probably should have just dropped the "RISC-V: KVM:
Fix compilation without RISCV_ISA_ZICBOM" patch and rebased and resent Anup's move patch. I still can, if that's what people would prefer.
Thanks,
drew
Quoted 177 lines
Quoted 3 lines
riscv_cbom_block_sizeandriscv_init_cbom_blocksize()should always be available andriscv_init_cbom_blocksize()should always be invokedYup, I like where this is going...
Quoted 5 lines
even when compiling without
RISCV_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....right, I'll take your word for this part. You're the kvm people :)
Quoted 6 lines
Ensure we can build KVM and that the block size is initialized even when compiling without
RISCV_ISA_ZICBOM.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]>Is
cacheflush.cthe "right" place for it? idk. But shaving that yak is a waste of time imo. I like the unconditional availability & if ZICBOM is off in the kernel I figure it should not matter that we set the blocksize.Reviewed-by Conor Dooley <[email protected]>Quoted 149 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 (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@@ -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,Signature · 7 lines
2.37.3 _______________________________________________ linux-riscv mailing list linux-riscv at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH v2 1/1 RISC-V: KVM: Fix compilation without RISCV_ISA_ZICBOM
Quoted 5 lines · Andrew Jones
Quoted 4 lines · Conor Dooley
Quoted 1 line · Andrew Jones
RISC-V: KVM: Fix compilation without
RISCV_ISA_ZICBOM
Quoted 7 lines
Quoted 3 lines
nit: I know that this is what it fixes, but I think the commit subject is a little misleading when it doesnt touch
arch/riscv/kvm& has some meaning for non-kvm too.Yeah, in hindsight I probably should have just dropped the "RISC-V: KVM:
Fix compilation withoutRISCV_ISA_ZICBOM" patch and rebased and resent Anup's move patch. I still can, if that's what people would prefer.
I'd image that that can be done at application time? idk what I'd go for though, I am sick so my heads a little groggy. Say along the lines of "RISC-V: make cbom blocksize info unconditionally available"? Feel free to hate that Drew...
Conor.
Quoted 187 lines
Thanks,
drewQuoted 173 lines
Quoted 3 lines
riscv_cbom_block_sizeandriscv_init_cbom_blocksize()should always be available andriscv_init_cbom_blocksize()should always be invokedYup, I like where this is going...
Quoted 5 lines
even when compiling without
RISCV_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....right, I'll take your word for this part. You're the kvm people :)
Quoted 6 lines
Ensure we can build KVM and that the block size is initialized even when compiling without
RISCV_ISA_ZICBOM.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]>Is
cacheflush.cthe "right" place for it? idk. But shaving that yak is a waste of time imo. I like the unconditional availability & if ZICBOM is off in the kernel I figure it should not matter that we set the blocksize.Reviewed-by Conor Dooley <[email protected]>Quoted 145 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 (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@@ -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,Signature · 1 line
2.37.3Quoted 4 lines
Quoted 4 lines
_______________________________________________
linux-riscv mailing list
linux-riscv at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv_______________________________________________
linux-riscv mailing list
linux-riscv at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv