diff options
| author | Ming Lei <ming.lei@redhat.com> | 2018-10-24 21:18:09 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-10-31 08:40:36 -0600 |
| commit | c57cdf7a9e51d97a43e29b8f4a04157875104000 (patch) | |
| tree | 4b957413d55cca86e87293647d2a1d889cb02261 /block | |
| parent | 698b53b3119c45a59eef10b516d780b3e9a5402d (diff) | |
| download | linux-c57cdf7a9e51d97a43e29b8f4a04157875104000.tar.gz linux-c57cdf7a9e51d97a43e29b8f4a04157875104000.tar.bz2 linux-c57cdf7a9e51d97a43e29b8f4a04157875104000.zip | |
block: call rq_qos_exit() after queue is frozen
rq_qos_exit() removes the current q->rq_qos, this action has to be
done after queue is frozen, otherwise the IO queue path may never
be waken up, then IO hang is caused.
So fixes this issue by moving rq_qos_exit() after queue is frozen.
Cc: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-core.c | 3 | ||||
| -rw-r--r-- | block/blk-sysfs.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index bc6ea87d10e0..26a5dac80ed9 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -785,6 +785,9 @@ void blk_cleanup_queue(struct request_queue *q) * prevent that q->request_fn() gets invoked after draining finished. */ blk_freeze_queue(q); + + rq_qos_exit(q); + spin_lock_irq(lock); queue_flag_set(QUEUE_FLAG_DEAD, q); spin_unlock_irq(lock); diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 0641533597f1..844a454a7b3a 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -1007,8 +1007,6 @@ void blk_unregister_queue(struct gendisk *disk) kobject_del(&q->kobj); blk_trace_remove_sysfs(disk_to_dev(disk)); - rq_qos_exit(q); - mutex_lock(&q->sysfs_lock); if (q->request_fn || (q->mq_ops && q->elevator)) elv_unregister_queue(q); |