implement generic dma_map_ops for IOMMUs v2
Subsystems (3)
Hi Robin,
please take a look at this series, which implements a completely generic set of dma_map_ops for IOMMU drivers. This is done by taking the existing arm64 code, moving it to drivers/iommu and then massaging it so that it can also work for architectures with DMA remapping. This should help future ports to support IOMMUs more easily, and also allow to remove various custom IOMMU dma_map_ops implementations, like Tom was planning to for the AMD one.
A git tree is also available at:
git://git.infradead.org/users/hch/misc.git dma-iommu-ops.2
Gitweb:
http://git.infradead.org/users/hch/misc.git/shortlog/refs/heads/dma-iommu-ops.2
Changes since v1:
- only include other headers in dma-iommu.h if CONFIG_DMA_IOMMU is enabled
- keep using a scatterlist in iommu_dma_alloc
- split out mmap/sgtable fixes and move them early in the series
- updated a few commit logs
PATCH 1/29 dma-mapping: remove the default map_resource implementation
Instead provide a proper implementation in the direct mapping code, and also wire it up for arm and powerpc, leaving an error return for all the IOMMU or virtual mapping instances for which we'd have to wire up an actual implementation
--- arch/arm/mm/dma-mapping.c | 2 ++ arch/powerpc/kernel/dma-swiotlb.c | 1 + arch/powerpc/kernel/dma.c | 1 + include/linux/dma-mapping.h | 12 +++++++----- kernel/dma/direct.c | 14 ++++++++++++++ 5 files changed, 25 insertions(+), 5 deletions(-)
arch/arm/mm/dma-mapping.c +2 -0
@@ -188,6 +188,7 @@ const struct dma_map_ops arm_dma_ops = { .unmap_page = arm_dma_unmap_page, .map_sg = arm_dma_map_sg, .unmap_sg = arm_dma_unmap_sg, + .map_resource = dma_direct_map_resource, .sync_single_for_cpu = arm_dma_sync_single_for_cpu, .sync_single_for_device = arm_dma_sync_single_for_device, .sync_sg_for_cpu = arm_dma_sync_sg_for_cpu,
@@ -211,6 +212,7 @@ const struct dma_map_ops arm_coherent_dma_ops = { .get_sgtable = arm_dma_get_sgtable, .map_page = arm_coherent_dma_map_page, .map_sg = arm_dma_map_sg, + .map_resource = dma_direct_map_resource, .dma_supported = arm_dma_supported, };EXPORT_SYMBOL (arm_coherent_dma_ops);
arch/powerpc/kernel/dma-swiotlb.c +1 -0
@@ -55,6 +55,7 @@ const struct dma_map_ops powerpc_swiotlb_dma_ops = { .dma_supported = swiotlb_dma_supported, .map_page = dma_direct_map_page, .unmap_page = dma_direct_unmap_page, + .map_resource = dma_direct_map_resource, .sync_single_for_cpu = dma_direct_sync_single_for_cpu, .sync_single_for_device = dma_direct_sync_single_for_device, .sync_sg_for_cpu = dma_direct_sync_sg_for_cpu,
arch/powerpc/kernel/dma.c +1 -0
@@ -273,6 +273,7 @@ const struct dma_map_ops dma_nommu_ops = { .dma_supported = dma_nommu_dma_supported, .map_page = dma_nommu_map_page, .unmap_page = dma_nommu_unmap_page, + .map_resource = dma_direct_map_resource, .get_required_mask = dma_nommu_get_required_mask, #ifdef CONFIG_NOT_COHERENT_CACHE .sync_single_for_cpu = dma_nommu_sync_single,
include/linux/dma-mapping.h +7 -5
@@ -208,6 +208,8 @@ dma_addr_t dma_direct_map_page(struct device *dev, struct page *page, unsigned long attrs);int dma_direct_map_sg (struct device *dev,struct scatterlist *sgl,int nents,enum dma_data_direction dir,unsigned long attrs); +dma_addr_t dma_direct_map_resource (struct device *dev,phys_addr_t paddr, +size_t size,enum dma_data_direction dir,unsigned long attrs);#if defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE ) || \ defined(CONFIG_SWIOTLB )
@@ -346,19 +348,19 @@ static inline dma_addr_t dma_map_resource(struct device *dev, unsigned long attrs) {const struct dma_map_ops *ops =get_dma_ops (dev); -dma_addr_t addr; +dma_addr_t addr =DMA_MAPPING_ERROR ;BUG_ON (!valid_dma_direction (dir));/* Don't allow RAM to be mapped */ BUG_ON (pfn_valid (PHYS_PFN (phys_addr))); - addr = phys_addr; -if (ops && ops->map_resource) +if (dma_is_direct (ops)) + addr =dma_direct_map_resource (dev, phys_addr, size, dir, attrs); +else if (ops->map_resource) addr = ops->map_resource (dev, phys_addr, size, dir, attrs);debug_dma_map_resource (dev, phys_addr, size, dir, addr); -return addr; }
@@ -369,7 +371,7 @@ static inline void dma_unmap_resource(struct device *dev, dma_addr_t addr,const struct dma_map_ops *ops =get_dma_ops (dev);BUG_ON (!valid_dma_direction (dir)); -if (ops && ops->unmap_resource) +if (!dma_is_direct (ops) && ops->unmap_resource) ops->unmap_resource (dev, addr, size, dir, attrs);debug_dma_unmap_resource (dev, addr, size, dir); }
kernel/dma/direct.c +14 -0
@@ -356,6 +356,20 @@ int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, int nents, }EXPORT_SYMBOL (dma_direct_map_sg); +dma_addr_t dma_direct_map_resource (struct device *dev,phys_addr_t paddr, +size_t size,enum dma_data_direction dir,unsigned long attrs) +{ +dma_addr_t dma_addr = paddr; + +if (unlikely (!dma_direct_possible (dev, dma_addr, size))) { +report_addr (dev, dma_addr, size); +return DMA_MAPPING_ERROR ; + } + +return dma_addr; +} +EXPORT_SYMBOL (dma_direct_map_resource); +/* * Because 32-bit DMA masks are so common we expect every architecture to be * able to satisfy them - either by not supporting more physical memory, or by
Signature · 1 line
2.20.1
PATCH 2/29 dma-mapping: don't BUG when calling dma_map_resource on RAM
In reply to Christoph HellwigUse WARN_ON_ONCE to print a stack trace and return a proper error code instead.
--- include/linux/dma-mapping.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
include/linux/dma-mapping.h +2 -1
@@ -353,7 +353,8 @@ static inline dma_addr_t dma_map_resource(struct device *dev,BUG_ON (!valid_dma_direction (dir));/* Don't allow RAM to be mapped */ -BUG_ON (pfn_valid (PHYS_PFN (phys_addr))); +if (WARN_ON_ONCE (pfn_valid (PHYS_PFN (phys_addr)))) +return DMA_MAPPING_ERROR ;if (dma_is_direct (ops)) addr =dma_direct_map_resource (dev, phys_addr, size, dir, attrs);
Signature · 1 line
2.20.1
Sorry,
plese ignore this thread. This just resend the start of the dma-mapping for-next branch instead of the actual series that sits on top of it.