blkg_conf_open_bdev() validates disk_live() once under rq_qos_mutex. ioc_qos_write() and ioc_cost_model_write() then release that mutex, freeze the queue and re-acquire it, so __del_gendisk() can run rq_qos_exit() to completion in the window and detach the existing policy. After the re-acquire, q_to_ioc() returning NULL now also means "the policy was torn down", not just "never enabled", and the writer calls blk_iocost_init() to attach a fresh ioc to the dead disk. Nothing tears that ioc down again: rq_qos_exit() already ran, and for disks on a shared queue, e.g. sd/sr, blk_mq_destroy_queue() does not call it either. The ioc with its timer and per-cpu stats is leaked, and QUEUE_FLAG_QOS_ENABLED is resurrected on the dead queue. The same lazy-init pattern in blk_throtl_init() and blk_iolatency_init() is reachable the same way once their respective config writers get the release-freeze-reacquire treatment. Reject a dead disk in all three init helpers. Fixes: 7caa47151ab2 ("blkcg: implement blk-iocost") Fixes: a3166c51702b ("blk-throttle: delay initialization until configuration") Fixes: a13696b83da4 ("blk-iolatency: Make initialization lazy") Cc: stable@vger.kernel.org Signed-off-by: Guixin Liu --- block/blk-iocost.c | 3 +++ block/blk-iolatency.c | 3 +++ block/blk-throttle.c | 3 +++ 3 files changed, 9 insertions(+) diff --git a/block/blk-iocost.c b/block/blk-iocost.c index b251ecc66d8a..f71d997f232c 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -3009,6 +3009,9 @@ static int blk_iocost_init(struct gendisk *disk) struct ioc *ioc; int i, cpu, ret; + if (test_bit(GD_DEAD, &disk->state)) + return -ENODEV; + /* The caller holds rq_qos_mutex, which is taken with the queue frozen */ ioc = kzalloc_obj(*ioc, GFP_NOIO); if (!ioc) diff --git a/block/blk-iolatency.c b/block/blk-iolatency.c index a3bd153c67be..553f2091730f 100644 --- a/block/blk-iolatency.c +++ b/block/blk-iolatency.c @@ -761,6 +761,9 @@ static int blk_iolatency_init(struct gendisk *disk) struct blk_iolatency *blkiolat; int ret; + if (test_bit(GD_DEAD, &disk->state)) + return -ENODEV; + /* The caller holds rq_qos_mutex, which is taken with the queue frozen */ blkiolat = kzalloc_obj(*blkiolat, GFP_NOIO); if (!blkiolat) diff --git a/block/blk-throttle.c b/block/blk-throttle.c index c5e26551956a..374ac75832ea 100644 --- a/block/blk-throttle.c +++ b/block/blk-throttle.c @@ -1322,6 +1322,9 @@ static int blk_throtl_init(struct gendisk *disk) unsigned int memflags; int ret; + if (test_bit(GD_DEAD, &disk->state)) + return -ENODEV; + /* The caller holds rq_qos_mutex, which is taken with the queue frozen */ td = kzalloc_node(sizeof(*td), GFP_NOIO, q->node); if (!td) -- 2.43.7