From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35247C43219 for ; Mon, 29 Apr 2019 14:04:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0E00D20652 for ; Mon, 29 Apr 2019 14:04:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728339AbfD2OEM (ORCPT ); Mon, 29 Apr 2019 10:04:12 -0400 Received: from foss.arm.com ([217.140.101.70]:57778 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725838AbfD2OEM (ORCPT ); Mon, 29 Apr 2019 10:04:12 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B1D4CA78; Mon, 29 Apr 2019 07:04:11 -0700 (PDT) Received: from [10.1.196.75] (e110467-lin.cambridge.arm.com [10.1.196.75]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4BC9D3F5C1; Mon, 29 Apr 2019 07:04:10 -0700 (PDT) Subject: Re: [PATCH 22/26] iommu/dma: Refactor iommu_dma_mmap To: Christoph Hellwig Cc: Joerg Roedel , Catalin Marinas , Will Deacon , Tom Lendacky , iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org References: <20190422175942.18788-1-hch@lst.de> <20190422175942.18788-23-hch@lst.de> From: Robin Murphy Message-ID: Date: Mon, 29 Apr 2019 15:04:08 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190422175942.18788-23-hch@lst.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 22/04/2019 18:59, Christoph Hellwig wrote: > Inline __iommu_dma_mmap_pfn into the main function, and use the > fact that __iommu_dma_get_pages return NULL for remapped contigous > allocations to simplify the code flow a bit. ...and later we can squash __iommu_dma_mmap() once the dust settles on vm_map_pages() - seems good to me. Reviewed-by: Robin Murphy > Signed-off-by: Christoph Hellwig > --- > drivers/iommu/dma-iommu.c | 36 +++++++++++------------------------- > 1 file changed, 11 insertions(+), 25 deletions(-) > > diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c > index 138b85e675c8..8fc6098c1eeb 100644 > --- a/drivers/iommu/dma-iommu.c > +++ b/drivers/iommu/dma-iommu.c > @@ -1025,21 +1025,12 @@ static void *iommu_dma_alloc(struct device *dev, size_t size, > return cpu_addr; > } > > -static int __iommu_dma_mmap_pfn(struct vm_area_struct *vma, > - unsigned long pfn, size_t size) > -{ > - return remap_pfn_range(vma, vma->vm_start, pfn + vma->vm_pgoff, > - vma->vm_end - vma->vm_start, > - vma->vm_page_prot); > -} > - > static int iommu_dma_mmap(struct device *dev, struct vm_area_struct *vma, > void *cpu_addr, dma_addr_t dma_addr, size_t size, > unsigned long attrs) > { > unsigned long nr_pages = PAGE_ALIGN(size) >> PAGE_SHIFT; > - unsigned long off = vma->vm_pgoff; > - struct page **pages; > + unsigned long pfn, off = vma->vm_pgoff; > int ret; > > vma->vm_page_prot = arch_dma_mmap_pgprot(dev, vma->vm_page_prot, attrs); > @@ -1050,24 +1041,19 @@ static int iommu_dma_mmap(struct device *dev, struct vm_area_struct *vma, > if (off >= nr_pages || vma_pages(vma) > nr_pages - off) > return -ENXIO; > > - if (!is_vmalloc_addr(cpu_addr)) { > - unsigned long pfn = page_to_pfn(virt_to_page(cpu_addr)); > - return __iommu_dma_mmap_pfn(vma, pfn, size); > - } > + if (is_vmalloc_addr(cpu_addr)) { > + struct page **pages = __iommu_dma_get_pages(cpu_addr); > > - if (attrs & DMA_ATTR_FORCE_CONTIGUOUS) { > - /* > - * DMA_ATTR_FORCE_CONTIGUOUS allocations are always remapped, > - * hence in the vmalloc space. > - */ > - unsigned long pfn = vmalloc_to_pfn(cpu_addr); > - return __iommu_dma_mmap_pfn(vma, pfn, size); > + if (pages) > + return __iommu_dma_mmap(pages, size, vma); > + pfn = vmalloc_to_pfn(cpu_addr); > + } else { > + pfn = page_to_pfn(virt_to_page(cpu_addr)); > } > > - pages = __iommu_dma_get_pages(cpu_addr); > - if (WARN_ON_ONCE(!pages)) > - return -ENXIO; > - return __iommu_dma_mmap(pages, size, vma); > + return remap_pfn_range(vma, vma->vm_start, pfn + off, > + vma->vm_end - vma->vm_start, > + vma->vm_page_prot); > } > > static int iommu_dma_get_sgtable(struct device *dev, struct sg_table *sgt, >