The patch titled Subject: dma: allow dma_get_cache_alignment() to be overridden by the arch code has been added to the -mm mm-unstable branch. Its filename is dma-allow-dma_get_cache_alignment-to-be-overridden-by-the-arch-code.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/dma-allow-dma_get_cache_alignment-to-be-overridden-by-the-arch-code.patch This patch will later appear in the mm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Catalin Marinas <catalin.marinas@xxxxxxx> Subject: dma: allow dma_get_cache_alignment() to be overridden by the arch code Date: Mon, 12 Jun 2023 16:31:46 +0100 On arm64, ARCH_DMA_MINALIGN is larger than most cache line size configurations deployed. Allow an architecture to override dma_get_cache_alignment() in order to return a run-time probed value (e.g. cache_line_size()). Link: https://lkml.kernel.org/r/20230612153201.554742-3-catalin.marinas@xxxxxxx Signed-off-by: Catalin Marinas <catalin.marinas@xxxxxxx> Reviewed-by: Christoph Hellwig <hch@xxxxxx> Tested-by: Isaac J. Manjarres <isaacmanjarres@xxxxxxxxxx> Cc: Robin Murphy <robin.murphy@xxxxxxx> Cc: Will Deacon <will@xxxxxxxxxx> Cc: Alasdair Kergon <agk@xxxxxxxxxx> Cc: Ard Biesheuvel <ardb@xxxxxxxxxx> Cc: Arnd Bergmann <arnd@xxxxxxxx> Cc: Daniel Vetter <daniel@xxxxxxxx> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Cc: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> Cc: Jerry Snitselaar <jsnitsel@xxxxxxxxxx> Cc: Joerg Roedel <joro@xxxxxxxxxx> Cc: Jonathan Cameron <jic23@xxxxxxxxxx> Cc: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx> Cc: Lars-Peter Clausen <lars@xxxxxxxxxx> Cc: Logan Gunthorpe <logang@xxxxxxxxxxxx> Cc: Marc Zyngier <maz@xxxxxxxxxx> Cc: Mark Brown <broonie@xxxxxxxxxx> Cc: Mike Snitzer <snitzer@xxxxxxxxxx> Cc: "Rafael J. Wysocki" <rafael@xxxxxxxxxx> Cc: Saravana Kannan <saravanak@xxxxxxxxxx> Cc: Vlastimil Babka <vbabka@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/dma-mapping.h | 2 ++ 1 file changed, 2 insertions(+) --- a/include/linux/dma-mapping.h~dma-allow-dma_get_cache_alignment-to-be-overridden-by-the-arch-code +++ a/include/linux/dma-mapping.h @@ -544,6 +544,7 @@ static inline int dma_set_min_align_mask return 0; } +#ifndef dma_get_cache_alignment static inline int dma_get_cache_alignment(void) { #ifdef ARCH_HAS_DMA_MINALIGN @@ -551,6 +552,7 @@ static inline int dma_get_cache_alignmen #endif return 1; } +#endif static inline void *dmam_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp) _ Patches currently in -mm which might be from catalin.marinas@xxxxxxx are mm-slab-decouple-arch_kmalloc_minalign-from-arch_dma_minalign.patch dma-allow-dma_get_cache_alignment-to-be-overridden-by-the-arch-code.patch mm-slab-simplify-create_kmalloc_cache-args-and-make-it-static.patch mm-slab-limit-kmalloc-minimum-alignment-to-dma_get_cache_alignment.patch drivers-base-use-arch_dma_minalign-instead-of-arch_kmalloc_minalign.patch drivers-gpu-use-arch_dma_minalign-instead-of-arch_kmalloc_minalign.patch drivers-usb-use-arch_dma_minalign-instead-of-arch_kmalloc_minalign.patch drivers-spi-use-arch_dma_minalign-instead-of-arch_kmalloc_minalign.patch dm-crypt-use-arch_dma_minalign-instead-of-arch_kmalloc_minalign.patch iio-core-use-arch_dma_minalign-instead-of-arch_kmalloc_minalign.patch arm64-allow-kmalloc-caches-aligned-to-the-smaller-cache_line_size.patch dma-mapping-force-bouncing-if-the-kmalloc-size-is-not-cache-line-aligned.patch iommu-dma-force-bouncing-if-the-size-is-not-cacheline-aligned.patch mm-slab-reduce-the-kmalloc-minimum-alignment-if-dma-bouncing-possible.patch arm64-enable-arch_want_kmalloc_dma_bounce-for-arm64.patch