]> git.baikalelectronics.ru Git - kernel.git/commitdiff
blk-iolatency: error out if blk_get_queue() failed in iolatency_set_limit()
authorYu Kuai <yukuai3@huawei.com>
Thu, 5 Aug 2021 12:46:45 +0000 (20:46 +0800)
committerJens Axboe <axboe@kernel.dk>
Thu, 5 Aug 2021 17:18:13 +0000 (11:18 -0600)
If queue is dying while iolatency_set_limit() is in progress,
blk_get_queue() won't increment the refcount of the queue. However,
blk_put_queue() will still decrement the refcount later, which will
cause the refcout to be unbalanced.

Thus error out in such case to fix the problem.

Fixes: 8c772a9bfc7c ("blk-iolatency: fix IO hang due to negative inflight counter")
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Acked-by: Tejun Heo <tj@kernel.org>
Link: https://lore.kernel.org/r/20210805124645.543797-1-yukuai3@huawei.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-iolatency.c

index 81be0096411da1de15d81ac23b2cd913d436fbc9..d8b0d8bd132bcac8ac2bb6c5c8d1f625ef3a6b41 100644 (file)
@@ -833,7 +833,11 @@ static ssize_t iolatency_set_limit(struct kernfs_open_file *of, char *buf,
 
        enable = iolatency_set_min_lat_nsec(blkg, lat_val);
        if (enable) {
-               WARN_ON_ONCE(!blk_get_queue(blkg->q));
+               if (!blk_get_queue(blkg->q)) {
+                       ret = -ENODEV;
+                       goto out;
+               }
+
                blkg_get(blkg);
        }