Re: [PATCH v3 3/3] sched/tp: Add new tracepoint to track compute energy computation

[Lukasz Luba <lukasz.luba@arm.com>]

On 8/21/23 23:36, Qais Yousef wrote:
> Hi Lukasz
> 
> On 08/21/23 10:04, Lukasz Luba wrote:
>> Hi Qais,
>>
>> On 7/17/23 22:57, Qais Yousef wrote:
>>> It was useful to track feec() placement decision and debug the spare
>>> capacity and optimization issues vs uclamp_max.
>>>
>>> Signed-off-by: Qais Yousef (Google) <qyousef@layalina.io>
>>> ---
>>>    include/trace/events/sched.h | 4 ++++
>>>    kernel/sched/core.c          | 1 +
>>>    kernel/sched/fair.c          | 7 ++++++-
>>>    3 files changed, 11 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h
>>> index fbb99a61f714..20cc884f72ff 100644
>>> --- a/include/trace/events/sched.h
>>> +++ b/include/trace/events/sched.h
>>> @@ -735,6 +735,10 @@ DECLARE_TRACE(sched_update_nr_running_tp,
>>>    	TP_PROTO(struct rq *rq, int change),
>>>    	TP_ARGS(rq, change));
>>> +DECLARE_TRACE(sched_compute_energy_tp,
>>> +	TP_PROTO(struct task_struct *p, int dst_cpu, unsigned long energy),
>>> +	TP_ARGS(p, dst_cpu, energy));
>>> +
>>>    #endif /* _TRACE_SCHED_H */
>>>    /* This part must be outside protection */
>>> diff --git a/kernel/sched/core.c b/kernel/sched/core.c
>>> index 83e36547af17..2deca2dca625 100644
>>> --- a/kernel/sched/core.c
>>> +++ b/kernel/sched/core.c
>>> @@ -114,6 +114,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(sched_overutilized_tp);
>>>    EXPORT_TRACEPOINT_SYMBOL_GPL(sched_util_est_cfs_tp);
>>>    EXPORT_TRACEPOINT_SYMBOL_GPL(sched_util_est_se_tp);
>>>    EXPORT_TRACEPOINT_SYMBOL_GPL(sched_update_nr_running_tp);
>>> +EXPORT_TRACEPOINT_SYMBOL_GPL(sched_compute_energy_tp);
>>>    DEFINE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues);
>>> diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
>>> index c701f490ca4c..23e026393210 100644
>>> --- a/kernel/sched/fair.c
>>> +++ b/kernel/sched/fair.c
>>> @@ -7493,11 +7493,16 @@ compute_energy(struct energy_env *eenv, struct perf_domain *pd,
>>>    {
>>>    	unsigned long max_util = eenv_pd_max_util(eenv, pd_cpus, p, dst_cpu);
>>>    	unsigned long busy_time = eenv->pd_busy_time;
>>> +	unsigned long energy;
>>>    	if (dst_cpu >= 0)
>>>    		busy_time = min(eenv->pd_cap, busy_time + eenv->task_busy_time);
>>> -	return em_cpu_energy(pd->em_pd, max_util, busy_time, eenv->cpu_cap);
>>> +	energy = em_cpu_energy(pd->em_pd, max_util, busy_time, eenv->cpu_cap);
>>> +
>>> +	trace_sched_compute_energy_tp(p, dst_cpu, energy);
>>
>> You've probably missed to add the change that we discussed in v2:
>>
>> https://lore.kernel.org/lkml/20230221120832.x642tqohxv5nascr@airbuntu/
>>
>> The max_util and busy_time. This would help us in our tool.
> 
> Ah, I did indeed. Sorry about that. Will send v4 then.

Thanks Qais!