From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>,
Mathieu Poirier <mathieu.poirier@linaro.org>,
Sasha Levin <sashal@kernel.org>,
andersson@kernel.org, mcoquelin.stm32@gmail.com,
alexandre.torgue@foss.st.com, linux-remoteproc@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH AUTOSEL 5.15 10/17] remoteproc: stm32_rproc: Add mutex protection for workqueue
Date: Sun, 30 Apr 2023 23:04:27 -0400 [thread overview]
Message-ID: <20230501030435.3254695-10-sashal@kernel.org> (raw)
In-Reply-To: <20230501030435.3254695-1-sashal@kernel.org>
From: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
[ Upstream commit 35bdafda40cc343ad2ba2cce105eba03a70241cc ]
The workqueue may execute late even after remoteproc is stopped or
stopping, some resources (rpmsg device and endpoint) have been
released in rproc_stop_subdevices(), then rproc_vq_interrupt()
accessing these resources will cause kernel dump.
Call trace:
virtqueue_add_inbuf
virtqueue_add_inbuf
rpmsg_recv_single
rpmsg_recv_done
vring_interrupt
stm32_rproc_mb_vq_work
process_one_work
worker_thread
kthread
Suggested-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
Link: https://lore.kernel.org/r/20230331160634.3113031-1-arnaud.pouliquen@foss.st.com
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/remoteproc/stm32_rproc.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/remoteproc/stm32_rproc.c b/drivers/remoteproc/stm32_rproc.c
index b643efcf995a1..bc91d99db60f2 100644
--- a/drivers/remoteproc/stm32_rproc.c
+++ b/drivers/remoteproc/stm32_rproc.c
@@ -287,8 +287,16 @@ static void stm32_rproc_mb_vq_work(struct work_struct *work)
struct stm32_mbox *mb = container_of(work, struct stm32_mbox, vq_work);
struct rproc *rproc = dev_get_drvdata(mb->client.dev);
+ mutex_lock(&rproc->lock);
+
+ if (rproc->state != RPROC_RUNNING)
+ goto unlock_mutex;
+
if (rproc_vq_interrupt(rproc, mb->vq_id) == IRQ_NONE)
dev_dbg(&rproc->dev, "no message found in vq%d\n", mb->vq_id);
+
+unlock_mutex:
+ mutex_unlock(&rproc->lock);
}
static void stm32_rproc_mb_callback(struct mbox_client *cl, void *data)
--
2.39.2
next prev parent reply other threads:[~2023-05-01 3:17 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-01 3:04 [PATCH AUTOSEL 5.15 01/17] drm/displayid: add displayid_get_header() and check bounds better Sasha Levin
2023-05-01 3:04 ` [PATCH AUTOSEL 5.15 02/17] drm/amd/display: Use DC_LOG_DC in the trasform pixel function Sasha Levin
2023-05-01 3:04 ` [PATCH AUTOSEL 5.15 03/17] regmap: cache: Return error in cache sync operations for REGCACHE_NONE Sasha Levin
2023-05-01 3:04 ` [PATCH AUTOSEL 5.15 04/17] arm64: dts: qcom: msm8996: Add missing DWC3 quirks Sasha Levin
2023-05-01 3:04 ` [PATCH AUTOSEL 5.15 05/17] media: cx23885: Fix a null-ptr-deref bug in buffer_prepare() and buffer_finish() Sasha Levin
2023-05-01 3:04 ` [PATCH AUTOSEL 5.15 06/17] media: pci: tw68: Fix null-ptr-deref bug in buf prepare and finish Sasha Levin
2023-05-01 3:04 ` [PATCH AUTOSEL 5.15 07/17] memstick: r592: Fix UAF bug in r592_remove due to race condition Sasha Levin
2023-05-01 3:04 ` [PATCH AUTOSEL 5.15 08/17] firmware: arm_sdei: Fix sleep from invalid context BUG Sasha Levin
2023-05-01 3:04 ` [PATCH AUTOSEL 5.15 09/17] ACPI: EC: Fix oops when removing custom query handlers Sasha Levin
2023-05-01 3:04 ` Sasha Levin [this message]
2023-05-01 3:04 ` [PATCH AUTOSEL 5.15 11/17] drm/tegra: Avoid potential 32-bit integer overflow Sasha Levin
2023-05-01 3:04 ` [PATCH AUTOSEL 5.15 12/17] drm/msm/dp: Clean up handling of DP AUX interrupts Sasha Levin
2023-05-01 3:04 ` [PATCH AUTOSEL 5.15 13/17] ACPICA: Avoid undefined behavior: applying zero offset to null pointer Sasha Levin
2023-05-01 3:04 ` [PATCH AUTOSEL 5.15 14/17] ACPICA: ACPICA: check null return of ACPI_ALLOCATE_ZEROED in acpi_db_display_objects Sasha Levin
2023-05-01 3:04 ` [PATCH AUTOSEL 5.15 15/17] media: cros-ec-cec: Don't exit early in .remove() callback Sasha Levin
2023-05-01 3:04 ` [PATCH AUTOSEL 5.15 16/17] drm/amd: Fix an out of bounds error in BIOS parser Sasha Levin
2023-05-01 3:04 ` [PATCH AUTOSEL 5.15 17/17] media: Prefer designated initializers over memset for subdev pad ops Sasha Levin
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=20230501030435.3254695-10-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=alexandre.torgue@foss.st.com \
--cc=andersson@kernel.org \
--cc=arnaud.pouliquen@foss.st.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=mathieu.poirier@linaro.org \
--cc=mcoquelin.stm32@gmail.com \
--cc=stable@vger.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).