Skip to content

Commit 1dc3039

Browse files
sourcejediaxboe
authored andcommitted
block: do not use interruptible wait anywhere
When blk_queue_enter() waits for a queue to unfreeze, or unset the PREEMPT_ONLY flag, do not allow it to be interrupted by a signal. The PREEMPT_ONLY flag was introduced later in commit 3a0a529 ("block, scsi: Make SCSI quiesce and resume work reliably"). Note the SCSI device is resumed asynchronously, i.e. after un-freezing userspace tasks. So that commit exposed the bug as a regression in v4.15. A mysterious SIGBUS (or -EIO) sometimes happened during the time the device was being resumed. Most frequently, there was no kernel log message, and we saw Xorg or Xwayland killed by SIGBUS.[1] [1] E.g. https://bugzilla.redhat.com/show_bug.cgi?id=1553979 Without this fix, I get an IO error in this test: # dd if=/dev/sda of=/dev/null iflag=direct & \ while killall -SIGUSR1 dd; do sleep 0.1; done & \ echo mem > /sys/power/state ; \ sleep 5; killall dd # stop after 5 seconds The interruptible wait was added to blk_queue_enter in commit 3ef28e8 ("block: generic request_queue reference counting"). Before then, the interruptible wait was only in blk-mq, but I don't think it could ever have been correct. Reviewed-by: Bart Van Assche <[email protected]> Cc: [email protected] Signed-off-by: Alan Jenkins <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent 4802310 commit 1dc3039

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

block/blk-core.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,6 @@ int blk_queue_enter(struct request_queue *q, blk_mq_req_flags_t flags)
915915

916916
while (true) {
917917
bool success = false;
918-
int ret;
919918

920919
rcu_read_lock();
921920
if (percpu_ref_tryget_live(&q->q_usage_counter)) {
@@ -947,14 +946,12 @@ int blk_queue_enter(struct request_queue *q, blk_mq_req_flags_t flags)
947946
*/
948947
smp_rmb();
949948

950-
ret = wait_event_interruptible(q->mq_freeze_wq,
951-
(atomic_read(&q->mq_freeze_depth) == 0 &&
952-
(preempt || !blk_queue_preempt_only(q))) ||
953-
blk_queue_dying(q));
949+
wait_event(q->mq_freeze_wq,
950+
(atomic_read(&q->mq_freeze_depth) == 0 &&
951+
(preempt || !blk_queue_preempt_only(q))) ||
952+
blk_queue_dying(q));
954953
if (blk_queue_dying(q))
955954
return -ENODEV;
956-
if (ret)
957-
return ret;
958955
}
959956
}
960957

0 commit comments

Comments
 (0)