From: Arnd Bergmann <arnd@arndb.de>
To: linux-kernel@vger.kernel.org
Cc: Arnd Bergmann <arnd@arndb.de>, Andrew Morton <akpm@osdl.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: [PATCH 09/16] parport: fix interruptible_sleep_on race
Date: Wed, 26 Feb 2014 12:01:49 +0100 [thread overview]
Message-ID: <1393412516-3762435-10-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1393412516-3762435-1-git-send-email-arnd@arndb.de>
The interruptible_sleep_on function is can still lead to the
deadlock mentioned in the comment above the caller, and we want
to remove it soon, so replace it now with the race-free
wait_event_interruptible.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Andrew Morton <akpm@osdl.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/parport/share.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/parport/share.c b/drivers/parport/share.c
index 6a83ee1..3fa6624 100644
--- a/drivers/parport/share.c
+++ b/drivers/parport/share.c
@@ -905,7 +905,8 @@ int parport_claim_or_block(struct pardevice *dev)
/* If dev->waiting is clear now, an interrupt
gave us the port and we would deadlock if we slept. */
if (dev->waiting) {
- interruptible_sleep_on (&dev->wait_q);
+ wait_event_interruptible(dev->wait_q,
+ !dev->waiting);
if (signal_pending (current)) {
return -EINTR;
}
--
1.8.3.2
next prev parent reply other threads:[~2014-02-26 11:06 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-26 11:01 [PATCH 00/16] sleep_on removal, second try Arnd Bergmann
2014-02-26 11:01 ` [PATCH 01/16] ataflop: fix sleep_on races Arnd Bergmann
2014-02-26 11:01 ` [PATCH 02/16] scsi: atari_scsi: fix sleep_on race Arnd Bergmann
2014-02-27 7:58 ` Michael Schmitz
2014-02-27 20:44 ` Arnd Bergmann
2014-03-01 0:24 ` Michael Schmitz
2014-02-26 11:01 ` [PATCH 03/16] DAC960: remove sleep_on usage Arnd Bergmann
2014-02-26 11:01 ` [PATCH 04/16] swim3: fix interruptible_sleep_on race Arnd Bergmann
2014-02-26 11:01 ` [PATCH 05/16] [media] omap_vout: avoid sleep_on race Arnd Bergmann
2014-02-26 11:01 ` [PATCH 06/16] [media] usbvision: drop unused define USBVISION_SAY_AND_WAIT Arnd Bergmann
2014-02-26 11:01 ` [PATCH 07/16] [media] radio-cadet: avoid interruptible_sleep_on race Arnd Bergmann
2014-02-26 11:01 ` [PATCH 08/16] [media] arv: fix sleep_on race Arnd Bergmann
2014-02-26 11:01 ` Arnd Bergmann [this message]
2014-02-26 11:01 ` [PATCH 10/16] atm: nicstar: remove interruptible_sleep_on_timeout Arnd Bergmann
2014-02-26 16:06 ` David Miller
2014-02-27 18:51 ` [PATCH v3] " Arnd Bergmann
2014-02-27 20:23 ` David Miller
2014-02-26 11:01 ` [PATCH 11/16] atm: firestream: fix interruptible_sleep_on race Arnd Bergmann
2014-02-26 21:08 ` David Miller
2014-02-26 11:01 ` [PATCH 12/16] isdn: pcbit: " Arnd Bergmann
2014-02-26 21:08 ` David Miller
2014-02-26 11:01 ` [PATCH 13/16] isdn: hisax/elsa: fix sleep_on race in elsa FSM Arnd Bergmann
2014-02-26 21:08 ` David Miller
2014-02-26 11:01 ` [PATCH 14/16] isdn: divert, hysdn: fix interruptible_sleep_on race Arnd Bergmann
2014-02-26 21:08 ` David Miller
2014-02-26 11:01 ` [PATCH 15/16] isdn: fix multiple sleep_on races Arnd Bergmann
2014-02-26 21:08 ` David Miller
2014-02-26 11:01 ` [PATCH 16/16] NOTYET: sched: remove sleep_on() and friends Arnd Bergmann
2014-02-26 17:36 ` [PATCH 00/16] sleep_on removal, second try Jens Axboe
2014-02-27 6:37 ` Michael Schmitz
2014-02-27 11:55 ` Geert Uytterhoeven
2014-02-28 8:53 ` Karsten Keil
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=1393412516-3762435-10-git-send-email-arnd@arndb.de \
--to=arnd@arndb.de \
--cc=akpm@osdl.org \
--cc=gregkh@linuxfoundation.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).