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_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable 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 1A8F2C282CE for ; Wed, 22 May 2019 17:11:17 +0000 (UTC) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E911721473 for ; Wed, 22 May 2019 17:11:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E911721473 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id B4888CD4; Wed, 22 May 2019 17:11:16 +0000 (UTC) Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 4DBC8CCC for ; Wed, 22 May 2019 17:11:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from foss.arm.com (foss.arm.com [217.140.101.70]) by smtp1.linuxfoundation.org (Postfix) with ESMTP id 297875D0 for ; Wed, 22 May 2019 17:11:13 +0000 (UTC) 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 B39E1341; Wed, 22 May 2019 10:11:13 -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 1AFEF3F5AF; Wed, 22 May 2019 10:11:11 -0700 (PDT) Subject: Re: [PATCH 20/24] iommu/dma: Refactor iommu_dma_mmap To: Christoph Hellwig References: <20190520072948.11412-1-hch@lst.de> <20190520072948.11412-21-hch@lst.de> From: Robin Murphy Message-ID: <3209b65c-7213-424c-ace2-4b419e03cc2a@arm.com> Date: Wed, 22 May 2019 18:11:09 +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: <20190520072948.11412-21-hch@lst.de> Content-Language: en-GB Cc: Tom Murphy , Catalin Marinas , Will Deacon , linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: iommu-bounces@lists.linux-foundation.org Errors-To: iommu-bounces@lists.linux-foundation.org On 20/05/2019 08:29, 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. This would be a good point to get rid of __iommu_dma_mmap() now too. Robin. > Signed-off-by: Christoph Hellwig > Reviewed-by: Robin Murphy > --- > drivers/iommu/dma-iommu.c | 46 ++++++++++----------------------------- > 1 file changed, 11 insertions(+), 35 deletions(-) > > diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c > index fa95794868a4..84150ca7b572 100644 > --- a/drivers/iommu/dma-iommu.c > +++ b/drivers/iommu/dma-iommu.c > @@ -1042,31 +1042,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) > -{ > - int ret = -ENXIO; > - unsigned long nr_vma_pages = vma_pages(vma); > - unsigned long nr_pages = PAGE_ALIGN(size) >> PAGE_SHIFT; > - unsigned long off = vma->vm_pgoff; > - > - if (off < nr_pages && nr_vma_pages <= (nr_pages - off)) { > - ret = remap_pfn_range(vma, vma->vm_start, > - pfn + off, > - vma->vm_end - vma->vm_start, > - vma->vm_page_prot); > - } > - > - return ret; > -} > - > 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); > @@ -1077,24 +1058,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 (!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, > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu