From: Sascha Hauer <s.hauer@pengutronix.de>
To: dmaengine@vger.kernel.org
Cc: "Vinod Koul" <vkoul@kernel.org>,
"Peter Ujfalusi" <peter.ujfalusi@ti.com>,
"Florian Fainelli" <f.fainelli@gmail.com>,
"Maxime Ripard" <mripard@kernel.org>,
"Green Wan" <green.wan@sifive.com>,
"Kukjin Kim" <kgene@kernel.org>,
"Krzysztof Kozlowski" <krzk@kernel.org>,
"Andreas Färber" <afaerber@suse.de>,
"Sean Wang" <sean.wang@mediatek.com>,
"Eugeniy Paltsev" <Eugeniy.Paltsev@synopsys.com>,
"Pengutronix Kernel Team" <kernel@pengutronix.de>,
"NXP Linux Team" <linux-imx@nxp.com>,
"Robert Jarzmik" <robert.jarzmik@free.fr>,
"Sascha Hauer" <s.hauer@pengutronix.de>
Subject: [PATCH 5/9] dmaengine: virt-dma: Add missing locking around list operations
Date: Mon, 16 Dec 2019 11:53:24 +0100 [thread overview]
Message-ID: <20191216105328.15198-6-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20191216105328.15198-1-s.hauer@pengutronix.de>
All list operations are protected by &vc->lock. As vchan_vdesc_fini()
is called unlocked add the missing locking around the list operations.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/dma/virt-dma.h | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/virt-dma.h b/drivers/dma/virt-dma.h
index e213137b6bc1..e9f5250fbe4d 100644
--- a/drivers/dma/virt-dma.h
+++ b/drivers/dma/virt-dma.h
@@ -113,10 +113,15 @@ static inline void vchan_vdesc_fini(struct virt_dma_desc *vd)
{
struct virt_dma_chan *vc = to_virt_chan(vd->tx.chan);
- if (dmaengine_desc_test_reuse(&vd->tx))
+ if (dmaengine_desc_test_reuse(&vd->tx)) {
+ unsigned long flags;
+
+ spin_lock_irqsave(&vc->lock, flags);
list_add(&vd->node, &vc->desc_allocated);
- else
+ spin_unlock_irqrestore(&vc->lock, flags);
+ } else {
vc->desc_free(vd);
+ }
}
/**
--
2.24.0
next prev parent reply other threads:[~2019-12-16 10:54 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-16 10:53 [PATCH v3 0/9] dmaengine: virt-dma related fixes Sascha Hauer
2019-12-16 10:53 ` [PATCH 1/9] dmaengine: bcm2835: do not call vchan_vdesc_fini() with lock held Sascha Hauer
2019-12-16 10:53 ` [PATCH 2/9] dmaengine: virt-dma: Add missing locking Sascha Hauer
2019-12-16 10:53 ` [PATCH 3/9] dmaengine: virt-dma: remove debug message Sascha Hauer
2019-12-16 10:53 ` [PATCH 4/9] dmaengine: virt-dma: Do not call desc_free() under a spin_lock Sascha Hauer
2019-12-16 10:53 ` Sascha Hauer [this message]
2019-12-16 10:53 ` [PATCH 6/9] dmaengine: virt-dma: use vchan_vdesc_fini() to free descriptors Sascha Hauer
2019-12-16 10:53 ` [PATCH 7/9] dmaengine: imx-sdma: rename function Sascha Hauer
2019-12-16 10:53 ` [PATCH 8/9] dmaengine: imx-sdma: find desc first in sdma_tx_status Sascha Hauer
2019-12-16 10:53 ` [PATCH 9/9] dmaengine: imx-sdma: Fix memory leak Sascha Hauer
2019-12-18 10:09 ` Robin Gong
2019-12-16 11:49 ` [PATCH v3 0/9] dmaengine: virt-dma related fixes Peter Ujfalusi
2019-12-24 6:25 ` Vinod Koul
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=20191216105328.15198-6-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=Eugeniy.Paltsev@synopsys.com \
--cc=afaerber@suse.de \
--cc=dmaengine@vger.kernel.org \
--cc=f.fainelli@gmail.com \
--cc=green.wan@sifive.com \
--cc=kernel@pengutronix.de \
--cc=kgene@kernel.org \
--cc=krzk@kernel.org \
--cc=linux-imx@nxp.com \
--cc=mripard@kernel.org \
--cc=peter.ujfalusi@ti.com \
--cc=robert.jarzmik@free.fr \
--cc=sean.wang@mediatek.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;
as well as URLs for NNTP newsgroup(s).