From 592bea2ef052c02acb45cf3fb230291621a2fd80 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 31 Mar 2022 11:36:32 +0200 Subject: [PATCH] Revert "ANDROID: sched: Add vendor hooks for skipping sugov update" This reverts commit 846bf8e8cb39243bd02545ebc3a13a692f31a3c1. It causes merge issues with 5.18-rc1 and has to be reverted for now. If it is still needed, it can be added back after 5.18-rc1. Bug: 170511085 Cc: Wei Wang Cc: Will McVicker Signed-off-by: Greg Kroah-Hartman Change-Id: I9375ff49ce856d39e56e44e5e02819ced87341c8 --- drivers/android/vendor_hooks.c | 2 -- include/trace/hooks/sched.h | 5 ----- kernel/sched/cpufreq_schedutil.c | 6 ------ 3 files changed, 13 deletions(-) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 400ee37992bb..0495c0f9e580 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -88,8 +88,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_find_busiest_queue); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_migrate_queued_task); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_find_energy_efficient_cpu); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_set_sugov_sched_attr); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_set_iowait); -EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_set_sugov_update); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_cpu_overutilized); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_sched_setaffinity); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_update_cpus_allowed); diff --git a/include/trace/hooks/sched.h b/include/trace/hooks/sched.h index f1de639d9423..85421b578a87 100644 --- a/include/trace/hooks/sched.h +++ b/include/trace/hooks/sched.h @@ -117,11 +117,6 @@ DECLARE_RESTRICTED_HOOK(android_rvh_set_iowait, TP_PROTO(struct task_struct *p, struct rq *rq, int *should_iowait_boost), TP_ARGS(p, rq, should_iowait_boost), 1); -struct sugov_policy; -DECLARE_RESTRICTED_HOOK(android_rvh_set_sugov_update, - TP_PROTO(struct sugov_policy *sg_policy, unsigned int next_freq, bool *should_update), - TP_ARGS(sg_policy, next_freq, should_update), 1); - DECLARE_RESTRICTED_HOOK(android_rvh_cpu_overutilized, TP_PROTO(int cpu, int *overutilized), TP_ARGS(cpu, overutilized), 1); diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c index 857747dbffd6..3434749f8730 100644 --- a/kernel/sched/cpufreq_schedutil.c +++ b/kernel/sched/cpufreq_schedutil.c @@ -104,17 +104,11 @@ static bool sugov_should_update_freq(struct sugov_policy *sg_policy, u64 time) static bool sugov_update_next_freq(struct sugov_policy *sg_policy, u64 time, unsigned int next_freq) { - bool should_update = true; - if (sg_policy->need_freq_update) sg_policy->need_freq_update = cpufreq_driver_test_flags(CPUFREQ_NEED_UPDATE_LIMITS); else if (sg_policy->next_freq == next_freq) return false; - trace_android_rvh_set_sugov_update(sg_policy, next_freq, &should_update); - if (!should_update) - return false; - sg_policy->next_freq = next_freq; sg_policy->last_freq_update_time = time;