swiotlb: remove the tbl_dma_addr argument to swiotlb_tbl_map_single
Subsystems (5)
PATCH 1/1 swiotlb: remove the tbl_dma_addr argument to swiotlb_tbl_map_single
The tbl_dma_addr argument is used to check the DMA boundary for the allocations, and thus needs to be a dma_addr_t. swiotlb-xen instead passed a physical address, which could lead to incorrect results for strange offsets. Fix this by removing the parameter entirely and hard code the DMA address for io_tlb_start instead.
--- drivers/iommu/intel/iommu.c | 5 ++--- drivers/xen/swiotlb-xen.c | 3 +-- include/linux/swiotlb.h | 10 +++------- kernel/dma/swiotlb.c | 16 ++++++---------- 4 files changed, 12 insertions(+), 22 deletions(-)
drivers/iommu/intel/iommu.c +2 -3
@@ -3815,9 +3815,8 @@ bounce_map_single(struct device *dev, phys_addr_t paddr, size_t size,* page aligned, we don't need to use a bounce page. */ if (!IS_ALIGNED (paddr | size,VTD_PAGE_SIZE )) { - tlb_addr =swiotlb_tbl_map_single (dev, -phys_to_dma_unencrypted (dev, io_tlb_start), - paddr, size, aligned_size, dir, attrs); + tlb_addr =swiotlb_tbl_map_single (dev, paddr, size, + aligned_size, dir, attrs);if (tlb_addr ==DMA_MAPPING_ERROR ) { goto swiotlb_error; }else {
drivers/xen/swiotlb-xen.c +1 -2
@@ -395,8 +395,7 @@ static dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page,*/ trace_swiotlb_bounced (dev, dev_addr, size, swiotlb_force); - map =swiotlb_tbl_map_single (dev,virt_to_phys (xen_io_tlb_start), - phys, size, size, dir, attrs); + map =swiotlb_tbl_map_single (dev, phys, size, size, dir, attrs);if (map == (phys_addr_t )DMA_MAPPING_ERROR )return DMA_MAPPING_ERROR ;
include/linux/swiotlb.h +3 -7
@@ -45,13 +45,9 @@ enum dma_sync_target { SYNC_FOR_DEVICE = 1, }; -extern phys_addr_t swiotlb_tbl_map_single (struct device *hwdev, -dma_addr_t tbl_dma_addr, -phys_addr_t phys, -size_t mapping_size, -size_t alloc_size, -enum dma_data_direction dir, -unsigned long attrs); +phys_addr_t swiotlb_tbl_map_single (struct device *hwdev,phys_addr_t phys, +size_t mapping_size,size_t alloc_size, +enum dma_data_direction dir,unsigned long attrs); extern void swiotlb_tbl_unmap_single(struct device *hwdev, phys_addr_t tlb_addr,
kernel/dma/swiotlb.c +6 -10
@@ -441,14 +441,11 @@ static void swiotlb_bounce(phys_addr_t orig_addr, phys_addr_t tlb_addr, } } -phys_addr_t swiotlb_tbl_map_single (struct device *hwdev, -dma_addr_t tbl_dma_addr, -phys_addr_t orig_addr, -size_t mapping_size, -size_t alloc_size, -enum dma_data_direction dir, -unsigned long attrs) +phys_addr_t swiotlb_tbl_map_single (struct device *hwdev,phys_addr_t orig_addr, +size_t mapping_size,size_t alloc_size, +enum dma_data_direction dir,unsigned long attrs) { +dma_addr_t tbl_dma_addr =phys_to_dma_unencrypted (hwdev, io_tlb_start);unsigned long flags;phys_addr_t tlb_addr;unsigned int nslots, stride, index, wrap;
@@ -667,9 +664,8 @@ dma_addr_t swiotlb_map(struct device *dev, phys_addr_t paddr, size_t size,trace_swiotlb_bounced (dev,phys_to_dma (dev, paddr), size, swiotlb_force); - swiotlb_addr =swiotlb_tbl_map_single (dev, -phys_to_dma_unencrypted (dev, io_tlb_start), - paddr, size, size, dir, attrs); + swiotlb_addr =swiotlb_tbl_map_single (dev, paddr, size, size, dir, + attrs);if (swiotlb_addr == (phys_addr_t )DMA_MAPPING_ERROR )return DMA_MAPPING_ERROR ;
Signature · 6 lines
2.28.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
ping?
Quoted 109 lines · Christoph Hellwig
The
tbl_dma_addrargument is used to check the DMA boundary for the allocations, and thus needs to be adma_addr_t. swiotlb-xen instead passed a physical address, which could lead to incorrect results for strange offsets. Fix this by removing the parameter entirely and hard code the DMA address forio_tlb_startinstead.Fixes 91ffe4ad534a ("swiotlb-xen: introduce phys_to_dma/dma_to_phys translations")Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Stefano Stabellini <[email protected]>--- drivers/iommu/intel/iommu.c | 5 ++--- drivers/xen/swiotlb-xen.c | 3 +-- include/linux/swiotlb.h | 10 +++------- kernel/dma/swiotlb.c | 16 ++++++---------- 4 files changed, 12 insertions(+), 22 deletions(-)drivers/iommu/intel/iommu.c +2
-3@@ -3815,9 +3815,8 @@ bounce_map_single(struct device *dev, phys_addr_t paddr, size_t size,* page aligned, we don't need to use a bounce page. */ if (!IS_ALIGNED (paddr | size,VTD_PAGE_SIZE )) { - tlb_addr =swiotlb_tbl_map_single (dev, -phys_to_dma_unencrypted (dev, io_tlb_start), - paddr, size, aligned_size, dir, attrs); + tlb_addr =swiotlb_tbl_map_single (dev, paddr, size, + aligned_size, dir, attrs);if (tlb_addr ==DMA_MAPPING_ERROR ) { goto swiotlb_error; }else {drivers/xen/swiotlb-xen.c +1
-2@@ -395,8 +395,7 @@ static dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page,*/ trace_swiotlb_bounced (dev, dev_addr, size, swiotlb_force); - map =swiotlb_tbl_map_single (dev,virt_to_phys (xen_io_tlb_start), - phys, size, size, dir, attrs); + map =swiotlb_tbl_map_single (dev, phys, size, size, dir, attrs);if (map == (phys_addr_t )DMA_MAPPING_ERROR )return DMA_MAPPING_ERROR ;include/linux/swiotlb.h +3
-7@@ -45,13 +45,9 @@ enum dma_sync_target { SYNC_FOR_DEVICE = 1, }; -extern phys_addr_t swiotlb_tbl_map_single (struct device *hwdev, -dma_addr_t tbl_dma_addr, -phys_addr_t phys, -size_t mapping_size, -size_t alloc_size, -enum dma_data_direction dir, -unsigned long attrs); +phys_addr_t swiotlb_tbl_map_single (struct device *hwdev,phys_addr_t phys, +size_t mapping_size,size_t alloc_size, +enum dma_data_direction dir,unsigned long attrs); extern void swiotlb_tbl_unmap_single(struct device *hwdev, phys_addr_t tlb_addr,kernel/dma/swiotlb.c +6
-10@@ -441,14 +441,11 @@ static void swiotlb_bounce(phys_addr_t orig_addr, phys_addr_t tlb_addr, } } -phys_addr_t swiotlb_tbl_map_single (struct device *hwdev, -dma_addr_t tbl_dma_addr, -phys_addr_t orig_addr, -size_t mapping_size, -size_t alloc_size, -enum dma_data_direction dir, -unsigned long attrs) +phys_addr_t swiotlb_tbl_map_single (struct device *hwdev,phys_addr_t orig_addr, +size_t mapping_size,size_t alloc_size, +enum dma_data_direction dir,unsigned long attrs) { +dma_addr_t tbl_dma_addr =phys_to_dma_unencrypted (hwdev, io_tlb_start);unsigned long flags;phys_addr_t tlb_addr;unsigned int nslots, stride, index, wrap;@@ -667,9 +664,8 @@ dma_addr_t swiotlb_map(struct device *dev, phys_addr_t paddr, size_t size,trace_swiotlb_bounced (dev,phys_to_dma (dev, paddr), size, swiotlb_force); - swiotlb_addr =swiotlb_tbl_map_single (dev, -phys_to_dma_unencrypted (dev, io_tlb_start), - paddr, size, size, dir, attrs); + swiotlb_addr =swiotlb_tbl_map_single (dev, paddr, size, size, dir, + attrs);if (swiotlb_addr == (phys_addr_t )DMA_MAPPING_ERROR )return DMA_MAPPING_ERROR ;Signature · 6 lines
2.28.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
---end quoted text---
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Quoted 1 line · Christoph Hellwig
ping?
Hopefully this goes through. I am in the process of testing it but ran into testing issues that I believe are unrelated.
Quoted 104 lines · Christoph Hellwig
Quoted 102 lines
The
tbl_dma_addrargument is used to check the DMA boundary for the allocations, and thus needs to be adma_addr_t. swiotlb-xen instead passed a physical address, which could lead to incorrect results for strange offsets. Fix this by removing the parameter entirely and hard code the DMA address forio_tlb_startinstead.Fixes 91ffe4ad534a ("swiotlb-xen: introduce phys_to_dma/dma_to_phys translations")Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Stefano Stabellini <[email protected]>--- drivers/iommu/intel/iommu.c | 5 ++--- drivers/xen/swiotlb-xen.c | 3 +-- include/linux/swiotlb.h | 10 +++------- kernel/dma/swiotlb.c | 16 ++++++---------- 4 files changed, 12 insertions(+), 22 deletions(-)drivers/iommu/intel/iommu.c +2
-3@@ -3815,9 +3815,8 @@ bounce_map_single(struct device *dev, phys_addr_t paddr, size_t size,* page aligned, we don't need to use a bounce page. */ if (!IS_ALIGNED (paddr | size,VTD_PAGE_SIZE )) { - tlb_addr =swiotlb_tbl_map_single (dev, -phys_to_dma_unencrypted (dev, io_tlb_start), - paddr, size, aligned_size, dir, attrs); + tlb_addr =swiotlb_tbl_map_single (dev, paddr, size, + aligned_size, dir, attrs);if (tlb_addr ==DMA_MAPPING_ERROR ) { goto swiotlb_error; }else {drivers/xen/swiotlb-xen.c +1
-2@@ -395,8 +395,7 @@ static dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page,*/ trace_swiotlb_bounced (dev, dev_addr, size, swiotlb_force); - map =swiotlb_tbl_map_single (dev,virt_to_phys (xen_io_tlb_start), - phys, size, size, dir, attrs); + map =swiotlb_tbl_map_single (dev, phys, size, size, dir, attrs);if (map == (phys_addr_t )DMA_MAPPING_ERROR )return DMA_MAPPING_ERROR ;include/linux/swiotlb.h +3
-7@@ -45,13 +45,9 @@ enum dma_sync_target { SYNC_FOR_DEVICE = 1, }; -extern phys_addr_t swiotlb_tbl_map_single (struct device *hwdev, -dma_addr_t tbl_dma_addr, -phys_addr_t phys, -size_t mapping_size, -size_t alloc_size, -enum dma_data_direction dir, -unsigned long attrs); +phys_addr_t swiotlb_tbl_map_single (struct device *hwdev,phys_addr_t phys, +size_t mapping_size,size_t alloc_size, +enum dma_data_direction dir,unsigned long attrs); extern void swiotlb_tbl_unmap_single(struct device *hwdev, phys_addr_t tlb_addr,kernel/dma/swiotlb.c +6
-10@@ -441,14 +441,11 @@ static void swiotlb_bounce(phys_addr_t orig_addr, phys_addr_t tlb_addr, } } -phys_addr_t swiotlb_tbl_map_single (struct device *hwdev, -dma_addr_t tbl_dma_addr, -phys_addr_t orig_addr, -size_t mapping_size, -size_t alloc_size, -enum dma_data_direction dir, -unsigned long attrs) +phys_addr_t swiotlb_tbl_map_single (struct device *hwdev,phys_addr_t orig_addr, +size_t mapping_size,size_t alloc_size, +enum dma_data_direction dir,unsigned long attrs) { +dma_addr_t tbl_dma_addr =phys_to_dma_unencrypted (hwdev, io_tlb_start);unsigned long flags;phys_addr_t tlb_addr;unsigned int nslots, stride, index, wrap;@@ -667,9 +664,8 @@ dma_addr_t swiotlb_map(struct device *dev, phys_addr_t paddr, size_t size,trace_swiotlb_bounced (dev,phys_to_dma (dev, paddr), size, swiotlb_force); - swiotlb_addr =swiotlb_tbl_map_single (dev, -phys_to_dma_unencrypted (dev, io_tlb_start), - paddr, size, size, dir, attrs); + swiotlb_addr =swiotlb_tbl_map_single (dev, paddr, size, size, dir, + attrs);if (swiotlb_addr == (phys_addr_t )DMA_MAPPING_ERROR )return DMA_MAPPING_ERROR ;
Quoted 8 lines
Quoted 7 lines
Signature · 6 lines
2.28.0 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu---end quoted text---
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Quoted 5 lines · Konrad Rzeszutek Wilk
Quoted 1 line · Christoph Hellwig
ping?
Hopefully this goes through. I am in the process of testing it but ran into testing issues that I believe are unrelated.
Did you manage to make any progress? This fixes an issue with the new support for systems with DMA offsets in 5.10..
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Quoted 8 lines · Christoph Hellwig
Quoted 5 lines · Konrad Rzeszutek Wilk
Quoted 1 line · Christoph Hellwig
ping?
Hopefully this goes through. I am in the process of testing it but ran into testing issues that I believe are unrelated.
Did you manage to make any progress? This fixes an issue with the
YES!!
Quoted 1 line
new support for systems with DMA offsets in 5.10..
OK. Sending the git pull request in a minute or two.
_______________________________________________
iommu mailing list [email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu