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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 05666C433F5 for ; Thu, 4 Nov 2021 12:37:15 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (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 B2AF1611EE for ; Thu, 4 Nov 2021 12:37:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B2AF1611EE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 86B8B81801; Thu, 4 Nov 2021 12:37:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id U_ddS6pyBbeO; Thu, 4 Nov 2021 12:37:13 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 6309D817C0; Thu, 4 Nov 2021 12:37:13 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 4F710C0019; Thu, 4 Nov 2021 12:37:13 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 345ADC000E for ; Thu, 4 Nov 2021 12:37:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 30D2460876 for ; Thu, 4 Nov 2021 12:37:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DTr3c-iOAEsg for ; Thu, 4 Nov 2021 12:37:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp3.osuosl.org (Postfix) with ESMTP id 7F3446086E for ; Thu, 4 Nov 2021 12:37:11 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 1867D12FC; Thu, 4 Nov 2021 05:37:11 -0700 (PDT) Received: from [10.57.80.217] (unknown [10.57.80.217]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 827E43F7D7; Thu, 4 Nov 2021 05:37:10 -0700 (PDT) Message-ID: Date: Thu, 4 Nov 2021 12:37:05 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Thunderbird/91.2.1 Subject: Re: [PATCH 08/10] dma-direct: drop two CONFIG_DMA_RESTRICTED_POOL conditionals Content-Language: en-GB To: Christoph Hellwig , iommu@lists.linux-foundation.org References: <20211021090611.488281-1-hch@lst.de> <20211021090611.488281-9-hch@lst.de> From: Robin Murphy In-Reply-To: <20211021090611.488281-9-hch@lst.de> Cc: David Rientjes X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 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" Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" On 2021-10-21 10:06, Christoph Hellwig wrote: > swiotlb_alloc and swiotlb_free are properly stubbed out if > CONFIG_DMA_RESTRICTED_POOL is not set, so skip the extra checks. Reviewed-by: Robin Murphy > Signed-off-by: Christoph Hellwig > --- > kernel/dma/direct.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c > index 680fe10410645..f4ac2e1cdf469 100644 > --- a/kernel/dma/direct.c > +++ b/kernel/dma/direct.c > @@ -92,8 +92,7 @@ static int dma_set_encrypted(struct device *dev, void *vaddr, size_t size) > static void __dma_direct_free_pages(struct device *dev, struct page *page, > size_t size) > { > - if (IS_ENABLED(CONFIG_DMA_RESTRICTED_POOL) && > - swiotlb_free(dev, page, size)) > + if (swiotlb_free(dev, page, size)) > return; > dma_free_contiguous(dev, page, size); > } > @@ -109,8 +108,7 @@ static struct page *__dma_direct_alloc_pages(struct device *dev, size_t size, > > gfp |= dma_direct_optimal_gfp_mask(dev, dev->coherent_dma_mask, > &phys_limit); > - if (IS_ENABLED(CONFIG_DMA_RESTRICTED_POOL) && > - is_swiotlb_for_alloc(dev)) { > + if (is_swiotlb_for_alloc(dev)) { > page = swiotlb_alloc(dev, size); > if (page && !dma_coherent_ok(dev, page_to_phys(page), size)) { > __dma_direct_free_pages(dev, page, size); > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu