blk-iocost: fix incorrect vtime comparison in iocg_is_idle()
authorTejun Heo <tj@kernel.org>
Tue, 10 Mar 2020 17:07:46 +0000 (13:07 -0400)
committerJens Axboe <axboe@kernel.dk>
Tue, 10 Mar 2020 17:37:00 +0000 (11:37 -0600)
vtimes may wrap and time_before/after64() should be used to determine
whether a given vtime is before or after another. iocg_is_idle() was
incorrectly using plain "<" comparison do determine whether done_vtime
is before vtime. Here, the only thing we're interested in is whether
done_vtime matches vtime which indicates that there's nothing in
flight. Let's test for inequality instead.

Signed-off-by: Tejun Heo <tj@kernel.org>
Fixes: 7caa47151ab2 ("blkcg: implement blk-iocost")
Cc: stable@vger.kernel.org # v5.4+
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-iocost.c

index 27ca68621137ad5418e647c859b39b12a588f9c2..9a599cc28c290c7d79ef6512c5173a4ee7605bc5 100644 (file)
@@ -1318,7 +1318,7 @@ static bool iocg_is_idle(struct ioc_gq *iocg)
                return false;
 
        /* is something in flight? */
-       if (atomic64_read(&iocg->done_vtime) < atomic64_read(&iocg->vtime))
+       if (atomic64_read(&iocg->done_vtime) != atomic64_read(&iocg->vtime))
                return false;
 
        return true;