From: Tzung-Bi Shih <tzungbi@kernel.org>
To: Philipp Zabel <p.zabel@pengutronix.de>
Cc: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>,
linux-kernel@vger.kernel.org, tzungbi@kernel.org
Subject: [PATCH 2/2] reset: Fix circular locking dependency in reset_controller_unregister()
Date: Mon, 2 Nov 2026 23:58:40 +0800 [thread overview]
Message-ID: <20261102155840.20376-3-tzungbi@kernel.org> (raw)
In-Reply-To: <20261102155840.20376-1-tzungbi@kernel.org>
reset_control_acquire() and reset_control_put_internal() acquire
`rcdev->lock` inside the `rstc->srcu` read-side critical section
(`rstc->srcu` -> `rcdev->lock`).
However, reset_controller_unregister() holds `rcdev->lock` while calling
synchronize_srcu(&rstc->srcu) (`rcdev->lock` -> `rstc->srcu`), causing a
lockdep circular locking dependency warning and a potential ABBA
deadlock.
Run synchronize_srcu() outside `rcdev->lock`.
Fixes: 44a0acb2caca ("reset: protect struct reset_controller_dev with its own mutex")
Signed-off-by: Tzung-Bi Shih <tzungbi@kernel.org>
---
Test:
With "[PATCH v2] reset: Add KUnit test cases"[1] applied:
$ ./tools/testing/kunit/kunit.py run \
--kconfig_add CONFIG_RESET_CONTROLLER=y \
--kconfig_add CONFIG_RESET_KUNIT_TEST=y \
--kconfig_add CONFIG_PROVE_LOCKING=y \
--kconfig_add CONFIG_DEBUG_KERNEL=y \
--kconfig_add CONFIG_KASAN=y \
--arch=x86_64 \
--raw_output=all \
reset_test
[1] https://lore.kernel.org/all/20261102155207.19252-1-tzungbi@kernel.org
---
drivers/reset/core.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/drivers/reset/core.c b/drivers/reset/core.c
index 1f6d7ef48a67..a36a4d6ff445 100644
--- a/drivers/reset/core.c
+++ b/drivers/reset/core.c
@@ -179,6 +179,7 @@ static void reset_controller_remove(struct reset_controller_dev *rcdev,
void reset_controller_unregister(struct reset_controller_dev *rcdev)
{
struct reset_control *rstc, *pos;
+ LIST_HEAD(reset_control_head);
scoped_guard(mutex, &reset_list_mutex)
list_del(&rcdev->list);
@@ -195,12 +196,22 @@ void reset_controller_unregister(struct reset_controller_dev *rcdev)
list_for_each_entry_safe(rstc, pos, &rcdev->reset_control_head, list) {
kref_get(&rstc->refcnt);
rcu_assign_pointer(rstc->rcdev, NULL);
- synchronize_srcu(&rstc->srcu);
reset_controller_remove(rcdev, rstc);
- reset_control_put_internal(rstc);
+ list_add(&rstc->list, &reset_control_head);
}
}
+ /*
+ * Run synchronize_srcu() outside rcdev->lock to avoid a circular
+ * locking dependency with paths that acquire rcdev->lock inside
+ * the rstc->srcu read-side critical section.
+ */
+ list_for_each_entry_safe(rstc, pos, &reset_control_head, list) {
+ list_del(&rstc->list);
+ synchronize_srcu(&rstc->srcu);
+ reset_control_put_internal(rstc);
+ }
+
mutex_destroy(&rcdev->lock);
}
EXPORT_SYMBOL_GPL(reset_controller_unregister);
--
2.53.0
next prev parent reply other threads:[~2026-11-02 16:00 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-02 15:58 [PATCH 0/2] reset: Fix issues reported by Sashiko Tzung-Bi Shih
2026-11-02 15:58 ` [PATCH 1/2] reset: Fix reset_control leak when put after controller unregister Tzung-Bi Shih
2026-11-02 15:58 ` Tzung-Bi Shih [this message]
2026-11-02 17:54 ` [PATCH 2/2] reset: Fix circular locking dependency in reset_controller_unregister() Philipp Zabel
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=20261102155840.20376-3-tzungbi@kernel.org \
--to=tzungbi@kernel.org \
--cc=bartosz.golaszewski@oss.qualcomm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=p.zabel@pengutronix.de \
/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®