From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robin Murphy Subject: Re: [PATCH 23/26] iommu/dma: Don't depend on CONFIG_DMA_DIRECT_REMAP Date: Mon, 29 Apr 2019 15:46:28 +0100 Message-ID: <57ecaf25-ac9a-ec34-d552-bcbc1891875e@arm.com> References: <20190422175942.18788-1-hch@lst.de> <20190422175942.18788-24-hch@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20190422175942.18788-24-hch@lst.de> Content-Language: en-GB Sender: linux-kernel-owner@vger.kernel.org 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 List-Id: iommu@lists.linux-foundation.org On 22/04/2019 18:59, Christoph Hellwig wrote: > For entirely dma coherent architectures there is no requirement to ever > remap dma coherent allocation. Move all the remap and pool code under > IS_ENABLED() checks and drop the Kconfig dependency. Reviewed-by: Robin Murphy > Signed-off-by: Christoph Hellwig > --- > drivers/iommu/Kconfig | 1 - > drivers/iommu/dma-iommu.c | 16 +++++++++------- > 2 files changed, 9 insertions(+), 8 deletions(-) > > diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig > index bdc14baf2ee5..6f07f3b21816 100644 > --- a/drivers/iommu/Kconfig > +++ b/drivers/iommu/Kconfig > @@ -95,7 +95,6 @@ config IOMMU_DMA > select IOMMU_API > select IOMMU_IOVA > select NEED_SG_DMA_LENGTH > - depends on DMA_DIRECT_REMAP > > config FSL_PAMU > bool "Freescale IOMMU support" > diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c > index 8fc6098c1eeb..278a9a960107 100644 > --- a/drivers/iommu/dma-iommu.c > +++ b/drivers/iommu/dma-iommu.c > @@ -923,10 +923,11 @@ static void __iommu_dma_free(struct device *dev, size_t size, void *cpu_addr) > struct page *page = NULL; > > /* Non-coherent atomic allocation? Easy */ > - if (dma_free_from_pool(cpu_addr, alloc_size)) > + if (IS_ENABLED(CONFIG_DMA_DIRECT_REMAP) && > + dma_free_from_pool(cpu_addr, alloc_size)) > return; > > - if (is_vmalloc_addr(cpu_addr)) { > + if (IS_ENABLED(CONFIG_DMA_REMAP) && is_vmalloc_addr(cpu_addr)) { > /* > * If it the address is remapped, then it's either non-coherent > * or highmem CMA, or an iommu_dma_alloc_remap() construction. > @@ -972,7 +973,7 @@ static void *iommu_dma_alloc_pages(struct device *dev, size_t size, > if (!page) > return NULL; > > - if (!coherent || PageHighMem(page)) { > + if (IS_ENABLED(CONFIG_DMA_REMAP) && (!coherent || PageHighMem(page))) { > pgprot_t prot = arch_dma_mmap_pgprot(dev, PAGE_KERNEL, attrs); > > cpu_addr = dma_common_contiguous_remap(page, alloc_size, > @@ -1005,11 +1006,12 @@ static void *iommu_dma_alloc(struct device *dev, size_t size, > > gfp |= __GFP_ZERO; > > - if (gfpflags_allow_blocking(gfp) && > + if (IS_ENABLED(CONFIG_DMA_REMAP) && gfpflags_allow_blocking(gfp) && > !(attrs & DMA_ATTR_FORCE_CONTIGUOUS)) > return iommu_dma_alloc_remap(dev, size, handle, gfp, attrs); > > - if (!gfpflags_allow_blocking(gfp) && !coherent) > + if (IS_ENABLED(CONFIG_DMA_DIRECT_REMAP) && > + !gfpflags_allow_blocking(gfp) && !coherent) > cpu_addr = dma_alloc_from_pool(PAGE_ALIGN(size), &page, gfp); > else > cpu_addr = iommu_dma_alloc_pages(dev, size, &page, gfp, attrs); > @@ -1041,7 +1043,7 @@ 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)) { > + if (IS_ENABLED(CONFIG_DMA_REMAP) && is_vmalloc_addr(cpu_addr)) { > struct page **pages = __iommu_dma_get_pages(cpu_addr); > > if (pages) > @@ -1063,7 +1065,7 @@ static int iommu_dma_get_sgtable(struct device *dev, struct sg_table *sgt, > struct page *page; > int ret; > > - if (is_vmalloc_addr(cpu_addr)) { > + if (IS_ENABLED(CONFIG_DMA_REMAP) && is_vmalloc_addr(cpu_addr)) { > struct page **pages = __iommu_dma_get_pages(cpu_addr); > > if (pages) { > 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 32D15C43219 for ; Mon, 29 Apr 2019 14:50:22 +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 0D33420656 for ; Mon, 29 Apr 2019 14:50:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0D33420656 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 0E11821FA; Mon, 29 Apr 2019 14:48:35 +0000 (UTC) Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id D134321F9 for ; Mon, 29 Apr 2019 14:46:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from foss.arm.com (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by smtp1.linuxfoundation.org (Postfix) with ESMTP id 677ED608 for ; Mon, 29 Apr 2019 14:46:31 +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 2C24A80D; Mon, 29 Apr 2019 07:46:31 -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 BA8DB3F5C1; Mon, 29 Apr 2019 07:46:29 -0700 (PDT) Subject: Re: [PATCH 23/26] iommu/dma: Don't depend on CONFIG_DMA_DIRECT_REMAP To: Christoph Hellwig References: <20190422175942.18788-1-hch@lst.de> <20190422175942.18788-24-hch@lst.de> From: Robin Murphy Message-ID: <57ecaf25-ac9a-ec34-d552-bcbc1891875e@arm.com> Date: Mon, 29 Apr 2019 15:46:28 +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-24-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: <20190429144628.oIAQxfc7r_KKT4-5vD-vmV13ZxxCyyrgkoA14WFzaaA@z> On 22/04/2019 18:59, Christoph Hellwig wrote: > For entirely dma coherent architectures there is no requirement to ever > remap dma coherent allocation. Move all the remap and pool code under > IS_ENABLED() checks and drop the Kconfig dependency. Reviewed-by: Robin Murphy > Signed-off-by: Christoph Hellwig > --- > drivers/iommu/Kconfig | 1 - > drivers/iommu/dma-iommu.c | 16 +++++++++------- > 2 files changed, 9 insertions(+), 8 deletions(-) > > diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig > index bdc14baf2ee5..6f07f3b21816 100644 > --- a/drivers/iommu/Kconfig > +++ b/drivers/iommu/Kconfig > @@ -95,7 +95,6 @@ config IOMMU_DMA > select IOMMU_API > select IOMMU_IOVA > select NEED_SG_DMA_LENGTH > - depends on DMA_DIRECT_REMAP > > config FSL_PAMU > bool "Freescale IOMMU support" > diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c > index 8fc6098c1eeb..278a9a960107 100644 > --- a/drivers/iommu/dma-iommu.c > +++ b/drivers/iommu/dma-iommu.c > @@ -923,10 +923,11 @@ static void __iommu_dma_free(struct device *dev, size_t size, void *cpu_addr) > struct page *page = NULL; > > /* Non-coherent atomic allocation? Easy */ > - if (dma_free_from_pool(cpu_addr, alloc_size)) > + if (IS_ENABLED(CONFIG_DMA_DIRECT_REMAP) && > + dma_free_from_pool(cpu_addr, alloc_size)) > return; > > - if (is_vmalloc_addr(cpu_addr)) { > + if (IS_ENABLED(CONFIG_DMA_REMAP) && is_vmalloc_addr(cpu_addr)) { > /* > * If it the address is remapped, then it's either non-coherent > * or highmem CMA, or an iommu_dma_alloc_remap() construction. > @@ -972,7 +973,7 @@ static void *iommu_dma_alloc_pages(struct device *dev, size_t size, > if (!page) > return NULL; > > - if (!coherent || PageHighMem(page)) { > + if (IS_ENABLED(CONFIG_DMA_REMAP) && (!coherent || PageHighMem(page))) { > pgprot_t prot = arch_dma_mmap_pgprot(dev, PAGE_KERNEL, attrs); > > cpu_addr = dma_common_contiguous_remap(page, alloc_size, > @@ -1005,11 +1006,12 @@ static void *iommu_dma_alloc(struct device *dev, size_t size, > > gfp |= __GFP_ZERO; > > - if (gfpflags_allow_blocking(gfp) && > + if (IS_ENABLED(CONFIG_DMA_REMAP) && gfpflags_allow_blocking(gfp) && > !(attrs & DMA_ATTR_FORCE_CONTIGUOUS)) > return iommu_dma_alloc_remap(dev, size, handle, gfp, attrs); > > - if (!gfpflags_allow_blocking(gfp) && !coherent) > + if (IS_ENABLED(CONFIG_DMA_DIRECT_REMAP) && > + !gfpflags_allow_blocking(gfp) && !coherent) > cpu_addr = dma_alloc_from_pool(PAGE_ALIGN(size), &page, gfp); > else > cpu_addr = iommu_dma_alloc_pages(dev, size, &page, gfp, attrs); > @@ -1041,7 +1043,7 @@ 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)) { > + if (IS_ENABLED(CONFIG_DMA_REMAP) && is_vmalloc_addr(cpu_addr)) { > struct page **pages = __iommu_dma_get_pages(cpu_addr); > > if (pages) > @@ -1063,7 +1065,7 @@ static int iommu_dma_get_sgtable(struct device *dev, struct sg_table *sgt, > struct page *page; > int ret; > > - if (is_vmalloc_addr(cpu_addr)) { > + if (IS_ENABLED(CONFIG_DMA_REMAP) && is_vmalloc_addr(cpu_addr)) { > struct page **pages = __iommu_dma_get_pages(cpu_addr); > > if (pages) { > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu