The patch titled Subject: iommu/dma-iommu.c: convert to use vm_map_pages() has been added to the -mm tree. Its filename is iommu-dma-iommuc-convert-to-use-vm_map_pages.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/iommu-dma-iommuc-convert-to-use-vm_map_pages.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/iommu-dma-iommuc-convert-to-use-vm_map_pages.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Souptick Joarder <jrdr.linux@xxxxxxxxx> Subject: iommu/dma-iommu.c: convert to use vm_map_pages() Convert to use vm_map_pages() to map range of kernel memory to user vma. Link: http://lkml.kernel.org/r/80c3d220fc6ada73a88ce43ca049afb55a889258.1552921225.git.jrdr.linux@xxxxxxxxx Signed-off-by: Souptick Joarder <jrdr.linux@xxxxxxxxx> Cc: Boris Ostrovsky <boris.ostrovsky@xxxxxxxxxx> Cc: David Airlie <airlied@xxxxxxxx> Cc: Heiko Stuebner <heiko@xxxxxxxxx> Cc: Joerg Roedel <joro@xxxxxxxxxx> Cc: Joonsoo Kim <iamjoonsoo.kim@xxxxxxx> Cc: Juergen Gross <jgross@xxxxxxxx> Cc: Kees Cook <keescook@xxxxxxxxxxxx> Cc: "Kirill A. Shutemov" <kirill.shutemov@xxxxxxxxxxxxxxx> Cc: Kyungmin Park <kyungmin.park@xxxxxxxxxxx> Cc: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx> Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx> Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxxx> Cc: Mike Rapoport <rppt@xxxxxxxxxxxxx> Cc: Oleksandr Andrushchenko <oleksandr_andrushchenko@xxxxxxxx> Cc: Pawel Osciak <pawel@xxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Rik van Riel <riel@xxxxxxxxxxx> Cc: Robin Murphy <robin.murphy@xxxxxxx> Cc: Russell King <linux@xxxxxxxxxxxxxxx> Cc: Sandy Huang <hjc@xxxxxxxxxxxxxx> Cc: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx> Cc: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Cc: Thierry Reding <treding@xxxxxxxxxx> Cc: Vlastimil Babka <vbabka@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/iommu/dma-iommu.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) --- a/drivers/iommu/dma-iommu.c~iommu-dma-iommuc-convert-to-use-vm_map_pages +++ a/drivers/iommu/dma-iommu.c @@ -619,17 +619,7 @@ out_free_pages: int iommu_dma_mmap(struct page **pages, size_t size, struct vm_area_struct *vma) { - unsigned long uaddr = vma->vm_start; - unsigned int i, count = PAGE_ALIGN(size) >> PAGE_SHIFT; - int ret = -ENXIO; - - for (i = vma->vm_pgoff; i < count && uaddr < vma->vm_end; i++) { - ret = vm_insert_page(vma, uaddr, pages[i]); - if (ret) - break; - uaddr += PAGE_SIZE; - } - return ret; + return vm_map_pages(vma, pages, PAGE_ALIGN(size) >> PAGE_SHIFT); } static dma_addr_t __iommu_dma_map(struct device *dev, phys_addr_t phys, _ Patches currently in -mm which might be from jrdr.linux@xxxxxxxxx are mm-introduce-new-vm_map_pages-and-vm_map_pages_zero-api.patch arm-mm-dma-mapping-convert-to-use-vm_map_pages.patch drivers-firewire-core-isoc-convert-to-use-vm_map_pages_zero.patch drm-rockchip-rockchip_drm_gemc-convert-to-use-vm_map_pages.patch drm-xen-xen_drm_front_gemc-convert-to-use-vm_map_pages.patch iommu-dma-iommuc-convert-to-use-vm_map_pages.patch videobuf2-videobuf2-dma-sgc-convert-to-use-vm_map_pages.patch xen-gntdevc-convert-to-use-vm_map_pages.patch xen-privcmd-bufc-convert-to-use-vm_map_pages_zero.patch