iommu/pages: Fix iommu_pages_flush_incoherent() for non-x86
PATCH 1/1 iommu/pages: Fix iommu_pages_flush_incoherent() for non-x86
The dma_sync_single_for_device() function expects a dma_addr_t, but iommu_pages_flush_incoherent() was incorrectly passing a virtual address.
Since iommu_pages_start_incoherent() enforces a 1:1 mapping between DMA addresses and physical addresses (checked via WARN_ON), we can convert the virtual address to a physical address before passing it to the DMA API.
This also matches the behaviour of the other non-x86 in iommu_pages_free_incoherent(), which uses virt_to_phys(virt);
--- drivers/iommu/iommu-pages.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/iommu-pages.h +1 -1
@@ -137,7 +137,7 @@ static inline void iommu_pages_flush_incoherent(struct device *dma_dev, void *virt, size_t offset, size_t len) { - dma_sync_single_for_device(dma_dev, (uintptr_t)virt + offset, len, + dma_sync_single_for_device(dma_dev, virt_to_phys(virt) + offset, len,DMA_TO_DEVICE ); } void iommu_pages_stop_incoherent_list(struct iommu_pages_list *list,
Signature · 1 line
2.54.0.rc2.544.gc7ae2d5bb8-goog
Quoted 9 lines · Mostafa Saleh
The
dma_sync_single_for_device()function expects adma_addr_t, butiommu_pages_flush_incoherent()was incorrectly passing a virtual address.Since
iommu_pages_start_incoherent()enforces a 1:1 mapping between DMA addresses and physical addresses (checked viaWARN_ON), we can convert the virtual address to a physical address before passing it to the DMA API.
Quoted 8 lines
This also matches the behaviour of the other non-x86 in
iommu_pages_free_incoherent(), which usesvirt_to_phys(virt);Fixes 36ae67b13976 ("iommu/pages: Add support for incoherent IOMMU page table walkers")Signed-off-by Mostafa Saleh <[email protected]>--- drivers/iommu/iommu-pages.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Jason
Quoted 23 lines · Mostafa Saleh
The
dma_sync_single_for_device()function expects adma_addr_t, butiommu_pages_flush_incoherent()was incorrectly passing a virtual address.Since
iommu_pages_start_incoherent()enforces a 1:1 mapping between DMA addresses and physical addresses (checked viaWARN_ON), we can convert the virtual address to a physical address before passing it to the DMA API.This also matches the behaviour of the other non-x86 in
iommu_pages_free_incoherent(), which usesvirt_to_phys(virt);Fixes 36ae67b13976 ("iommu/pages: Add support for incoherent IOMMU page table walkers")Signed-off-by Mostafa Saleh <[email protected]>--- drivers/iommu/iommu-pages.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/iommu/iommu-pages.h +0
-0
drivers/iommu/iommu-pages.h static inline void iommu_pages_flush_incoherent(struct device *dma_dev, · line 143
Quoted 8 lines
drivers/iommu/iommu-pages.h +1
-1@@ -137,7 +137,7 @@ static inline void iommu_pages_flush_incoherent(struct device *dma_dev, void *virt, size_t offset, size_t len) { - dma_sync_single_for_device(dma_dev, (uintptr_t)virt + offset, len, + dma_sync_single_for_device(dma_dev, virt_to_phys(virt) + offset, len,DMA_TO_DEVICE ); } void iommu_pages_stop_incoherent_list(struct iommu_pages_list *list,
Nice catch!
Additionally, I think we should update the comment in iommu_pages_start_incoherent() to clarify the restriction. The current comment says:
"The DMA API is not allowed to do anything other than DMA direct."
But dma_direct actually handles bus offsets perfectly fine. However, this code fails on platforms with a bus offset is because of the strict check:
WARN_ON(dma != virt_to_phys(virt))
which enforces a strict 1:1 mapping.
So saying that we only allow dma_direct is a bit misleading as to why bus offsets fail here. We should update that comment to something like:
drivers/iommu/iommu-pages.c +5 -3
@@ -161,9 +161,11 @@ int iommu_pages_start_incoherent(void *virt, struct device *dma_dev)return -EINVAL ;/* -* The DMA API is not allowed to do anything other than DMA -* direct. It would be nice to also check -* dev_is_dma_coherent(dma_dev)); +* We enforce a strict 1:1 mapping (dma == phys). This means +* platforms with a bus offset or those that require translation for +* the IOMMU's own memory are not supported, even though dma_direct +* could otherwise handle bus offsets. +* It would be nice to also check dev_is_dma_coherent(dma_dev)); */ if (WARN_ON (dma !=virt_to_phys (virt))) { dma_unmap_single(dma_dev, dma, ioptdesc_mem_size(iopt),
For the fix:
Thanks,
Praan
Quoted 9 lines · Mostafa Saleh
The
dma_sync_single_for_device()function expects adma_addr_t, butiommu_pages_flush_incoherent()was incorrectly passing a virtual address.Since
iommu_pages_start_incoherent()enforces a 1:1 mapping between DMA addresses and physical addresses (checked viaWARN_ON), we can convert the virtual address to a physical address before passing it to the DMA API.
Quoted 8 lines
This also matches the behaviour of the other non-x86 in
iommu_pages_free_incoherent(), which usesvirt_to_phys(virt);Fixes 36ae67b13976 ("iommu/pages: Add support for incoherent IOMMU page table walkers")Signed-off-by Mostafa Saleh<[email protected]>--- drivers/iommu/iommu-pages.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 2 lines · Mostafa Saleh
drivers/iommu/iommu-pages.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Applied to fixes.