From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Fri, 10 Oct 2025 17:30:09 +0000 (+0200)
Subject: dma-debug-dont-report-false-positives-with-dma_bounce_unaligned_kmalloc-v2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5969276c9c99700590fb8f0e7eb418a9a03dabce;p=users%2Fjedix%2Flinux-maple.git

dma-debug-dont-report-false-positives-with-dma_bounce_unaligned_kmalloc-v2

replace is_swiotlb_allocated() with is_swiotlb_active(), per Catalin

Link: https://lkml.kernel.org/r/20251010173009.3916215-1-m.szyprowski@samsung.com
Fixes: 370645f41e6e ("dma-mapping: force bouncing if the kmalloc() size is not cache-line-aligned")
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: "Isaac J. Manjarres" <isaacmanjarres@google.com>
Cc: Robin Murohy <robin.murphy@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/kernel/dma/debug.c b/kernel/dma/debug.c
index 6f05b5376119..138ede653de4 100644
--- a/kernel/dma/debug.c
+++ b/kernel/dma/debug.c
@@ -597,7 +597,7 @@ static void add_dma_entry(struct dma_debug_entry *entry, unsigned long attrs)
 		global_disable = true;
 	} else if (rc == -EEXIST && !(attrs & DMA_ATTR_SKIP_CPU_SYNC) &&
 		   !(IS_ENABLED(CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC) &&
-		     is_swiotlb_allocated())) {
+		     is_swiotlb_active(entry->dev))) {
 		err_printk(entry->dev, entry,
 			"cacheline tracking EEXIST, overlapping mappings aren't supported\n");
 	}