| From 07be957bc211022b295625104a22c8e52c156874 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 30 Jul 2020 17:03:21 +0800 |
| Subject: iocost: Fix check condition of iocg abs_vdebt |
| |
| From: Chengming Zhou <zhouchengming@bytedance.com> |
| |
| [ Upstream commit d9012a59db54442d5b2fcfdfcded35cf566397d3 ] |
| |
| We shouldn't skip iocg when its abs_vdebt is not zero. |
| |
| Fixes: 0b80f9866e6b ("iocost: protect iocg->abs_vdebt with iocg->waitq.lock") |
| Signed-off-by: Chengming Zhou <zhouchengming@bytedance.com> |
| Acked-by: Tejun Heo <tj@kernel.org> |
| Signed-off-by: Jens Axboe <axboe@kernel.dk> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| block/blk-iocost.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/block/blk-iocost.c b/block/blk-iocost.c |
| index ef193389fffe9..b5a9cfcd75e9d 100644 |
| --- a/block/blk-iocost.c |
| +++ b/block/blk-iocost.c |
| @@ -1374,7 +1374,7 @@ static void ioc_timer_fn(struct timer_list *timer) |
| * should have woken up in the last period and expire idle iocgs. |
| */ |
| list_for_each_entry_safe(iocg, tiocg, &ioc->active_iocgs, active_list) { |
| - if (!waitqueue_active(&iocg->waitq) && iocg->abs_vdebt && |
| + if (!waitqueue_active(&iocg->waitq) && !iocg->abs_vdebt && |
| !iocg_is_idle(iocg)) |
| continue; |
| |
| -- |
| 2.25.1 |
| |
