From: Oliver Neukum <oneukum@suse.com>
To: penguin-kernel@i-love.sakura.ne.jp, bjorn@mork.no,
linux-usb@vger.kernel.org
Cc: Oliver Neukum <oneukum@suse.com>
Subject: [RFC 1/7] CDC-WDM: fix hangs in flush() in multithreaded cases
Date: Tue, 22 Sep 2020 13:21:20 +0200 [thread overview]
Message-ID: <20200922112126.16919-2-oneukum@suse.com> (raw)
In-Reply-To: <20200922112126.16919-1-oneukum@suse.com>
In a multithreaded scenario an arbitrary number of threads
can be in wdm_write() and in wdm_flush(). Hence whenever
WDM_IN_USE is reset, all possible waiters need to be notified.
This is true whether this is due to IO completing or
to an error starting IO.
Reported-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: Oliver Neukum <oneukum@suse.com>
---
drivers/usb/class/cdc-wdm.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index e3db6fbeadef..adb3fc307083 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -151,7 +151,7 @@ static void wdm_out_callback(struct urb *urb)
kfree(desc->outbuf);
desc->outbuf = NULL;
clear_bit(WDM_IN_USE, &desc->flags);
- wake_up(&desc->wait);
+ wake_up_all(&desc->wait);
}
static void wdm_in_callback(struct urb *urb)
@@ -424,6 +424,7 @@ static ssize_t wdm_write
if (rv < 0) {
desc->outbuf = NULL;
clear_bit(WDM_IN_USE, &desc->flags);
+ wake_up_all(&desc->wait); /* for flush() */
dev_err(&desc->intf->dev, "Tx URB error: %d\n", rv);
rv = usb_translate_errors(rv);
goto out_free_mem_pm;
@@ -586,6 +587,7 @@ static ssize_t wdm_read
static int wdm_flush(struct file *file, fl_owner_t id)
{
struct wdm_device *desc = file->private_data;
+ int rv;
wait_event(desc->wait,
/*
@@ -600,11 +602,12 @@ static int wdm_flush(struct file *file, fl_owner_t id)
/* cannot dereference desc->intf if WDM_DISCONNECTING */
if (test_bit(WDM_DISCONNECTING, &desc->flags))
return -ENODEV;
- if (desc->werr < 0)
+ rv = desc->werr;
+ if (rv < 0)
dev_err(&desc->intf->dev, "Error in flush path: %d\n",
- desc->werr);
+ rv);
- return usb_translate_errors(desc->werr);
+ return usb_translate_errors(rv);
}
static __poll_t wdm_poll(struct file *file, struct poll_table_struct *wait)
--
2.16.4
next prev parent reply other threads:[~2020-09-22 11:21 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-22 11:21 [RFC] fixes for hangs and error reporting in CDC_WDM Oliver Neukum
2020-09-22 11:21 ` Oliver Neukum [this message]
2020-09-22 11:21 ` [RFC 2/7] CDC-WDM: introduce a timeout in flush() Oliver Neukum
2020-09-22 11:21 ` [RFC 3/7] CDC-WDM: remove use of intf->dev after potential disconnect Oliver Neukum
2020-09-22 11:21 ` [RFC 4/7] CDC-WDM: fix race reporting errors in flush Oliver Neukum
2020-09-22 11:21 ` [RFC 5/7] CDC-WDM: correct error reporting in write() Oliver Neukum
2020-09-22 11:21 ` [RFC 6/7] CDC-WDM: implement fsync Oliver Neukum
2020-09-22 11:21 ` [RFC 7/7] CDC-WDM: making flush() interruptible Oliver Neukum
2020-09-22 11:38 ` Tetsuo Handa
2020-09-22 11:49 ` Oliver Neukum
2020-09-25 15:11 ` [RFC] fixes for hangs and error reporting in CDC_WDM Greg KH
2020-09-25 15:20 ` Tetsuo Handa
2020-09-25 15:28 ` Greg KH
2020-09-25 15:34 ` Tetsuo Handa
2020-09-26 5:40 ` Greg KH
2020-09-29 8:46 ` Oliver Neukum
2020-09-29 10:17 ` Tetsuo Handa
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=20200922112126.16919-2-oneukum@suse.com \
--to=oneukum@suse.com \
--cc=bjorn@mork.no \
--cc=linux-usb@vger.kernel.org \
--cc=penguin-kernel@i-love.sakura.ne.jp \
/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).