summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2026-11-09 18:06:02 +0100
committerMarek Szyprowski <m.szyprowski@samsung.com>2026-11-16 11:19:46 +0100
commit7d4a177d0d9bc0ca04caec9293ccb902a853cc47 (patch)
tree61be628ef87b119136bda51bee5dffa0e72f09bc /kernel
parent5b4b87935bf9c6c81b603558c2e167fc27c22a1b (diff)
dma: swiotlb: Properly tear down the default pool on exit
With CONFIG_SWIOTLB_DYNAMIC enabled, the default memory pool is added to the io_tlb_default_mem.pools RCU list during initialization. When an IOMMU takes over DMA translation, swiotlb_exit() tears the default pool down and clears it with memset(), but leaves its node on the pools list. The list then contains a zeroed entry with a NULL next pointer, and any later walk of the list, for example mem_used() when reading the io_tlb_used debugfs file, dereferences an invalid pointer and crashes. swiotlb_exit() also leaves the io_tlb_default_mem fields that describe the pool. io_tlb_default_mem.nslabs and can_grow stay set, so is_swiotlb_allocated() and is_swiotlb_active() keep returning true, and swiotlb_find_slots() can schedule dynamic pool allocation after teardown. Without CONFIG_SWIOTLB_DYNAMIC, a later mapping can reach the zeroed defpool and hit BUG_ON(area_index >= pool->nareas). Before the pool data was split out of struct io_tlb_mem, swiotlb_exit() cleared the whole structure, including nslabs. Clear can_grow and cancel any pending dyn_alloc work, then remove the default pool from the list and subtract its slots from nslabs, and wait for an RCU grace period before clearing it, so that no reader can still see it. Without CONFIG_SWIOTLB_DYNAMIC, reset nslabs directly. As a result, with CONFIG_SWIOTLB_DYNAMIC swiotlb no longer silently keeps working through dynamic or transient pools after an IOMMU has turned it off, so for example dma-iommu bouncing for untrusted devices reports that bounce buffers are inactive, as it did before the dynamic pools support. Fixes: 158dbe9c9a3d ("swiotlb: separate memory pool data from other allocator data") Fixes: 62708b2ba405 ("swiotlb: add a flag whether SWIOTLB is allowed to grow") Fixes: 1aaa736815eb ("swiotlb: allocate a new memory pool when existing pools are full") Closes: https://sashiko.dev/#/bug/linux-f75998aa-65ea-4596-9bb4-fa83773012a3 Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20261109170603.385791-1-m.szyprowski@samsung.com Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/dma/swiotlb.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
index 9b0bc272dd82..786954bc5e6a 100644
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
@@ -665,6 +665,17 @@ void __init swiotlb_exit(void)
return;
pr_info("tearing down default memory pool\n");
+#ifdef CONFIG_SWIOTLB_DYNAMIC
+ io_tlb_default_mem.can_grow = false;
+ cancel_work_sync(&io_tlb_default_mem.dyn_alloc);
+ spin_lock(&io_tlb_default_mem.lock);
+ list_del_rcu(&mem->node);
+ io_tlb_default_mem.nslabs -= mem->nslabs;
+ spin_unlock(&io_tlb_default_mem.lock);
+ synchronize_rcu();
+#else
+ io_tlb_default_mem.nslabs = 0;
+#endif
tbl_vaddr = (unsigned long)phys_to_virt(mem->start);
tbl_size = PAGE_ALIGN(mem->end - mem->start);
slots_size = PAGE_ALIGN(array_size(sizeof(*mem->slots), mem->nslabs));