From: luanshi <zhangliguang@linux.alibaba.com>
To: James Morse <james.morse@arm.com>
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Liguang Zhang <zhangliguang@linux.alibaba.com>
Subject: [PATCH 1/3] firmware: arm_sdei: fix possible deadlock
Date: Mon, 23 Dec 2019 22:22:53 +0800 [thread overview]
Message-ID: <1577110975-54782-1-git-send-email-zhangliguang@linux.alibaba.com> (raw)
From: Liguang Zhang <zhangliguang@linux.alibaba.com>
We call sdei_reregister_event() with sdei_list_lock held but
_sdei_event_register() and sdei_event_destroy() also acquires
sdei_list_lock thus creating A-A deadlock.
Fixes: da351827240e ("firmware: arm_sdei: Add support for CPU and system power states")
Signed-off-by: Liguang Zhang <zhangliguang@linux.alibaba.com>
---
drivers/firmware/arm_sdei.c | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c
index a479023..b122927 100644
--- a/drivers/firmware/arm_sdei.c
+++ b/drivers/firmware/arm_sdei.c
@@ -651,20 +651,19 @@ static int sdei_reregister_event(struct sdei_event *event)
lockdep_assert_held(&sdei_events_lock);
- err = _sdei_event_register(event);
+ err = sdei_api_event_register(event->event_num,
+ sdei_entry_point,
+ event->registered,
+ SDEI_EVENT_REGISTER_RM_ANY, 0);
if (err) {
pr_err("Failed to re-register event %u\n", event->event_num);
- sdei_event_destroy(event);
+ list_del(&event->list);
+ kfree(event->registered);
return err;
}
- if (event->reenable) {
- if (event->type == SDEI_EVENT_TYPE_SHARED)
- err = sdei_api_event_enable(event->event_num);
- else
- err = sdei_do_cross_call(_local_event_enable, event);
- }
-
+ if (event->reenable)
+ err = sdei_api_event_enable(event->event_num);
if (err)
pr_err("Failed to re-enable event %u\n", event->event_num);
--
1.8.3.1
next reply other threads:[~2019-12-23 14:23 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-23 14:22 luanshi [this message]
2019-12-23 14:22 ` [PATCH 2/3] firmware: arm_sdei: Removed multiple white lines luanshi
2019-12-23 14:22 ` [PATCH 3/3] firmware: arm_sdei: clean up sdei_event_create() luanshi
2020-01-06 15:56 ` [PATCH 1/3] firmware: arm_sdei: fix possible deadlock James Morse
2020-01-16 1:54 ` 乱石
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=1577110975-54782-1-git-send-email-zhangliguang@linux.alibaba.com \
--to=zhangliguang@linux.alibaba.com \
--cc=james.morse@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@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).