Skip to content

Commit 51cf18c

Browse files
Vincent DonnefortPeter Zijlstra
authored andcommitted
sched/debug: Add new tracepoint to track cpu_capacity
rq->cpu_capacity is a key element in several scheduler parts, such as EAS task placement and load balancing. Tracking this value enables testing and/or debugging by a toolkit. Signed-off-by: Vincent Donnefort <vincent.donnefort@arm.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Link: https://lkml.kernel.org/r/1598605249-72651-1-git-send-email-vincent.donnefort@arm.com
1 parent 9abb897 commit 51cf18c

File tree

4 files changed

+20
-0
lines changed

4 files changed

+20
-0
lines changed

include/linux/sched.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2044,6 +2044,7 @@ const struct sched_avg *sched_trace_rq_avg_dl(struct rq *rq);
20442044
const struct sched_avg *sched_trace_rq_avg_irq(struct rq *rq);
20452045

20462046
int sched_trace_rq_cpu(struct rq *rq);
2047+
int sched_trace_rq_cpu_capacity(struct rq *rq);
20472048
int sched_trace_rq_nr_running(struct rq *rq);
20482049

20492050
const struct cpumask *sched_trace_rd_span(struct root_domain *rd);

include/trace/events/sched.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -630,6 +630,10 @@ DECLARE_TRACE(pelt_se_tp,
630630
TP_PROTO(struct sched_entity *se),
631631
TP_ARGS(se));
632632

633+
DECLARE_TRACE(sched_cpu_capacity_tp,
634+
TP_PROTO(struct rq *rq),
635+
TP_ARGS(rq));
636+
633637
DECLARE_TRACE(sched_overutilized_tp,
634638
TP_PROTO(struct root_domain *rd, bool overutilized),
635639
TP_ARGS(rd, overutilized));

kernel/sched/core.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(pelt_rt_tp);
3636
EXPORT_TRACEPOINT_SYMBOL_GPL(pelt_dl_tp);
3737
EXPORT_TRACEPOINT_SYMBOL_GPL(pelt_irq_tp);
3838
EXPORT_TRACEPOINT_SYMBOL_GPL(pelt_se_tp);
39+
EXPORT_TRACEPOINT_SYMBOL_GPL(sched_cpu_capacity_tp);
3940
EXPORT_TRACEPOINT_SYMBOL_GPL(sched_overutilized_tp);
4041
EXPORT_TRACEPOINT_SYMBOL_GPL(sched_util_est_cfs_tp);
4142
EXPORT_TRACEPOINT_SYMBOL_GPL(sched_util_est_se_tp);

kernel/sched/fair.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8108,6 +8108,8 @@ static void update_cpu_capacity(struct sched_domain *sd, int cpu)
81088108
capacity = 1;
81098109

81108110
cpu_rq(cpu)->cpu_capacity = capacity;
8111+
trace_sched_cpu_capacity_tp(cpu_rq(cpu));
8112+
81118113
sdg->sgc->capacity = capacity;
81128114
sdg->sgc->min_capacity = capacity;
81138115
sdg->sgc->max_capacity = capacity;
@@ -11321,6 +11323,18 @@ int sched_trace_rq_cpu(struct rq *rq)
1132111323
}
1132211324
EXPORT_SYMBOL_GPL(sched_trace_rq_cpu);
1132311325

11326+
int sched_trace_rq_cpu_capacity(struct rq *rq)
11327+
{
11328+
return rq ?
11329+
#ifdef CONFIG_SMP
11330+
rq->cpu_capacity
11331+
#else
11332+
SCHED_CAPACITY_SCALE
11333+
#endif
11334+
: -1;
11335+
}
11336+
EXPORT_SYMBOL_GPL(sched_trace_rq_cpu_capacity);
11337+
1132411338
const struct cpumask *sched_trace_rd_span(struct root_domain *rd)
1132511339
{
1132611340
#ifdef CONFIG_SMP

0 commit comments

Comments
 (0)