Add iocost_ioc_tick, emitted once per period from ioc_timer_fn() with the overall controller state: period_us, vrate, busy_level, active iocg count, usage percentage and whether the controller still has active iocgs. It reads the values the period ran in: the event is emitted before the vrate adjustment and the period transition, so each tick reports the completed period. ioc->running has not transitioned to IOC_IDLE at the emit point, so the running field reports the active iocg list instead.
It fires every period the controller is running, including steady states, plus one final tick before the controller goes idle, which reads active=0 running=0, making the transition to dormancy (e.g. a device saturated entirely by uncharged IO) directly visible. Suggested-by: Tejun Heo <[email protected]> Signed-off-by: Tao Cui <[email protected]> --- block/blk-iocost.c | 14 +++++++++++ include/trace/events/iocost.h | 45 +++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/block/blk-iocost.c b/block/blk-iocost.c index 509ae36f99edf..a565892b1be07 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -2278,6 +2278,7 @@ static void ioc_timer_fn(struct timer_list *timer) struct ioc_now now; LIST_HEAD(surpluses); int nr_debtors, nr_shortages = 0, nr_lagging = 0; + int nr_active = 0; u64 usage_us_sum = 0; u32 ppm_rthr; u32 ppm_wthr; @@ -2314,6 +2315,8 @@ static void ioc_timer_fn(struct timer_list *timer) u64 vdone, vtime, usage_us; u32 hw_active, hw_inuse; + nr_active++; + /* * Collect unused and wind vtime closer to vnow to prevent * iocgs from accumulating a large amount of budget. @@ -2475,6 +2478,17 @@ static void ioc_timer_fn(struct timer_list *timer) ioc->busy_level = clamp(ioc->busy_level, -1000, 1000); + /* + * Everything the tick reports is final here: busy_level was just + * computed, cur_period hasn't changed, nr_active and usage_us_sum + * are complete, and vrate and period_us still hold the values + * this period ran in. Emit before the refresh below so the + * event reads the completed period directly; ioc->running has + * not transitioned to IOC_IDLE yet, so the running field reports + * the active iocg list instead. + */ + trace_iocost_ioc_tick(ioc, &now, nr_active, usage_us_sum); + ioc_adjust_base_vrate(ioc, rq_wait_pct, nr_lagging, nr_shortages, prev_busy_level, missed_ppm); diff --git a/include/trace/events/iocost.h b/include/trace/events/iocost.h index e772b1bc60d60..dc14c574894de 100644 --- a/include/trace/events/iocost.h +++ b/include/trace/events/iocost.h @@ -178,6 +178,51 @@ TRACE_EVENT(iocost_ioc_vrate_adj, ) ); +/* + * Periodic per-device summary, emitted once per period from the tail of + * ioc_timer_fn(). Unlike the state-change events above, this fires every + * period the controller is running, including steady states, and carries + * the overall controller state so basic monitoring doesn't require drgn. + */ +TRACE_EVENT(iocost_ioc_tick, + + TP_PROTO(struct ioc *ioc, const struct ioc_now *now, + int nr_active, u64 usage_us_sum), + + TP_ARGS(ioc, now, nr_active, usage_us_sum), + + TP_STRUCT__entry ( + __string(devname, ioc_name(ioc)) + __field(u64, cur_period) + __field(u32, period_us) + __field(u64, vrate) + __field(int, busy_level) + __field(int, nr_active) + __field(u32, usage_pct) + /* whether the controller still has active iocgs */ + __field(int, running) + ), + + TP_fast_assign( + __assign_str(devname); + __entry->cur_period = atomic64_read(&ioc->cur_period); + __entry->period_us = ioc->period_us; + __entry->vrate = ioc->vtime_base_rate; + __entry->busy_level = ioc->busy_level; + __entry->nr_active = nr_active; + __entry->usage_pct = now->now > ioc->period_at ? + div64_u64(usage_us_sum * 100, + now->now - ioc->period_at) : 0; + __entry->running = !list_empty(&ioc->active_iocgs); + ), + + TP_printk("[%s] period=%llu:%uus vrate=%llu busy=%d active=%d usage=%u%% running=%d", + __get_str(devname), __entry->cur_period, __entry->period_us, + __entry->vrate, __entry->busy_level, __entry->nr_active, + __entry->usage_pct, __entry->running + ) +); + TRACE_EVENT(iocost_iocg_forgive_debt, TP_PROTO(struct ioc_gq *iocg, const char *path, struct ioc_now *now, -- 2.43.0
