Browse Source

block: Fix race triggered by blk_set_queue_dying()

blk_set_queue_dying() can be called while another thread is
submitting I/O or changing queue flags, e.g. through dm_stop_queue().
Hence protect the QUEUE_FLAG_DYING flag change with locking.

Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Mike Snitzer <snitzer@redhat.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Jens Axboe <axboe@fb.com>
Bart Van Assche 9 years ago
parent
commit
1b85608681
1 changed files with 3 additions and 1 deletions
  1. 3 1
      block/blk-core.c

+ 3 - 1
block/blk-core.c

@@ -515,7 +515,9 @@ EXPORT_SYMBOL_GPL(blk_queue_bypass_end);
 
 
 void blk_set_queue_dying(struct request_queue *q)
 void blk_set_queue_dying(struct request_queue *q)
 {
 {
-	queue_flag_set_unlocked(QUEUE_FLAG_DYING, q);
+	spin_lock_irq(q->queue_lock);
+	queue_flag_set(QUEUE_FLAG_DYING, q);
+	spin_unlock_irq(q->queue_lock);
 
 
 	if (q->mq_ops)
 	if (q->mq_ops)
 		blk_mq_wake_waiters(q);
 		blk_mq_wake_waiters(q);