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 CEF18C43219 for ; Mon, 29 Apr 2019 14:09:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A4E0F2177B for ; Mon, 29 Apr 2019 14:09:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728330AbfD2OJC (ORCPT ); Mon, 29 Apr 2019 10:09:02 -0400 Received: from foss.arm.com ([217.140.101.70]:57994 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728119AbfD2OJB (ORCPT ); Mon, 29 Apr 2019 10:09:01 -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 3072FA78; Mon, 29 Apr 2019 07:09:01 -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 BBEE43F5C1; Mon, 29 Apr 2019 07:08:59 -0700 (PDT) Subject: Re: [PATCH 21/26] iommu/dma: Refactor iommu_dma_get_sgtable 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-22-hch@lst.de> From: Robin Murphy Message-ID: <10b0710c-b2b4-7647-6846-71d9df4bd038@arm.com> Date: Mon, 29 Apr 2019 15:08:58 +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-22-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_get_sgtable_page 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. Yeah, even I was a bit dubious about the readability of "if (page)... else if (pages)..." that my attempt ended up with, so I don't really have anything to complain about here. Reviewed-by: Robin Murphy > Signed-off-by: Christoph Hellwig > --- > drivers/iommu/dma-iommu.c | 45 +++++++++++++++------------------------ > 1 file changed, 17 insertions(+), 28 deletions(-) > > diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c > index acdfe866cb29..138b85e675c8 100644 > --- a/drivers/iommu/dma-iommu.c > +++ b/drivers/iommu/dma-iommu.c > @@ -1070,42 +1070,31 @@ static int iommu_dma_mmap(struct device *dev, struct vm_area_struct *vma, > return __iommu_dma_mmap(pages, size, vma); > } > > -static int __iommu_dma_get_sgtable_page(struct sg_table *sgt, struct page *page, > - size_t size) > -{ > - int ret = sg_alloc_table(sgt, 1, GFP_KERNEL); > - > - if (!ret) > - sg_set_page(sgt->sgl, page, PAGE_ALIGN(size), 0); > - return ret; > -} > - > static int iommu_dma_get_sgtable(struct device *dev, struct sg_table *sgt, > void *cpu_addr, dma_addr_t dma_addr, size_t size, > unsigned long attrs) > { > - unsigned int count = PAGE_ALIGN(size) >> PAGE_SHIFT; > - struct page **pages; > + struct page *page; > + int ret; > > - if (!is_vmalloc_addr(cpu_addr)) { > - struct page *page = virt_to_page(cpu_addr); > - return __iommu_dma_get_sgtable_page(sgt, page, 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. > - */ > - struct page *page = vmalloc_to_page(cpu_addr); > - return __iommu_dma_get_sgtable_page(sgt, page, size); > + if (pages) { > + return sg_alloc_table_from_pages(sgt, pages, > + PAGE_ALIGN(size) >> PAGE_SHIFT, > + 0, size, GFP_KERNEL); > + } > + > + page = vmalloc_to_page(cpu_addr); > + } else { > + page = virt_to_page(cpu_addr); > } > > - pages = __iommu_dma_get_pages(cpu_addr); > - if (WARN_ON_ONCE(!pages)) > - return -ENXIO; > - return sg_alloc_table_from_pages(sgt, pages, count, 0, size, > - GFP_KERNEL); > + ret = sg_alloc_table(sgt, 1, GFP_KERNEL); > + if (!ret) > + sg_set_page(sgt->sgl, page, PAGE_ALIGN(size), 0); > + return ret; > } > > static const struct dma_map_ops iommu_dma_ops = { > 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,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 C61DBC43219 for ; Mon, 29 Apr 2019 14:11:04 +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 A1CCC2084B for ; Mon, 29 Apr 2019 14:11:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A1CCC2084B 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 674ED2167; Mon, 29 Apr 2019 14:11:04 +0000 (UTC) Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id CA0561E57 for ; Mon, 29 Apr 2019 14:09:01 +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 62700608 for ; Mon, 29 Apr 2019 14:09:01 +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 3072FA78; Mon, 29 Apr 2019 07:09:01 -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 BBEE43F5C1; Mon, 29 Apr 2019 07:08:59 -0700 (PDT) Subject: Re: [PATCH 21/26] iommu/dma: Refactor iommu_dma_get_sgtable To: Christoph Hellwig References: <20190422175942.18788-1-hch@lst.de> <20190422175942.18788-22-hch@lst.de> From: Robin Murphy Message-ID: <10b0710c-b2b4-7647-6846-71d9df4bd038@arm.com> Date: Mon, 29 Apr 2019 15:08:58 +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-22-hch@lst.de> Content-Language: en-GB Cc: Tom Lendacky , 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="UTF-8"; format="flowed" Sender: iommu-bounces@lists.linux-foundation.org Errors-To: iommu-bounces@lists.linux-foundation.org Message-ID: <20190429140858.1Al_nS9AgHc6DXHgRgJwYK8SNNl9hQohMzeAauz3_1A@z> On 22/04/2019 18:59, Christoph Hellwig wrote: > Inline __iommu_dma_get_sgtable_page 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. Yeah, even I was a bit dubious about the readability of "if (page)... else if (pages)..." that my attempt ended up with, so I don't really have anything to complain about here. Reviewed-by: Robin Murphy > Signed-off-by: Christoph Hellwig > --- > drivers/iommu/dma-iommu.c | 45 +++++++++++++++------------------------ > 1 file changed, 17 insertions(+), 28 deletions(-) > > diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c > index acdfe866cb29..138b85e675c8 100644 > --- a/drivers/iommu/dma-iommu.c > +++ b/drivers/iommu/dma-iommu.c > @@ -1070,42 +1070,31 @@ static int iommu_dma_mmap(struct device *dev, struct vm_area_struct *vma, > return __iommu_dma_mmap(pages, size, vma); > } > > -static int __iommu_dma_get_sgtable_page(struct sg_table *sgt, struct page *page, > - size_t size) > -{ > - int ret = sg_alloc_table(sgt, 1, GFP_KERNEL); > - > - if (!ret) > - sg_set_page(sgt->sgl, page, PAGE_ALIGN(size), 0); > - return ret; > -} > - > static int iommu_dma_get_sgtable(struct device *dev, struct sg_table *sgt, > void *cpu_addr, dma_addr_t dma_addr, size_t size, > unsigned long attrs) > { > - unsigned int count = PAGE_ALIGN(size) >> PAGE_SHIFT; > - struct page **pages; > + struct page *page; > + int ret; > > - if (!is_vmalloc_addr(cpu_addr)) { > - struct page *page = virt_to_page(cpu_addr); > - return __iommu_dma_get_sgtable_page(sgt, page, 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. > - */ > - struct page *page = vmalloc_to_page(cpu_addr); > - return __iommu_dma_get_sgtable_page(sgt, page, size); > + if (pages) { > + return sg_alloc_table_from_pages(sgt, pages, > + PAGE_ALIGN(size) >> PAGE_SHIFT, > + 0, size, GFP_KERNEL); > + } > + > + page = vmalloc_to_page(cpu_addr); > + } else { > + page = virt_to_page(cpu_addr); > } > > - pages = __iommu_dma_get_pages(cpu_addr); > - if (WARN_ON_ONCE(!pages)) > - return -ENXIO; > - return sg_alloc_table_from_pages(sgt, pages, count, 0, size, > - GFP_KERNEL); > + ret = sg_alloc_table(sgt, 1, GFP_KERNEL); > + if (!ret) > + sg_set_page(sgt->sgl, page, PAGE_ALIGN(size), 0); > + return ret; > } > > static const struct dma_map_ops iommu_dma_ops = { > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu 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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS 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 7A584C43219 for ; Mon, 29 Apr 2019 14:09:05 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 47E8821744 for ; Mon, 29 Apr 2019 14:09:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="eiAVdjki" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 47E8821744 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender:Content-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ZENopipmsflf8LHP57djhbVss1BjUMrTJd1wtNxmBxg=; b=eiAVdjkiU+dnZads/bnEgG9J9 EgMsETQo8TUILpzwbSmkIVOR+wcUd5K4yqomhDCqrS4hrLFUB6ZmqZBXX9MFbWVmuNBZ9w5cQPPL2 iqVLF6XaK43tuYi+jma+vZ+sfW8KdQDzLBE9+VdNKmiRvyuVnrKKQhx5YHMEz+wbHzHr4ajfHvjAP Dtbwx5n+8zF87FoUH7saSLqLGcDV6ZlinxGde6iq+k1IgXMnn1w2PTcNQDZ73YzaEhNu+h12ubXsY 65Lkc+WhJmIOMNZU56OGq+1TNlf0AaHqLYGICISfSq29EZLYFhxDlokrleSCbSumeDEZoh2hSlwS7 Ou8unT8hA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hL6xs-0001q6-H1; Mon, 29 Apr 2019 14:09:04 +0000 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70] helo=foss.arm.com) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hL6xq-0001pi-1H for linux-arm-kernel@lists.infradead.org; Mon, 29 Apr 2019 14:09:03 +0000 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 3072FA78; Mon, 29 Apr 2019 07:09:01 -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 BBEE43F5C1; Mon, 29 Apr 2019 07:08:59 -0700 (PDT) Subject: Re: [PATCH 21/26] iommu/dma: Refactor iommu_dma_get_sgtable To: Christoph Hellwig References: <20190422175942.18788-1-hch@lst.de> <20190422175942.18788-22-hch@lst.de> From: Robin Murphy Message-ID: <10b0710c-b2b4-7647-6846-71d9df4bd038@arm.com> Date: Mon, 29 Apr 2019 15:08:58 +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-22-hch@lst.de> Content-Language: en-GB X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190429_070902_078377_F9AB1283 X-CRM114-Status: GOOD ( 27.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tom Lendacky , Catalin Marinas , Joerg Roedel , Will Deacon , linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 22/04/2019 18:59, Christoph Hellwig wrote: > Inline __iommu_dma_get_sgtable_page 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. Yeah, even I was a bit dubious about the readability of "if (page)... else if (pages)..." that my attempt ended up with, so I don't really have anything to complain about here. Reviewed-by: Robin Murphy > Signed-off-by: Christoph Hellwig > --- > drivers/iommu/dma-iommu.c | 45 +++++++++++++++------------------------ > 1 file changed, 17 insertions(+), 28 deletions(-) > > diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c > index acdfe866cb29..138b85e675c8 100644 > --- a/drivers/iommu/dma-iommu.c > +++ b/drivers/iommu/dma-iommu.c > @@ -1070,42 +1070,31 @@ static int iommu_dma_mmap(struct device *dev, struct vm_area_struct *vma, > return __iommu_dma_mmap(pages, size, vma); > } > > -static int __iommu_dma_get_sgtable_page(struct sg_table *sgt, struct page *page, > - size_t size) > -{ > - int ret = sg_alloc_table(sgt, 1, GFP_KERNEL); > - > - if (!ret) > - sg_set_page(sgt->sgl, page, PAGE_ALIGN(size), 0); > - return ret; > -} > - > static int iommu_dma_get_sgtable(struct device *dev, struct sg_table *sgt, > void *cpu_addr, dma_addr_t dma_addr, size_t size, > unsigned long attrs) > { > - unsigned int count = PAGE_ALIGN(size) >> PAGE_SHIFT; > - struct page **pages; > + struct page *page; > + int ret; > > - if (!is_vmalloc_addr(cpu_addr)) { > - struct page *page = virt_to_page(cpu_addr); > - return __iommu_dma_get_sgtable_page(sgt, page, 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. > - */ > - struct page *page = vmalloc_to_page(cpu_addr); > - return __iommu_dma_get_sgtable_page(sgt, page, size); > + if (pages) { > + return sg_alloc_table_from_pages(sgt, pages, > + PAGE_ALIGN(size) >> PAGE_SHIFT, > + 0, size, GFP_KERNEL); > + } > + > + page = vmalloc_to_page(cpu_addr); > + } else { > + page = virt_to_page(cpu_addr); > } > > - pages = __iommu_dma_get_pages(cpu_addr); > - if (WARN_ON_ONCE(!pages)) > - return -ENXIO; > - return sg_alloc_table_from_pages(sgt, pages, count, 0, size, > - GFP_KERNEL); > + ret = sg_alloc_table(sgt, 1, GFP_KERNEL); > + if (!ret) > + sg_set_page(sgt->sgl, page, PAGE_ALIGN(size), 0); > + return ret; > } > > static const struct dma_map_ops iommu_dma_ops = { > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel