From: Chengfeng Ye <dg573847474@gmail.com>
To: shuge@allwinnertech.com, maxime.ripard@free-electrons.com,
vkoul@kernel.org, wens@csie.org, jernej.skrabec@gmail.com,
samuel@sholland.org, p.zabel@pengutronix.de
Cc: dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org,
Chengfeng Ye <dg573847474@gmail.com>
Subject: [PATCH v2] dmaengine: sun6i: Fix potential deadlock on &sdev->lock
Date: Wed, 26 Jul 2023 05:17:27 +0000 [thread overview]
Message-ID: <20230726051727.64088-1-dg573847474@gmail.com> (raw)
As &sdev->lock is acquired by tasklet sun6i_dma_tasklet() executed under
softirq context, other acquisition of the same lock under process context
should disable irq, otherwise deadlock could happen if the soft irq preempt
the execution while the lock is held in process context on the same CPU.
sun6i_dma_terminate_all() and sun6i_dma_pause() callbacks acquire the same
lock without disabling irq inside the function.
Possible deadlock scenario:
sun6i_dma_pause()
-> spin_lock(&sdev->lock);
<tasklet softirq interruption>
-> sun6i_dma_tasklet()
-> spin_lock_irq(&sdev->lock) (deadlock here)
This flaw was found by an experimental static analysis tool I am developing
for irq-related deadlock.
The tentative patch fixes the potential deadlock by spin_lock_irqsave() to
disable softirq.
Changelog:
v1 - >v2
- Use spin_lock_irqsave() instead of spin_lock_bh(), since outside caller
could already call with bh disable, in the case spin_unlock_bh() would
unintentionally enable bh.
Signed-off-by: Chengfeng Ye <dg573847474@gmail.com>
---
drivers/dma/sun6i-dma.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/dma/sun6i-dma.c b/drivers/dma/sun6i-dma.c
index ebfd29888b2f..30f426299703 100644
--- a/drivers/dma/sun6i-dma.c
+++ b/drivers/dma/sun6i-dma.c
@@ -866,6 +866,7 @@ static int sun6i_dma_pause(struct dma_chan *chan)
struct sun6i_dma_dev *sdev = to_sun6i_dma_dev(chan->device);
struct sun6i_vchan *vchan = to_sun6i_vchan(chan);
struct sun6i_pchan *pchan = vchan->phy;
+ unsigned long flags;
dev_dbg(chan2dev(chan), "vchan %p: pause\n", &vchan->vc);
@@ -873,9 +874,9 @@ static int sun6i_dma_pause(struct dma_chan *chan)
writel(DMA_CHAN_PAUSE_PAUSE,
pchan->base + DMA_CHAN_PAUSE);
} else {
- spin_lock(&sdev->lock);
+ spin_lock_irqsave(&sdev->lock, flags);
list_del_init(&vchan->node);
- spin_unlock(&sdev->lock);
+ spin_unlock_irqrestore(&sdev->lock, flags);
}
return 0;
@@ -914,9 +915,9 @@ static int sun6i_dma_terminate_all(struct dma_chan *chan)
unsigned long flags;
LIST_HEAD(head);
- spin_lock(&sdev->lock);
+ spin_lock_irqsave(&sdev->lock, flags);
list_del_init(&vchan->node);
- spin_unlock(&sdev->lock);
+ spin_unlock_irqrestore(&sdev->lock, flags);
spin_lock_irqsave(&vchan->vc.lock, flags);
--
2.17.1
next reply other threads:[~2023-07-26 5:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-26 5:17 Chengfeng Ye [this message]
2023-08-16 17:13 ` [PATCH v2] dmaengine: sun6i: Fix potential deadlock on &sdev->lock Chengfeng Ye
-- strict thread matches above, loose matches on Subject: below --
2026-07-06 3:03 [PATCH v2] dmaengine: sun6i: Fix potential deadlock on sdev->lock Hongling Zeng
2026-07-06 3:11 ` sashiko-bot
2026-07-06 3:17 Hongling Zeng
2026-07-06 3:27 ` sashiko-bot
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=20230726051727.64088-1-dg573847474@gmail.com \
--to=dg573847474@gmail.com \
--cc=dmaengine@vger.kernel.org \
--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=maxime.ripard@free-electrons.com \
--cc=p.zabel@pengutronix.de \
--cc=samuel@sholland.org \
--cc=shuge@allwinnertech.com \
--cc=vkoul@kernel.org \
--cc=wens@csie.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