History

block: remove deadlock in disk_clear_events

In disk_clear_events, do not put work on system_nrt_freezable_wq. Instead, put it on system_nrt_wq. There is a race between probing a usb and suspending the device. Since probing a usb calls disk_clear_events, which puts work on a frozen workqueue, probing cannot finish after the workqueue is frozen. However, suspending cannot finish until the usb probe is finished, so we get a deadlock, causing the system to reboot. The way to reproduce this bug is to wake up from suspend with a usb storage device plugged in, or plugging in a usb storage device right before suspend. The window of time is on the order of time it takes to probe the usb device. As long as the workqueues are frozen before the call to add_disk within sd_probe_async finishes, there will be a deadlock (which calls blkdev_get, sd_open, check_disk_change, then disk_clear_events). This is not difficult to reproduce after figuring out the timings. [akpm@linux-foundation.org: fix up comment] Signed-off-by: Derek Basehore <dbasehore@chromium.org> Reviewed-by: Mandeep Singh Baines <msb@chromium.org> Cc: Jens Axboe <axboe@kernel.dk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jens Axboe <axboe@kernel.dk>

Derek Basehore committed 13 years ago

Commit aea24a81 parent 74779e21 file · +8 −1Browse files

Unified · Split

block/genhd.c+8−1
@@ -1565,7 +1565,14 @@ unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask) · 1564 unmodified lines
15651565
15661566 /* uncondtionally schedule event check and wait for it to finish */
15671567 disk_block_events(disk);
1568− queue_delayed_work(system_freezable_wq, &ev->dwork, 0);
1568+ /*
1569+ * We need to put the work on system_nrt_wq here since there is a
1570+ * deadlock that happens while probing a usb device while suspending. If
1571+ * we put work on a freezable workqueue here, a usb probe will wait here
1572+ * until the workqueue is unfrozen during suspend. Since suspend waits
1573+ * on all probes to complete, we have a deadlock
1574+ */
1575+ queue_delayed_work(system_nrt_wq, &ev->dwork, 0);
15691576 flush_delayed_work(&ev->dwork);
15701577 __disk_unblock_events(disk, false);
15711578

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t