From 744d0dc11559a30f2cf6fd4b7971a2f0121f082f Mon Sep 17 00:00:00 2001 From: Huaixin Chang Date: Wed, 11 Mar 2020 11:07:54 +0800 Subject: [PATCH 2113/2944] alinux: sched: Add cfs bandwidth burst statistics Introduce statistics exports for the burstable cfs bandwidth controller. The following exports are included: current_bw: current runtime in global pool nr_burst: number of periods bandwidth burst occurs burst_time: cumulative wall-time that any cpus has used above quota in respective periods Reviewed-by: Shanpei Chen Signed-off-by: Huaixin Chang --- kernel/sched/core.c | 6 ++++++ kernel/sched/fair.c | 10 +++++++++- kernel/sched/sched.h | 3 +++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 1b06790..4f38763 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -6615,6 +6615,8 @@ static int tg_set_cfs_bandwidth(struct task_group *tg, u64 period, u64 quota, } } + cfs_b->previous_runtime = cfs_b->runtime; + /* Restart the period timer (if active) to handle new period expiry: */ if (runtime_enabled) start_cfs_bandwidth(cfs_b, 1); @@ -6863,6 +6865,10 @@ static int cpu_cfs_stat_show(struct seq_file *sf, void *v) seq_printf(sf, "wait_sum %llu\n", ws); } + seq_printf(sf, "current_bw %llu\n", cfs_b->runtime); + seq_printf(sf, "nr_burst %d\n", cfs_b->nr_burst); + seq_printf(sf, "burst_time %llu\n", cfs_b->burst_time); + return 0; } #endif /* CONFIG_CFS_BANDWIDTH */ diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index b08b43b..b093dda 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -4378,7 +4378,7 @@ static inline u64 sched_cfs_bandwidth_slice(void) */ void __refill_cfs_bandwidth_runtime(struct cfs_bandwidth *cfs_b, u64 overrun) { - u64 refill; + u64 refill, runtime; if (cfs_b->quota != RUNTIME_INF) { @@ -4387,6 +4387,12 @@ void __refill_cfs_bandwidth_runtime(struct cfs_bandwidth *cfs_b, u64 overrun) return; } + runtime = cfs_b->previous_runtime - cfs_b->runtime; + if (runtime > cfs_b->quota) { + cfs_b->burst_time += runtime - cfs_b->quota; + cfs_b->nr_burst++; + } + overrun = min(overrun, cfs_b->max_overrun); refill = cfs_b->quota * overrun; @@ -4401,6 +4407,8 @@ void __refill_cfs_bandwidth_runtime(struct cfs_bandwidth *cfs_b, u64 overrun) */ cfs_b->runtime = RUNTIME_INF; } + + cfs_b->previous_runtime = cfs_b->runtime; } } diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 7c18272..f329aee 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -338,6 +338,7 @@ struct cfs_bandwidth { u64 burst; u64 buffer; u64 max_overrun; + u64 previous_runtime; s64 hierarchical_quota; u8 idle; @@ -351,7 +352,9 @@ struct cfs_bandwidth { /* Statistics: */ int nr_periods; int nr_throttled; + int nr_burst; u64 throttled_time; + u64 burst_time; #endif }; -- 1.8.3.1