| From: Catalin Marinas <catalin.marinas@arm.com> |
| Subject: mm: slab: reduce the kmalloc() minimum alignment if DMA bouncing possible |
| Date: Mon, 12 Jun 2023 16:32:00 +0100 |
| |
| If an architecture opted in to DMA bouncing of unaligned kmalloc() buffers |
| (ARCH_WANT_KMALLOC_DMA_BOUNCE), reduce the minimum kmalloc() cache |
| alignment below cache-line size to ARCH_KMALLOC_MINALIGN. |
| |
| Link: https://lkml.kernel.org/r/20230612153201.554742-17-catalin.marinas@arm.com |
| Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> |
| Reviewed-by: Vlastimil Babka <vbabka@suse.cz> |
| Tested-by: Isaac J. Manjarres <isaacmanjarres@google.com> |
| Cc: Christoph Hellwig <hch@lst.de> |
| Cc: Robin Murphy <robin.murphy@arm.com> |
| Cc: Alasdair Kergon <agk@redhat.com> |
| Cc: Ard Biesheuvel <ardb@kernel.org> |
| Cc: Arnd Bergmann <arnd@arndb.de> |
| Cc: Daniel Vetter <daniel@ffwll.ch> |
| Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Cc: Herbert Xu <herbert@gondor.apana.org.au> |
| Cc: Jerry Snitselaar <jsnitsel@redhat.com> |
| Cc: Joerg Roedel <joro@8bytes.org> |
| Cc: Jonathan Cameron <jic23@kernel.org> |
| Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com> |
| Cc: Lars-Peter Clausen <lars@metafoo.de> |
| Cc: Logan Gunthorpe <logang@deltatee.com> |
| Cc: Marc Zyngier <maz@kernel.org> |
| Cc: Mark Brown <broonie@kernel.org> |
| Cc: Mike Snitzer <snitzer@kernel.org> |
| Cc: "Rafael J. Wysocki" <rafael@kernel.org> |
| Cc: Saravana Kannan <saravanak@google.com> |
| Cc: Will Deacon <will@kernel.org> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| mm/slab_common.c | 5 +++++ |
| 1 file changed, 5 insertions(+) |
| |
| --- a/mm/slab_common.c~mm-slab-reduce-the-kmalloc-minimum-alignment-if-dma-bouncing-possible |
| +++ a/mm/slab_common.c |
| @@ -18,6 +18,7 @@ |
| #include <linux/uaccess.h> |
| #include <linux/seq_file.h> |
| #include <linux/dma-mapping.h> |
| +#include <linux/swiotlb.h> |
| #include <linux/proc_fs.h> |
| #include <linux/debugfs.h> |
| #include <linux/kasan.h> |
| @@ -865,6 +866,10 @@ void __init setup_kmalloc_cache_index_ta |
| |
| static unsigned int __kmalloc_minalign(void) |
| { |
| +#ifdef CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC |
| + if (io_tlb_default_mem.nslabs) |
| + return ARCH_KMALLOC_MINALIGN; |
| +#endif |
| return dma_get_cache_alignment(); |
| } |
| |
| _ |