From: Zhongqiu Han <zhongqiu.han@oss.qualcomm.com>
To: Tanmay Shah <tanmay.shah@amd.com>,
andersson@kernel.org, mathieu.poirier@linaro.org
Cc: linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org,
zhongqiu.han@oss.qualcomm.com
Subject: Re: [PATCH 2/3] remoteproc: core: full attach detach during recovery
Date: Sun, 2 Nov 2025 16:54:13 +0800 [thread overview]
Message-ID: <e3e2f821-4585-4eb3-8e5c-af4d6ab29234@oss.qualcomm.com> (raw)
In-Reply-To: <20251028045730.1622685-3-tanmay.shah@amd.com>
On 10/28/2025 12:57 PM, Tanmay Shah wrote:
> Current attach on recovery mechanism loads the clean resource table
> during recovery, but doesn't re-allocate the resources. RPMsg
> communication will fail after recovery due to this. Fix this
> incorrect behavior by doing the full detach and attach of remote
> processor during the recovery. This will load the clean resource table
> and re-allocate all the resources, which will set up correct vring
> information in the resource table.
>
> Signed-off-by: Tanmay Shah <tanmay.shah@amd.com>
> ---
> drivers/remoteproc/remoteproc_core.c | 22 +++++++++++++---------
> 1 file changed, 13 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
> index aada2780b343..f5b078fe056a 100644
> --- a/drivers/remoteproc/remoteproc_core.c
> +++ b/drivers/remoteproc/remoteproc_core.c
> @@ -1777,11 +1777,11 @@ static int rproc_attach_recovery(struct rproc *rproc)
> {
> int ret;
>
> - ret = __rproc_detach(rproc);
> + ret = rproc_detach(rproc);
> if (ret)
> return ret;
>
> - return __rproc_attach(rproc);
> + return rproc_attach(rproc);
> }
>
> static int rproc_boot_recovery(struct rproc *rproc)
> @@ -1829,6 +1829,9 @@ int rproc_trigger_recovery(struct rproc *rproc)
> struct device *dev = &rproc->dev;
> int ret;
>
> + if (rproc_has_feature(rproc, RPROC_FEAT_ATTACH_ON_RECOVERY))
> + return rproc_attach_recovery(rproc);
> +
> ret = mutex_lock_interruptible(&rproc->lock);
Hi Tanmay,
I have a concern about this patch, specifically regarding the locking
behavior and potential race conditions introduced by the early return in
rproc_trigger_recovery(), by calling rproc_attach_recovery() directly
and bypassing the original mutex_lock_interruptible() in
rproc_trigger_recovery(), the recovery flow now executes rproc_attach()
without holding rproc->lock.
This could potentially lead to race conditions if other threads are
accessing or modifying shared resources concurrently.For example, one
possible scenario is:
state_store/rproc_trigger_auto_boot
-->rproc_boot
-->ret = mutex_lock_interruptible(&rproc->lock); <--(4)
-->if (rproc->state == RPROC_DETACHED) {
-->ret = rproc_attach(rproc); <--(5)
}
-->mutex_unlock(&rproc->lock);
rproc_trigger_recovery
-->rproc_attach_recovery
-->rproc_detach
-->ret = mutex_lock_interruptible(&rproc->lock); <--(1)
-->ret = __rproc_detach(rproc);
-->rproc->state = RPROC_DETACHED; <--(2)
-->mutex_unlock(&rproc->lock); <--(3)
-->return rproc_attach(rproc); <--(6)
As shown in stack (5) and (6), two threads may simultaneously
execute the rproc_attach() function, which could lead to a race
condition.
Please feel free to correct me, thanks~
> if (ret)
> return ret;
> @@ -1839,10 +1842,7 @@ int rproc_trigger_recovery(struct rproc *rproc)
>
> dev_err(dev, "recovering %s\n", rproc->name);
>
> - if (rproc_has_feature(rproc, RPROC_FEAT_ATTACH_ON_RECOVERY))
> - ret = rproc_attach_recovery(rproc);
> - else
> - ret = rproc_boot_recovery(rproc);
> + ret = rproc_boot_recovery(rproc);
>
> unlock_mutex:
> mutex_unlock(&rproc->lock);
> @@ -1860,6 +1860,7 @@ static void rproc_crash_handler_work(struct work_struct *work)
> {
> struct rproc *rproc = container_of(work, struct rproc, crash_handler);
> struct device *dev = &rproc->dev;
> + int ret;
>
> dev_dbg(dev, "enter %s\n", __func__);
>
> @@ -1883,8 +1884,11 @@ static void rproc_crash_handler_work(struct work_struct *work)
>
> mutex_unlock(&rproc->lock);
>
> - if (!rproc->recovery_disabled)
> - rproc_trigger_recovery(rproc);
> + if (!rproc->recovery_disabled) {
> + ret = rproc_trigger_recovery(rproc);
> + if (ret)
> + dev_warn(dev, "rproc recovery failed, err %d\n", ret);
> + }
>
> out:
> pm_relax(rproc->dev.parent);
> @@ -2057,7 +2061,7 @@ int rproc_detach(struct rproc *rproc)
> return ret;
> }
>
> - if (rproc->state != RPROC_ATTACHED) {
> + if (rproc->state != RPROC_ATTACHED && rproc->state != RPROC_CRASHED) {
> ret = -EINVAL;
> goto out;
> }
--
Thx and BRs,
Zhongqiu Han
next prev parent reply other threads:[~2025-11-02 8:54 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-28 4:57 [PATCH 0/3] remoteproc: xlnx: remote crash recovery Tanmay Shah
2025-10-28 4:57 ` [PATCH 1/3] remoteproc: xlnx: enable boot recovery Tanmay Shah
2025-10-28 4:57 ` [PATCH 2/3] remoteproc: core: full attach detach during recovery Tanmay Shah
2025-10-29 22:49 ` Iuliana Prodan
2025-10-29 23:41 ` Tanmay Shah
2025-11-02 8:54 ` Zhongqiu Han [this message]
2025-11-03 17:22 ` Tanmay Shah
2025-10-28 4:57 ` [PATCH 3/3] remoteproc: xlnx: add crash detection mechanism Tanmay Shah
2025-10-29 3:24 ` [PATCH 0/3] remoteproc: xlnx: remote crash recovery Peng Fan
2025-10-29 4:15 ` Tanmay Shah
2025-10-29 23:51 ` Tanmay Shah
2025-10-30 4:21 ` Peng Fan
2025-11-10 18:03 ` Mathieu Poirier
2025-11-10 18:39 ` Tanmay Shah
2025-11-11 7:12 ` Peng Fan
2025-11-11 16:47 ` Tanmay Shah
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=e3e2f821-4585-4eb3-8e5c-af4d6ab29234@oss.qualcomm.com \
--to=zhongqiu.han@oss.qualcomm.com \
--cc=andersson@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=tanmay.shah@amd.com \
/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®