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 92435C433EF for ; Thu, 4 Nov 2021 12:37:33 +0000 (UTC) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.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 5246A61076 for ; Thu, 4 Nov 2021 12:37:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5246A61076 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 smtp2.osuosl.org (Postfix) with ESMTP id 2AE60403B6; Thu, 4 Nov 2021 12:37:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fa_PWfvQ3gQt; Thu, 4 Nov 2021 12:37:32 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp2.osuosl.org (Postfix) with ESMTPS id B931F400F3; Thu, 4 Nov 2021 12:37:31 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id A2362C0019; Thu, 4 Nov 2021 12:37:31 +0000 (UTC) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) by lists.linuxfoundation.org (Postfix) with ESMTP id C3BC9C000E for ; Thu, 4 Nov 2021 12:37:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id A640440599 for ; Thu, 4 Nov 2021 12:37:30 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id e5xrIctcwRco for ; Thu, 4 Nov 2021 12:37:30 +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 smtp4.osuosl.org (Postfix) with ESMTP id 0053B4058D for ; Thu, 4 Nov 2021 12:37:29 +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 80B011063; Thu, 4 Nov 2021 05:37:29 -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 E75203F7D7; Thu, 4 Nov 2021 05:37:28 -0700 (PDT) Message-ID: <84544f0a-c0e8-758d-474b-736e7d83c619@arm.com> Date: Thu, 4 Nov 2021 12:37:24 +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 10/10] dma-direct: add a dma_direct_use_pool helper Content-Language: en-GB To: Christoph Hellwig , iommu@lists.linux-foundation.org References: <20211021090611.488281-1-hch@lst.de> <20211021090611.488281-11-hch@lst.de> From: Robin Murphy In-Reply-To: <20211021090611.488281-11-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: > Add a helper to check if a potentially blocking operation should > dip into the atomic pools. Reviewed-by: Robin Murphy > Signed-off-by: Christoph Hellwig > --- > kernel/dma/direct.c | 18 ++++++++++++------ > 1 file changed, 12 insertions(+), 6 deletions(-) > > diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c > index f2ec40f5733fc..babf79c16c041 100644 > --- a/kernel/dma/direct.c > +++ b/kernel/dma/direct.c > @@ -151,6 +151,15 @@ static struct page *__dma_direct_alloc_pages(struct device *dev, size_t size, > return page; > } > > +/* > + * Check if a potentially blocking operations needs to dip into the atomic > + * pools for the given device/gfp. > + */ > +static bool dma_direct_use_pool(struct device *dev, gfp_t gfp) > +{ > + return gfpflags_allow_blocking(gfp) && !is_swiotlb_for_alloc(dev); > +} > + > static void *dma_direct_alloc_from_pool(struct device *dev, size_t size, > dma_addr_t *dma_handle, gfp_t gfp) > { > @@ -229,8 +238,7 @@ void *dma_direct_alloc(struct device *dev, size_t size, > * instead have to dip into the atomic pools. > */ > if (IS_ENABLED(CONFIG_DMA_DIRECT_REMAP)) { > - if (!gfpflags_allow_blocking(gfp) && > - !is_swiotlb_for_alloc(dev)) > + if (dma_direct_use_pool(dev, gfp)) > return dma_direct_alloc_from_pool(dev, size, > dma_handle, gfp); > remap = true; > @@ -241,8 +249,7 @@ void *dma_direct_alloc(struct device *dev, size_t size, > * Decrypting memory may block, so allocate the memory from the atomic > * pools if we can't block. > */ > - if (force_dma_unencrypted(dev) && !gfpflags_allow_blocking(gfp) && > - !is_swiotlb_for_alloc(dev)) > + if (force_dma_unencrypted(dev) && dma_direct_use_pool(dev, gfp)) > return dma_direct_alloc_from_pool(dev, size, dma_handle, gfp); > > /* we always manually zero the memory once we are done */ > @@ -359,8 +366,7 @@ struct page *dma_direct_alloc_pages(struct device *dev, size_t size, > struct page *page; > void *ret; > > - if (force_dma_unencrypted(dev) && !gfpflags_allow_blocking(gfp) && > - !is_swiotlb_for_alloc(dev)) > + if (force_dma_unencrypted(dev) && dma_direct_use_pool(dev, gfp)) > return dma_direct_alloc_from_pool(dev, size, dma_handle, gfp); > > page = __dma_direct_alloc_pages(dev, size, gfp); > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu