Skip to content

Commit 2926715

Browse files
xhackerustcpalmer-dabbelt
authored andcommitted
riscv: allow kmalloc() caches aligned to the smallest value
Currently, riscv defines ARCH_DMA_MINALIGN as L1_CACHE_BYTES, I.E 64Bytes, if CONFIG_RISCV_DMA_NONCOHERENT=y. To support unified kernel Image, usually we have to enable CONFIG_RISCV_DMA_NONCOHERENT, thus it brings some bad effects to coherent platforms: Firstly, it wastes memory, kmalloc-96, kmalloc-32, kmalloc-16 and kmalloc-8 slab caches don't exist any more, they are replaced with either kmalloc-128 or kmalloc-64. Secondly, larger than necessary kmalloc aligned allocations results in unnecessary cache/TLB pressure. This issue also exists on arm64 platforms. From last year, Catalin tried to solve this issue by decoupling ARCH_KMALLOC_MINALIGN from ARCH_DMA_MINALIGN, limiting kmalloc() minimum alignment to dma_get_cache_alignment() and replacing ARCH_KMALLOC_MINALIGN usage in various drivers with ARCH_DMA_MINALIGN etc.[1] One fact we can make use of for riscv: if the CPU doesn't support ZICBOM or T-HEAD CMO, we know the platform is coherent. Based on Catalin's work and above fact, we can easily solve the kmalloc align issue for riscv: we can override dma_get_cache_alignment(), then let it return ARCH_DMA_MINALIGN at the beginning and return 1 once we know the underlying HW neither supports ZICBOM nor supports T-HEAD CMO. So what about if the CPU supports ZICBOM or T-HEAD CMO, but all the devices are dma coherent? Well, we use ARCH_DMA_MINALIGN as the kmalloc minimum alignment, nothing changed in this case. This case can be improved in the future. After this patch, a simple test of booting to a small buildroot rootfs on qemu shows: kmalloc-96 5041 5041 96 ... kmalloc-64 9606 9606 64 ... kmalloc-32 5128 5128 32 ... kmalloc-16 7682 7682 16 ... kmalloc-8 10246 10246 8 ... So we save about 1268KB memory. The saving will be much larger in normal OS env on real HW platforms. Link: https://lore.kernel.org/linux-arm-kernel/20230524171904.3967031-1-catalin.marinas@arm.com/ [1] Signed-off-by: Jisheng Zhang <jszhang@kernel.org> Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Link: https://lore.kernel.org/r/20230718152214.2907-2-jszhang@kernel.org Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
1 parent 06c2afb commit 2926715

File tree

4 files changed

+25
-0
lines changed

4 files changed

+25
-0
lines changed

arch/riscv/include/asm/cache.h

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
#ifdef CONFIG_RISCV_DMA_NONCOHERENT
1515
#define ARCH_DMA_MINALIGN L1_CACHE_BYTES
16+
#define ARCH_KMALLOC_MINALIGN (8)
1617
#endif
1718

1819
/*
@@ -23,4 +24,17 @@
2324
#define ARCH_SLAB_MINALIGN 16
2425
#endif
2526

27+
#ifndef __ASSEMBLY__
28+
29+
#ifdef CONFIG_RISCV_DMA_NONCOHERENT
30+
extern int dma_cache_alignment;
31+
#define dma_get_cache_alignment dma_get_cache_alignment
32+
static inline int dma_get_cache_alignment(void)
33+
{
34+
return dma_cache_alignment;
35+
}
36+
#endif
37+
38+
#endif /* __ASSEMBLY__ */
39+
2640
#endif /* _ASM_RISCV_CACHE_H */

arch/riscv/include/asm/cacheflush.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,10 @@ void riscv_init_cbo_blocksizes(void);
5555

5656
#ifdef CONFIG_RISCV_DMA_NONCOHERENT
5757
void riscv_noncoherent_supported(void);
58+
void __init riscv_set_dma_cache_alignment(void);
5859
#else
5960
static inline void riscv_noncoherent_supported(void) {}
61+
static inline void riscv_set_dma_cache_alignment(void) {}
6062
#endif
6163

6264
/*

arch/riscv/kernel/setup.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,7 @@ void __init setup_arch(char **cmdline_p)
311311
if (IS_ENABLED(CONFIG_RISCV_ISA_ZICBOM) &&
312312
riscv_isa_extension_available(NULL, ZICBOM))
313313
riscv_noncoherent_supported();
314+
riscv_set_dma_cache_alignment();
314315
}
315316

316317
static int __init topology_init(void)

arch/riscv/mm/dma-noncoherent.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
#include <asm/cacheflush.h>
1212

1313
static bool noncoherent_supported __ro_after_init;
14+
int dma_cache_alignment __ro_after_init = ARCH_DMA_MINALIGN;
15+
EXPORT_SYMBOL_GPL(dma_cache_alignment);
1416

1517
void arch_sync_dma_for_device(phys_addr_t paddr, size_t size,
1618
enum dma_data_direction dir)
@@ -78,3 +80,9 @@ void riscv_noncoherent_supported(void)
7880
"Non-coherent DMA support enabled without a block size\n");
7981
noncoherent_supported = true;
8082
}
83+
84+
void __init riscv_set_dma_cache_alignment(void)
85+
{
86+
if (!noncoherent_supported)
87+
dma_cache_alignment = 1;
88+
}

0 commit comments

Comments
 (0)