From: YE Chengfeng <cyeaa@connect.ust.hk>
To: "linus.walleij@linaro.org" <linus.walleij@linaro.org>,
"brgl@bgdev.pl" <brgl@bgdev.pl>,
"andy@kernel.org" <andy@kernel.org>
Cc: "linux-gpio@vger.kernel.org" <linux-gpio@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH] gpio: gpiolib-cdev: Fix potential &lr->wait.lock deadlock issue
Date: Sun, 25 Jun 2023 14:45:12 +0000 [thread overview]
Message-ID: <TYCP286MB1188B6A0379F7928C63288DF8A21A@TYCP286MB1188.JPNP286.PROD.OUTLOOK.COM> (raw)
linereq_put_event is called from both interrupt context (e.g.,
edge_irq_thread) and process context (process_hw_ts_thread).
Therefore, interrupt should be disabled before acquiring lock
&lr->wait.lock inside linereq_put_event to avoid deadlock when
the lock is held in process context and edge_irq_thread comes.
Similarly, linereq_read_unlocked running in process context
also acquies the same lock. It also need to disable interrupt
otherwise deadlock could happen if the irq edge_irq_thread
comes to execution while the lock is held.
Fix the two potential deadlock issues by spin_lock_irqsave.
Signed-off-by: Chengfeng Ye <cyeaa@connect.ust.hk>
---
drivers/gpio/gpiolib-cdev.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/gpio/gpiolib-cdev.c b/drivers/gpio/gpiolib-cdev.c
index 0a33971c964c..714631fde9a8 100644
--- a/drivers/gpio/gpiolib-cdev.c
+++ b/drivers/gpio/gpiolib-cdev.c
@@ -614,14 +614,15 @@ static void linereq_put_event(struct linereq *lr,
struct gpio_v2_line_event *le)
{
bool overflow = false;
+ unsigned long flags;
- spin_lock(&lr->wait.lock);
+ spin_lock_irqsave(&lr->wait.lock, flags);
if (kfifo_is_full(&lr->events)) {
overflow = true;
kfifo_skip(&lr->events);
}
kfifo_in(&lr->events, le, 1);
- spin_unlock(&lr->wait.lock);
+ spin_unlock_irqrestore(&lr->wait.lock, flags);
if (!overflow)
wake_up_poll(&lr->wait, EPOLLIN);
else
@@ -1505,6 +1506,7 @@ static ssize_t linereq_read_unlocked(struct file *file, char __user *buf,
struct linereq *lr = file->private_data;
struct gpio_v2_line_event le;
ssize_t bytes_read = 0;
+ unsigned long flags;
int ret;
if (!lr->gdev->chip)
@@ -1514,28 +1516,28 @@ static ssize_t linereq_read_unlocked(struct file *file, char __user *buf,
return -EINVAL;
do {
- spin_lock(&lr->wait.lock);
+ spin_lock_irqsave(&lr->wait.lock, flags);
if (kfifo_is_empty(&lr->events)) {
if (bytes_read) {
- spin_unlock(&lr->wait.lock);
+ spin_unlock_irqrestore(&lr->wait.lock, flags);
return bytes_read;
}
if (file->f_flags & O_NONBLOCK) {
- spin_unlock(&lr->wait.lock);
+ spin_unlock_irqrestore(&lr->wait.lock, flags);
return -EAGAIN;
}
ret = wait_event_interruptible_locked(lr->wait,
!kfifo_is_empty(&lr->events));
if (ret) {
- spin_unlock(&lr->wait.lock);
+ spin_unlock_irqrestore(&lr->wait.lock, flags);
return ret;
}
}
ret = kfifo_out(&lr->events, &le, 1);
- spin_unlock(&lr->wait.lock);
+ spin_unlock_irqrestore(&lr->wait.lock, flags);
if (ret != 1) {
/*
* This should never happen - we were holding the
--
2.17.1
next reply other threads:[~2023-06-25 14:45 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-25 14:45 YE Chengfeng [this message]
2023-06-26 6:53 ` Andy Shevchenko
2023-06-26 7:23 ` Kent Gibson
2023-06-26 10:38 ` YE Chengfeng
2023-06-26 11:13 ` andy
2023-06-26 15:50 ` Bartosz Golaszewski
2023-06-26 16:51 ` YE Chengfeng
2023-06-27 1:43 ` Kent Gibson
2023-06-27 11:47 ` Bartosz Golaszewski
2023-06-27 11:57 ` Kent Gibson
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=TYCP286MB1188B6A0379F7928C63288DF8A21A@TYCP286MB1188.JPNP286.PROD.OUTLOOK.COM \
--to=cyeaa@connect.ust.hk \
--cc=andy@kernel.org \
--cc=brgl@bgdev.pl \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.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
all inboxes | Powered by JetHome®