From 11d9d07f3f68605b30b4c1e7185703d14376edcc Mon Sep 17 00:00:00 2001 From: Yun Hsiang Date: Wed, 13 Jan 2021 17:00:22 +0800 Subject: [PATCH] ANDROID: schedutil: add vendor hook for adjusting util to freq calculation Currently, the frequency is calculated by max freq * 1.25 * util / max cap. Add a vendor hook to adjust the frequency when the calculation overestimate. android_vh_map_util_freq adjust util to freq calculation Bug: 177854431 Signed-off-by: Yun Hsiang Change-Id: I9aa9079f00af7d3380b19f2fe21b75cddd107d15 (cherry picked from commit 3122e3ec9672036384304fdeaa1b1815f60ba817) --- drivers/android/vendor_hooks.c | 1 + include/trace/hooks/sched.h | 5 +++++ kernel/sched/cpufreq_schedutil.c | 8 +++++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index bbc3ea8ba1f7..2ea668a2dab7 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -129,3 +129,4 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ftrace_size_check); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ftrace_format_check); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ftrace_dump_buffer); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_allow_domain_state); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_map_util_freq); diff --git a/include/trace/hooks/sched.h b/include/trace/hooks/sched.h index cc9ed57e9bad..1635cd61e3e8 100644 --- a/include/trace/hooks/sched.h +++ b/include/trace/hooks/sched.h @@ -222,6 +222,11 @@ DECLARE_RESTRICTED_HOOK(android_rvh_sched_exec, TP_PROTO(bool *cond), TP_ARGS(cond), 1); +DECLARE_HOOK(android_vh_map_util_freq, + TP_PROTO(unsigned long util, unsigned long freq, + unsigned long cap, unsigned long *next_freq), + TP_ARGS(util, freq, cap, next_freq)); + /* macro versions of hooks are no longer required */ #endif /* _TRACE_HOOK_SCHED_H */ diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c index b2eaf385920e..ac5b1d4eb830 100644 --- a/kernel/sched/cpufreq_schedutil.c +++ b/kernel/sched/cpufreq_schedutil.c @@ -168,8 +168,14 @@ static unsigned int get_next_freq(struct sugov_policy *sg_policy, struct cpufreq_policy *policy = sg_policy->policy; unsigned int freq = arch_scale_freq_invariant() ? policy->cpuinfo.max_freq : policy->cur; + unsigned long next_freq = 0; + + trace_android_vh_map_util_freq(util, freq, max, &next_freq); + if (next_freq) + freq = next_freq; + else + freq = map_util_freq(util, freq, max); - freq = map_util_freq(util, freq, max); trace_sugov_next_freq_tp(policy->cpu, util, max, freq); if (freq == sg_policy->cached_raw_freq && !sg_policy->need_freq_update)