From: Oliver Neukum <oneukum@suse.com>
To: Hans de Goede <hdegoede@redhat.com>
Cc: linux-usb@vger.kernel.org
Subject: race condition between shutdown() and post_reset() resulting in deadlock
Date: Tue, 16 Jan 2018 10:57:47 +0100 [thread overview]
Message-ID: <1516096667.7049.8.camel@suse.com> (raw)
Hi,
looking at your last patch I noticed something.
I think it fails to work if we hit a peculiar race condition.
It looks to me like we can get the following:
task A
pre_reset()
--> calling scsi_block_requests()
task B
shutdown()
--> setting the shutdown flag
post_reset()
--> checking the flag -> do nothing -> deadlock
So we need in addition something like the below patch.
What do you think?
Regards
Oliver
From 68cc8940d7dde8e2a48217d8086cd692809e7980 Mon Sep 17 00:00:00 2001
From: Oliver Neukum <oneukum@suse.com>
Date: Mon, 15 Jan 2018 13:56:59 +0100
Subject: [PATCH] UAS: fix race between post_reset() and shutdown()
Disconnect due to shutdown can happen after pre_reset() has been called. Thus the host
must be unblocked even in the shutdown case.
Signed-off-by: Oliver Neukum <oneukum@suse.com>
---
drivers/usb/storage/uas.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/storage/uas.c b/drivers/usb/storage/uas.c
index 338133a239df..d5ed1e581fb5 100644
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -1046,10 +1046,11 @@ static int uas_post_reset(struct usb_interface *intf)
struct Scsi_Host *shost = usb_get_intfdata(intf);
struct uas_dev_info *devinfo = (struct uas_dev_info *)shost->hostdata;
unsigned long flags;
- int err;
+ int err = 1;
+ /* We may have lost the race and shutdown after pre_reset() */
if (devinfo->shutdown)
- return 0;
+ goto skip;
err = uas_configure_endpoints(devinfo);
if (err && err != ENODEV)
@@ -1062,6 +1063,7 @@ static int uas_post_reset(struct usb_interface *intf)
scsi_report_bus_reset(shost, 0);
spin_unlock_irqrestore(shost->host_lock, flags);
+skip:
scsi_unblock_requests(shost);
return err ? 1 : 0;
next reply other threads:[~2018-01-16 9:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-16 9:57 Oliver Neukum [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-01-16 10:37 race condition between shutdown() and post_reset() resulting in deadlock Hans de Goede
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=1516096667.7049.8.camel@suse.com \
--to=oneukum@suse.com \
--cc=hdegoede@redhat.com \
--cc=linux-usb@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).