From: Frank Li <Frank.li@nxp.com>
To: "Nuno Sá" <nuno.sa@analog.com>
Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org,
Lars-Peter Clausen <lars@metafoo.de>,
Vinod Koul <vkoul@kernel.org>, Frank Li <Frank.Li@kernel.org>
Subject: Re: [PATCH v4 4/4] dmaengine: dma-axi-dmac: use DMA pool to manange DMA descriptor
Date: Thu, 7 May 2026 14:37:58 -0400 [thread overview]
Message-ID: <afzcBnqS7UCmnPyN@lizhi-Precision-Tower-5810> (raw)
In-Reply-To: <20260424-dma-dmac-handle-vunmap-v4-4-90f43412fdc0@analog.com>
On Fri, Apr 24, 2026 at 06:40:17PM +0100, Nuno Sá wrote:
> For architectures like Microblaze or arm64 (where this IP is used),
> DMA_DIRECT_REMAP is set which means that dma_alloc_coherent() might
> remap (and hence vmalloc()) some memory. This became visible in a design
> where dma_direct_use_pool() is not possible.
>
> With the above, when calling dma_free_coherent(), vunmap() would be
> called from softirq context and thus leading to a BUG().
>
> To fix it, use a dma pool that is allocated in
> .device_alloc_chan_resources() and allocate blocks from it. The key
> point is that now dma_pool_free() is used in axi_dmac_free_desc() to
> free the blocks and that just frees the blocks from the pool in the
> sense they can be used again. In other words, no actual call to
> dma_free_coherent() happens. That only happens when destroying the pool
> in axi_dmac_free_chan_resources() which does not happen in any interrupt
> context.
>
> Fixes: 3f8fd25936ee ("dmaengine: axi-dmac: Allocate hardware descriptors")
> Signed-off-by: Nuno Sá <nuno.sa@analog.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
> ---
> drivers/dma/dma-axi-dmac.c | 66 ++++++++++++++++++++++++++++------------------
> 1 file changed, 40 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/dma/dma-axi-dmac.c b/drivers/dma/dma-axi-dmac.c
> index 41898d594be7..d47ff27e1408 100644
> --- a/drivers/dma/dma-axi-dmac.c
> +++ b/drivers/dma/dma-axi-dmac.c
> @@ -13,6 +13,7 @@
> #include <linux/device.h>
> #include <linux/dma-mapping.h>
> #include <linux/dmaengine.h>
> +#include <linux/dmapool.h>
> #include <linux/err.h>
> #include <linux/interrupt.h>
> #include <linux/io.h>
> @@ -147,6 +148,7 @@ struct axi_dmac_chan {
> struct virt_dma_chan vchan;
>
> struct axi_dmac_desc *next_desc;
> + void *pool;
> struct list_head active_descs;
> enum dma_transfer_direction direction;
>
> @@ -648,11 +650,17 @@ static void axi_dmac_issue_pending(struct dma_chan *c)
> spin_unlock_irqrestore(&chan->vchan.lock, flags);
> }
>
> +static void axi_dmac_free_desc(struct axi_dmac_desc *desc)
> +{
> + for (unsigned int i = 0; i < desc->num_sgs; i++)
> + dma_pool_free(desc->chan->pool, desc->sg[i].hw, desc->sg[i].hw_phys);
> +
> + kfree(desc);
> +}
> +
> static struct axi_dmac_desc *
> axi_dmac_alloc_desc(struct axi_dmac_chan *chan, unsigned int num_sgs)
> {
> - struct axi_dmac *dmac = chan_to_axi_dmac(chan);
> - struct device *dev = dmac->dma_dev.dev;
> struct axi_dmac_hw_desc *hws;
> struct axi_dmac_desc *desc;
> dma_addr_t hw_phys;
> @@ -664,22 +672,22 @@ axi_dmac_alloc_desc(struct axi_dmac_chan *chan, unsigned int num_sgs)
> desc->num_sgs = num_sgs;
> desc->chan = chan;
>
> - hws = dma_alloc_coherent(dev, PAGE_ALIGN(num_sgs * sizeof(*hws)),
> - &hw_phys, GFP_ATOMIC);
> - if (!hws) {
> - kfree(desc);
> - return NULL;
> - }
> -
> for (i = 0; i < num_sgs; i++) {
> - desc->sg[i].hw = &hws[i];
> - desc->sg[i].hw_phys = hw_phys + i * sizeof(*hws);
> + hws = dma_pool_zalloc(chan->pool, GFP_NOWAIT, &hw_phys);
> + if (!hws) {
> + desc->num_sgs = i;
> + axi_dmac_free_desc(desc);
> + return NULL;
> + }
>
> - hws[i].id = AXI_DMAC_SG_UNUSED;
> - hws[i].flags = 0;
> + desc->sg[i].hw = hws;
> + desc->sg[i].hw_phys = hw_phys;
> +
> + hws->id = AXI_DMAC_SG_UNUSED;
>
> /* Link hardware descriptors */
> - hws[i].next_sg_addr = hw_phys + (i + 1) * sizeof(*hws);
> + if (i)
> + desc->sg[i - 1].hw->next_sg_addr = hw_phys;
> }
>
> /* The last hardware descriptor will trigger an interrupt */
> @@ -688,18 +696,6 @@ axi_dmac_alloc_desc(struct axi_dmac_chan *chan, unsigned int num_sgs)
> return desc;
> }
>
> -static void axi_dmac_free_desc(struct axi_dmac_desc *desc)
> -{
> - struct axi_dmac *dmac = chan_to_axi_dmac(desc->chan);
> - struct device *dev = dmac->dma_dev.dev;
> - struct axi_dmac_hw_desc *hw = desc->sg[0].hw;
> - dma_addr_t hw_phys = desc->sg[0].hw_phys;
> -
> - dma_free_coherent(dev, PAGE_ALIGN(desc->num_sgs * sizeof(*hw)),
> - hw, hw_phys);
> - kfree(desc);
> -}
> -
> static struct axi_dmac_sg *axi_dmac_fill_linear_sg(struct axi_dmac_chan *chan,
> enum dma_transfer_direction direction, dma_addr_t addr,
> unsigned int num_periods, unsigned int period_len,
> @@ -933,9 +929,26 @@ static struct dma_async_tx_descriptor *axi_dmac_prep_interleaved(
> return vchan_tx_prep(&chan->vchan, &desc->vdesc, flags);
> }
>
> +static int axi_dmac_alloc_chan_resources(struct dma_chan *c)
> +{
> + struct axi_dmac_chan *chan = to_axi_dmac_chan(c);
> + struct device *dev = c->device->dev;
> +
> + chan->pool = dma_pool_create(dev_name(dev), dev,
> + sizeof(struct axi_dmac_hw_desc),
> + __alignof__(struct axi_dmac_hw_desc), 0);
> + if (!chan->pool)
> + return -ENOMEM;
> +
> + return 0;
> +}
> +
> static void axi_dmac_free_chan_resources(struct dma_chan *c)
> {
> + struct axi_dmac_chan *chan = to_axi_dmac_chan(c);
> +
> vchan_free_chan_resources(to_virt_chan(c));
> + dma_pool_destroy(chan->pool);
> }
>
> static void axi_dmac_desc_free(struct virt_dma_desc *vdesc)
> @@ -1238,6 +1251,7 @@ static int axi_dmac_probe(struct platform_device *pdev)
> dma_cap_set(DMA_SLAVE, dma_dev->cap_mask);
> dma_cap_set(DMA_CYCLIC, dma_dev->cap_mask);
> dma_cap_set(DMA_INTERLEAVE, dma_dev->cap_mask);
> + dma_dev->device_alloc_chan_resources = axi_dmac_alloc_chan_resources;
> dma_dev->device_free_chan_resources = axi_dmac_free_chan_resources;
> dma_dev->device_tx_status = dma_cookie_status;
> dma_dev->device_issue_pending = axi_dmac_issue_pending;
>
> --
> 2.54.0
>
prev parent reply other threads:[~2026-05-07 18:38 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-24 17:40 [PATCH v4 0/4] dmaengine: dma-axi-dmac: Some memory related fixes Nuno Sá via B4 Relay
2026-04-24 17:40 ` [PATCH v4 1/4] dmaengine: Fix possible use after free Nuno Sá via B4 Relay
2026-05-07 18:33 ` Frank Li
2026-04-24 17:40 ` [PATCH v4 2/4] dmaengine: dma-axi-dmac: Properly free struct axi_dmac_desc Nuno Sá via B4 Relay
2026-05-07 18:33 ` Frank Li
2026-04-24 17:40 ` [PATCH v4 3/4] dmaengine: dma-axi-dmac: Drop struct clk from main struct Nuno Sá via B4 Relay
2026-05-07 18:34 ` Frank Li
2026-04-24 17:40 ` [PATCH v4 4/4] dmaengine: dma-axi-dmac: use DMA pool to manange DMA descriptor Nuno Sá via B4 Relay
2026-05-07 18:37 ` Frank Li [this message]
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=afzcBnqS7UCmnPyN@lizhi-Precision-Tower-5810 \
--to=frank.li@nxp.com \
--cc=Frank.Li@kernel.org \
--cc=dmaengine@vger.kernel.org \
--cc=lars@metafoo.de \
--cc=linux-kernel@vger.kernel.org \
--cc=nuno.sa@analog.com \
--cc=vkoul@kernel.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