From: James Hilliard <james.hilliard1@gmail.com>
To: Vinod Koul <vkoul@kernel.org>, Frank Li <Frank.Li@kernel.org>,
Chen-Yu Tsai <wens@kernel.org>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Samuel Holland <samuel@sholland.org>,
Arnd Bergmann <arnd@arndb.de>,
Maxime Ripard <mripard@kernel.org>,
Jens Kuske <jenskuske@gmail.com>,
Jean-Francois Moine <moinejf@free.fr>
Cc: Hongling Zeng <zenghongling@kylinos.cn>,
Chengfeng Ye <cyeaa@connect.ust.hk>,
Nguyen Minh Tien <tien.nguyenminh@embeddedlinux.blog>,
dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org,
James Hilliard <james.hilliard1@gmail.com>,
Frank Li <Frank.Li@nxp.com>
Subject: [PATCH v4 8/9] dmaengine: sun6i: synchronize callbacks before releasing channel resources
Date: Sun, 15 Nov 2026 02:32:56 -0700 [thread overview]
Message-ID: <20261115-submit-sun6i-dma-lifetime-next-v1-v4-8-043cd476a45f@gmail.com> (raw)
In-Reply-To: <20261115-submit-sun6i-dma-lifetime-next-v1-v4-0-043cd476a45f@gmail.com>
The driver has no device_synchronize callback. dmaengine_terminate_sync()
therefore returns after stopping the channel without waiting for the
virtual-channel tasklet. That tasklet may already have removed completed
descriptors from the shared list and be executing their callbacks. For
example, serial8250_release_dma() frees the RX buffer and unmaps the TX
buffer immediately after terminate_sync(), while those callbacks can
still access them.
Use vchan_dma_synchronize() for device_synchronize. Channel termination
excludes the interrupt handler and allocator before detaching the channel,
so they cannot schedule another completion for that transfer. Also stop
the channel and synchronize when freeing its resources.
Keep terminated cyclic descriptors on desc_terminated until synchronization
finishes. vchan_complete() may retain that descriptor outside vc.lock.
Ordinary active descriptors have not published a callback and can still be
freed by terminate_all(). This avoids accumulating descriptors on each
8250 partial-RX flush, which uses the atomic termination API.
Fixes: 555859308723 ("dmaengine: sun6i: Add driver for the Allwinner A31 DMA controller")
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
drivers/dma/sun6i-dma.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c
index 14f1f463005e..8f8443e14719 100644
--- a/drivers/dma/sun6i-dma.c
+++ b/drivers/dma/sun6i-dma.c
@@ -1002,12 +1002,20 @@ static int sun6i_dma_terminate_all(struct dma_chan *chan)
if (pchan && pchan->desc) {
struct virt_dma_desc *vd = &pchan->desc->vd;
- vchan_terminate_vdesc(vd);
+ /* A cyclic callback may still hold this descriptor outside vc.lock. */
+ if (vchan->cyclic)
+ vchan_terminate_vdesc(vd);
+ else
+ list_add_tail(&vd->node, &head);
}
vchan->cyclic = false;
vchan->paused = false;
- vchan_get_all_descriptors(&vchan->vc, &head);
+ /* Leave terminated cyclic descriptors for the sleepable synchronize. */
+ list_splice_tail_init(&vchan->vc.desc_allocated, &head);
+ list_splice_tail_init(&vchan->vc.desc_submitted, &head);
+ list_splice_tail_init(&vchan->vc.desc_issued, &head);
+ list_splice_tail_init(&vchan->vc.desc_completed, &head);
if (pchan) {
writel(DMA_CHAN_ENABLE_STOP, pchan->base + DMA_CHAN_ENABLE);
@@ -1105,14 +1113,10 @@ static void sun6i_dma_issue_pending(struct dma_chan *chan)
static void sun6i_dma_free_chan_resources(struct dma_chan *chan)
{
- struct sun6i_dma_dev *sdev = to_sun6i_dma_dev(chan->device);
struct sun6i_vchan *vchan = to_sun6i_vchan(chan);
- unsigned long flags;
-
- spin_lock_irqsave(&sdev->lock, flags);
- list_del_init(&vchan->node);
- spin_unlock_irqrestore(&sdev->lock, flags);
+ sun6i_dma_terminate_all(chan);
+ vchan_dma_synchronize(chan);
vchan_free_chan_resources(&vchan->vc);
}
@@ -1485,6 +1489,7 @@ static int sun6i_dma_probe(struct platform_device *pdev)
sdc->slave.device_pause = sun6i_dma_pause;
sdc->slave.device_resume = sun6i_dma_resume;
sdc->slave.device_terminate_all = sun6i_dma_terminate_all;
+ sdc->slave.device_synchronize = vchan_dma_synchronize;
sdc->slave.src_addr_widths = sdc->cfg->src_addr_widths;
sdc->slave.dst_addr_widths = sdc->cfg->dst_addr_widths;
sdc->slave.directions = BIT(DMA_DEV_TO_MEM) |
--
2.53.0
next prev parent reply other threads:[~2026-11-15 9:33 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-15 9:32 [PATCH v4 0/9] dmaengine: sun6i: fix interrupt routing and channel lifetime James Hilliard
2026-11-15 9:32 ` [PATCH v4 1/9] dmaengine: sun6i: fix physical channel index in interrupt handler James Hilliard
2026-11-15 9:32 ` [PATCH v4 2/9] dmaengine: sun6i: handle the last partial interrupt bank James Hilliard
2026-11-18 20:06 ` Frank Li
2026-11-15 9:32 ` [PATCH v4 3/9] dmaengine: sun6i: take the device lock before the virtual channel lock James Hilliard
2026-11-15 9:32 ` [PATCH v4 4/9] dmaengine: sun6i: serialize physical channel ownership James Hilliard
2026-11-15 9:32 ` [PATCH v4 5/9] dmaengine: sun6i: detach completed descriptors before invoking callbacks James Hilliard
2026-11-15 9:32 ` [PATCH v4 6/9] dmaengine: sun6i: retire interrupt state before reusing physical channels James Hilliard
2026-11-15 9:32 ` [PATCH v4 7/9] dmaengine: sun6i: track paused virtual channels James Hilliard
2026-11-18 20:08 ` Frank Li
2026-11-15 9:32 ` James Hilliard [this message]
2026-11-15 9:32 ` [PATCH v4 9/9] dmaengine: sun6i: keep cyclic state with the prepared descriptor James Hilliard
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=20261115-submit-sun6i-dma-lifetime-next-v1-v4-8-043cd476a45f@gmail.com \
--to=james.hilliard1@gmail.com \
--cc=Frank.Li@kernel.org \
--cc=Frank.Li@nxp.com \
--cc=arnd@arndb.de \
--cc=cyeaa@connect.ust.hk \
--cc=dmaengine@vger.kernel.org \
--cc=jenskuske@gmail.com \
--cc=jernej.skrabec@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=moinejf@free.fr \
--cc=mripard@kernel.org \
--cc=samuel@sholland.org \
--cc=tien.nguyenminh@embeddedlinux.blog \
--cc=vkoul@kernel.org \
--cc=wens@kernel.org \
--cc=zenghongling@kylinos.cn \
/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
all inboxes | Powered by JetHome®