diff --git a/kernel/sched/walt/trace.h b/kernel/sched/walt/trace.h index cdb08fb12771..fb21263b15b5 100644 --- a/kernel/sched/walt/trace.h +++ b/kernel/sched/walt/trace.h @@ -905,12 +905,11 @@ TRACE_EVENT(sched_task_util, TP_PROTO(struct task_struct *p, unsigned long candidates, int best_energy_cpu, bool sync, int need_idle, int fastpath, - bool placement_boost, u64 start_t, - bool uclamp_boosted, bool is_rtg, bool rtg_skip_min, + u64 start_t, bool uclamp_boosted, bool is_rtg, int start_cpu), TP_ARGS(p, candidates, best_energy_cpu, sync, need_idle, fastpath, - placement_boost, start_t, uclamp_boosted, is_rtg, rtg_skip_min, + start_t, uclamp_boosted, is_rtg, start_cpu), TP_STRUCT__entry( @@ -946,11 +945,11 @@ TRACE_EVENT(sched_task_util, __entry->sync = sync; __entry->need_idle = need_idle; __entry->fastpath = fastpath; - __entry->placement_boost = placement_boost; + __entry->placement_boost = task_boost_policy(p); __entry->latency = (sched_clock() - start_t); __entry->uclamp_boosted = uclamp_boosted; __entry->is_rtg = is_rtg; - __entry->rtg_skip_min = rtg_skip_min; + __entry->rtg_skip_min = walt_get_rtg_status(p); __entry->start_cpu = start_cpu; __entry->unfilter = ((struct walt_task_struct *) p->android_vendor_data1)->unfilter; diff --git a/kernel/sched/walt/walt.h b/kernel/sched/walt/walt.h index 666fb458b79f..741d0c6e1717 100644 --- a/kernel/sched/walt/walt.h +++ b/kernel/sched/walt/walt.h @@ -738,6 +738,7 @@ static inline unsigned int walt_get_idle_exit_latency(struct rq *rq) extern void sched_get_nr_running_avg(struct sched_avg_stats *stats); extern void sched_update_hyst_times(void); +extern bool walt_get_rtg_status(struct task_struct *p); extern enum sched_boost_policy sched_boost_policy(void); extern void walt_rt_init(void); extern void walt_cfs_init(void); diff --git a/kernel/sched/walt/walt_cfs.c b/kernel/sched/walt/walt_cfs.c index cfd63eb6aa19..46960f30f70b 100644 --- a/kernel/sched/walt/walt_cfs.c +++ b/kernel/sched/walt/walt_cfs.c @@ -92,7 +92,7 @@ static unsigned long cpu_util_without(int cpu, struct task_struct *p) return min_t(unsigned long, util, capacity_orig_of(cpu)); } -static inline bool walt_get_rtg_status(struct task_struct *p) +bool walt_get_rtg_status(struct task_struct *p) { struct walt_related_thread_group *grp; bool ret = false; @@ -648,8 +648,7 @@ int walt_find_energy_efficient_cpu(struct task_struct *p, int prev_cpu, done: trace_sched_task_util(p, cpumask_bits(candidates)[0], best_energy_cpu, sync, fbt_env.need_idle, fbt_env.fastpath, - task_boost_policy(p), start_t, boosted, is_rtg, - walt_get_rtg_status(p), start_cpu); + start_t, boosted, is_rtg, start_cpu); return best_energy_cpu;