Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b856086 authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

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: default avatarBart 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: default avatarJens Axboe <axboe@fb.com>
parent 7afafc8a

block/blk-core.c

+3 −1
Original line number Diff line number Diff line
@@ -515,7 +515,9 @@ EXPORT_SYMBOL_GPL(blk_queue_bypass_end); 


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)

		blk_mq_wake_waiters(q);