Skip to content

Commit aed0aac

Browse files
Li Nangregkh
authored andcommitted
blk-iocost: do not WARN if iocg was already offlined
commit 01bc4fda9ea0a6b52f12326486f07a4910666cf6 upstream. In iocg_pay_debt(), warn is triggered if 'active_list' is empty, which is intended to confirm iocg is active when it has debt. However, warn can be triggered during a blkcg or disk removal, if iocg_waitq_timer_fn() is run at that time: WARNING: CPU: 0 PID: 2344971 at block/blk-iocost.c:1402 iocg_pay_debt+0x14c/0x190 Call trace: iocg_pay_debt+0x14c/0x190 iocg_kick_waitq+0x438/0x4c0 iocg_waitq_timer_fn+0xd8/0x130 __run_hrtimer+0x144/0x45c __hrtimer_run_queues+0x16c/0x244 hrtimer_interrupt+0x2cc/0x7b0 The warn in this situation is meaningless. Since this iocg is being removed, the state of the 'active_list' is irrelevant, and 'waitq_timer' is canceled after removing 'active_list' in ioc_pd_free(), which ensures iocg is freed after iocg_waitq_timer_fn() returns. Therefore, add the check if iocg was already offlined to avoid warn when removing a blkcg or disk. Signed-off-by: Li Nan <[email protected]> Reviewed-by: Yu Kuai <[email protected]> Acked-by: Tejun Heo <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]> Signed-off-by: Bin Lan <[email protected]> Signed-off-by: He Zhe <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 3154d64 commit aed0aac

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

block/blk-iocost.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1430,8 +1430,11 @@ static void iocg_pay_debt(struct ioc_gq *iocg, u64 abs_vpay,
14301430
lockdep_assert_held(&iocg->ioc->lock);
14311431
lockdep_assert_held(&iocg->waitq.lock);
14321432

1433-
/* make sure that nobody messed with @iocg */
1434-
WARN_ON_ONCE(list_empty(&iocg->active_list));
1433+
/*
1434+
* make sure that nobody messed with @iocg. Check iocg->pd.online
1435+
* to avoid warn when removing blkcg or disk.
1436+
*/
1437+
WARN_ON_ONCE(list_empty(&iocg->active_list) && iocg->pd.online);
14351438
WARN_ON_ONCE(iocg->inuse > 1);
14361439

14371440
iocg->abs_vdebt -= min(abs_vpay, iocg->abs_vdebt);

0 commit comments

Comments
 (0)