block: Fix race triggered by blk_set_queue_dying()
commit 1b856086813be9371929b6cc62045f9fd470f5a0 upstream. 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> Signed-off-by: Jens Axboe <axboe@fb.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
1d12bad745
commit
d3a6bd7b77
1 changed files with 3 additions and 1 deletions
|
@ -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);
|
||||||
|
|
Loading…
Add table
Reference in a new issue