dma-direct: enable mmap for !CONFIG_MMU
PATCH 1/1 dma-direct: enable mmap for !CONFIG_MMU
nommu configfs can trivially map the coherent allocations to user space, as no actual page table setup is required and the kernel and the user space programs share the same address space.
--- kernel/dma/Kconfig | 1 + kernel/dma/direct.c | 14 -------------- 2 files changed, 1 insertion(+), 14 deletions(-)
kernel/dma/Kconfig +1 -0
@@ -71,6 +71,7 @@ config SWIOTLB # in the pagetables # config DMA_NONCOHERENT_MMAP + default y if !MMU bool config DMA_REMAP
kernel/dma/direct.c +0 -14
@@ -459,7 +459,6 @@ int dma_direct_get_sgtable(struct device *dev, struct sg_table *sgt,return ret; } -#ifdef CONFIG_MMU bool dma_direct_can_mmap (struct device *dev) { return dev_is_dma_coherent(dev) ||
@@ -485,19 +484,6 @@ int dma_direct_mmap(struct device *dev, struct vm_area_struct *vma,return remap_pfn_range (vma, vma->vm_start, pfn + vma->vm_pgoff, user_count <<PAGE_SHIFT , vma->vm_page_prot); } -#else /* CONFIG_MMU */ -bool dma_direct_can_mmap (struct device *dev) -{ -return false; -} - -int dma_direct_mmap (struct device *dev,struct vm_area_struct *vma, -void *cpu_addr,dma_addr_t dma_addr,size_t size, -unsigned long attrs) -{ -return -ENXIO ; -} -#endif /* CONFIG_MMU */ int dma_direct_supported (struct device *dev,u64 mask) {
Signature · 6 lines
2.26.2 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Quoted 49 lines · Christoph Hellwig
nommu configfs can trivially map the coherent allocations to user space, as no actual page table setup is required and the kernel and the user space programs share the same address space.
Fixes 62fcee9a3bd7 ("dma-mapping: remove CONFIG_ARCH_NO_COHERENT_DMA_MMAP")Signed-off-by Christoph Hellwig <[email protected]>Reported-by dillon min <[email protected]>Reviewed-by Vladimir Murzin <[email protected]>Tested-by dillon min <[email protected]>--- kernel/dma/Kconfig | 1 + kernel/dma/direct.c | 14 -------------- 2 files changed, 1 insertion(+), 14 deletions(-)kernel/dma/Kconfig +1
-0@@ -71,6 +71,7 @@ config SWIOTLB # in the pagetables # config DMA_NONCOHERENT_MMAP + default y if !MMU bool config DMA_REMAPkernel/dma/direct.c +0
-7@@ -459,7 +459,6 @@ int dma_direct_get_sgtable(struct device *dev, struct sg_table *sgt,return ret; } -#ifdef CONFIG_MMU bool dma_direct_can_mmap (struct device *dev) { return dev_is_dma_coherent(dev) ||@@ -485,19 +484,6 @@ int dma_direct_mmap(struct device *dev, struct vm_area_struct *vma,return remap_pfn_range (vma, vma->vm_start, pfn + vma->vm_pgoff, user_count <<PAGE_SHIFT , vma->vm_page_prot); } -#else /* CONFIG_MMU */ -bool dma_direct_can_mmap (struct device *dev) -{ -return false; -} -
kernel/dma/direct.c int dma_direct_mmap(struct device *dev, struct vm_area_struct *vma, · line 489
Quoted 10 lines
kernel/dma/direct.c +0
-7-int dma_direct_mmap (struct device *dev,struct vm_area_struct *vma, -void *cpu_addr,dma_addr_t dma_addr,size_t size, -unsigned long attrs) -{ -return -ENXIO ; -} -#endif /* CONFIG_MMU */ int dma_direct_supported (struct device *dev,u64 mask) {
LGTM. Should it go stable as well?
Cheers
Vladimir
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
Quoted 1 line · Vladimir Murzin
LGTM. Should it go stable as well?
I think it will be picked up automatically eventually due to the Fixes tag.
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu