From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
To: Christoph Hellwig <hch@lst.de>, Amit Pundir <amit.pundir@linaro.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
jeremy.linton@arm.com, iommu@lists.linux-foundation.org,
John Stultz <john.stultz@linaro.org>,
linux-rpi-kernel@lists.infradead.org,
David Rientjes <rientjes@google.com>,
Robin Murphy <robin.murphy@arm.com>,
Sumit Semwal <sumit.semwal@linaro.org>
Subject: Re: [PATCH] dma-pool: Do not allocate pool memory from CMA
Date: Mon, 27 Jul 2020 19:56:56 +0200 [thread overview]
Message-ID: <a9b811a84ac21c13693e6ffefd2914b911542e18.camel@suse.de> (raw)
In-Reply-To: <20200724134114.GA3152@lst.de>
[-- Attachment #1.1: Type: text/plain, Size: 2097 bytes --]
Hi Christoph,
thanks for having a look at this!
On Fri, 2020-07-24 at 15:41 +0200, Christoph Hellwig wrote:
> Yes, the iommu is an interesting case, and the current code is
> wrong for that.
Care to expand on this? I do get that checking dma_coherent_ok() on memory
that'll later on be mapped into an iommu is kind of silly, although I think
harmless in Amir's specific case, since devices have wide enough dma-ranges. Is
there more to it?
> Can you try the patch below? It contains a modified version of Nicolas'
> patch to try CMA again for the expansion and a new (for now hackish) way to
> not apply the addressability check for dma-iommu allocations.
>
> diff --git a/kernel/dma/pool.c b/kernel/dma/pool.c
> index 6bc74a2d51273e..ec5e525d2b9309 100644
> --- a/kernel/dma/pool.c
> +++ b/kernel/dma/pool.c
> @@ -3,7 +3,9 @@
> * Copyright (C) 2012 ARM Ltd.
> * Copyright (C) 2020 Google LLC
> */
> +#include <linux/cma.h>
> #include <linux/debugfs.h>
> +#include <linux/dma-contiguous.h>
> #include <linux/dma-direct.h>
> #include <linux/dma-noncoherent.h>
> #include <linux/init.h>
> @@ -55,6 +57,31 @@ static void dma_atomic_pool_size_add(gfp_t gfp, size_t
> size)
> pool_size_kernel += size;
> }
>
> +static bool cma_in_zone(gfp_t gfp)
> +{
> + phys_addr_t end;
> + unsigned long size;
> + struct cma *cma;
> +
> + cma = dev_get_cma_area(NULL);
> + if (!cma)
> + return false;
> +
> + size = cma_get_size(cma);
> + if (!size)
> + return false;
> + end = cma_get_base(cma) - memblock_start_of_DRAM() + size - 1;
> +
> + /* CMA can't cross zone boundaries, see cma_activate_area() */
> + if (IS_ENABLED(CONFIG_ZONE_DMA) && (gfp & GFP_DMA) &&
> + end <= DMA_BIT_MASK(zone_dma_bits))
> + return true;
> + if (IS_ENABLED(CONFIG_ZONE_DMA32) && (gfp & GFP_DMA32) &&
> + end <= DMA_BIT_MASK(32))
> + return true;
> + return true;
IIUC this will always return true given a CMA is present. Which reverts to the
previous behaviour (previous as in breaking some rpi4 setups), isn't it?
Regards,
Nicolas
[-- Attachment #1.2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
[-- Attachment #2: Type: text/plain, Size: 156 bytes --]
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
next prev parent reply other threads:[~2020-07-27 17:57 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-08 16:49 [PATCH] dma-pool: Do not allocate pool memory from CMA Nicolas Saenz Julienne
2020-07-08 16:58 ` Christoph Hellwig
2020-07-08 23:14 ` Jeremy Linton
2020-07-09 21:47 ` David Rientjes via iommu
2020-07-21 7:21 ` Amit Pundir
2020-07-21 8:39 ` Nicolas Saenz Julienne
2020-07-21 8:54 ` Amit Pundir
2020-07-21 11:15 ` Nicolas Saenz Julienne
2020-07-21 11:28 ` Christoph Hellwig
2020-07-21 11:37 ` Nicolas Saenz Julienne
2020-07-21 12:16 ` Amit Pundir
2020-07-21 12:15 ` Amit Pundir
2020-07-21 12:45 ` Nicolas Saenz Julienne
2020-07-21 15:22 ` Amit Pundir
2020-07-21 16:27 ` Nicolas Saenz Julienne
2020-07-23 5:14 ` Amit Pundir
2020-07-24 9:36 ` Nicolas Saenz Julienne
2020-07-24 11:06 ` Amit Pundir
2020-07-24 13:41 ` Christoph Hellwig
2020-07-24 16:19 ` Amit Pundir
2020-07-24 16:27 ` Christoph Hellwig
2020-07-27 17:56 ` Nicolas Saenz Julienne [this message]
2020-07-28 9:13 ` Christoph Hellwig
2020-07-28 9:30 ` Nicolas Saenz Julienne
2020-07-28 10:09 ` Christoph Hellwig
2020-07-31 1:10 ` Nathan Chancellor
2020-07-31 7:19 ` Amit Pundir
2020-07-31 10:09 ` Nicolas Saenz Julienne
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=a9b811a84ac21c13693e6ffefd2914b911542e18.camel@suse.de \
--to=nsaenzjulienne@suse.de \
--cc=amit.pundir@linaro.org \
--cc=hch@lst.de \
--cc=iommu@lists.linux-foundation.org \
--cc=jeremy.linton@arm.com \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=rientjes@google.com \
--cc=robin.murphy@arm.com \
--cc=sumit.semwal@linaro.org \
/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;
as well as URLs for NNTP newsgroup(s).