From: Robin Murphy <robin.murphy@arm.com>
To: Christoph Hellwig <hch@lst.de>, iommu@lists.linux-foundation.org
Cc: David Rientjes <rientjes@google.com>
Subject: Re: [PATCH 08/10] dma-direct: drop two CONFIG_DMA_RESTRICTED_POOL conditionals
Date: Thu, 4 Nov 2021 12:37:05 +0000 [thread overview]
Message-ID: <cc837772-d62c-997d-766d-a8d040cb2907@arm.com> (raw)
In-Reply-To: <20211021090611.488281-9-hch@lst.de>
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 <robin.murphy@arm.com>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> 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
next prev parent reply other threads:[~2021-11-04 12:37 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-21 9:06 dma-direct fixes and cleanups v2 Christoph Hellwig
2021-10-21 9:06 ` [PATCH 01/10] dma-direct: factor out dma_set_{de,en}crypted helpers Christoph Hellwig
2021-11-04 12:35 ` Robin Murphy
2021-10-21 9:06 ` [PATCH 02/10] dma-direct: unmapped remapped pages when dma_set_decrypted Christoph Hellwig
2021-11-04 12:35 ` Robin Murphy
2021-11-09 14:10 ` Christoph Hellwig
2021-11-09 14:27 ` Robin Murphy
2021-10-21 9:06 ` [PATCH 03/10] dma-direct: leak memory that can't be re-encrypted Christoph Hellwig
2021-11-04 12:35 ` Robin Murphy
2021-11-09 14:19 ` Christoph Hellwig
2021-10-21 9:06 ` [PATCH 04/10] dma-direct: clean up the remapping checks in dma_direct_alloc Christoph Hellwig
2021-11-04 12:35 ` Robin Murphy
2021-11-09 14:23 ` Christoph Hellwig
2021-10-21 9:06 ` [PATCH 05/10] dma-direct: factor out a helper for DMA_ATTR_NO_KERNEL_MAPPING allocations Christoph Hellwig
2021-11-04 12:36 ` Robin Murphy
2021-11-09 14:25 ` Christoph Hellwig
2021-11-09 14:39 ` Robin Murphy
2021-10-21 9:06 ` [PATCH 06/10] dma-direct: refactor the !coherent checks in dma_direct_alloc Christoph Hellwig
2021-11-04 12:36 ` Robin Murphy
2021-11-09 14:27 ` Christoph Hellwig
2021-10-21 9:06 ` [PATCH 07/10] dma-direct: warn if there is no pool for force unencrypted allocations Christoph Hellwig
2021-11-04 12:36 ` Robin Murphy
2021-10-21 9:06 ` [PATCH 08/10] dma-direct: drop two CONFIG_DMA_RESTRICTED_POOL conditionals Christoph Hellwig
2021-11-04 12:37 ` Robin Murphy [this message]
2021-10-21 9:06 ` [PATCH 09/10] dma-direct: factor the swiotlb code out of __dma_direct_alloc_pages Christoph Hellwig
2021-11-04 12:37 ` Robin Murphy
2021-10-21 9:06 ` [PATCH 10/10] dma-direct: add a dma_direct_use_pool helper Christoph Hellwig
2021-11-04 12:37 ` Robin Murphy
2021-11-04 8:54 ` dma-direct fixes and cleanups v2 Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cc837772-d62c-997d-766d-a8d040cb2907@arm.com \
--to=robin.murphy@arm.com \
--cc=hch@lst.de \
--cc=iommu@lists.linux-foundation.org \
--cc=rientjes@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox