Merge tag 'dma-mapping-7.0-2026-04-09' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux

3ffcd578 · Linus Torvalds <[email protected]> · 2026-04-09 11:02:35 -07:00

Pull dma-mapping fix from Marek Szyprowski:
 "A fix for DMA-mapping subsystem, which hides annoying, false-positive
  warnings from DMA-API debug on coherent platforms like x86_64 (Mikhail
  Gavrilov)"

* tag 'dma-mapping-7.0-2026-04-09' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux:
  dma-debug: suppress cacheline overlap warning when arch has no DMA alignment requirement

Commit: 3ffcd57823c4feb829efe46dd5135cd5fbf28e36
Parents: a55f7f5f · 3d48c9fd

Merge commit. Changes below are compared with the first parent: a55f7f5f.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
kernel/dma/debug.c	modified	+1	−0	View file

kernel/dma/debug.c

View file

diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c
index 0677918..1a725ed 100644
--- a/kernel/dma/debug.c
+++ b/kernel/dma/debug.c
@@ -615,6 +615,7 @@ static void add_dma_entry(struct dma_debug_entry *entry, unsigned long attrs)
 	} else if (rc == -EEXIST &&
 		   !(attrs & DMA_ATTR_SKIP_CPU_SYNC) &&
 		   !(entry->is_cache_clean && overlap_cache_clean) &&
+		   dma_get_cache_alignment() >= L1_CACHE_BYTES &&
 		   !(IS_ENABLED(CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC) &&
 		     is_swiotlb_active(entry->dev))) {
 		err_printk(entry->dev, entry,