From f3e3a45d2bc7fe15e9d1f5e31b88d39b6d857e77 Mon Sep 17 00:00:00 2001 From: Shaleen Agrawal Date: Thu, 22 Jul 2021 17:09:23 -0700 Subject: [PATCH] ANDROID: sched: add restricted hook to override show_cpufinfo_max_freq Need restricted hook so that it can sleep. The old non-restricted versions need to stay in place as a consequence of KMI freeze. Bug: 194431527 Change-Id: I7093b66f95c3b9c473386ade60d8897426ddbb13 Signed-off-by: Shaleen Agrawal --- drivers/android/vendor_hooks.c | 1 + drivers/cpufreq/cpufreq.c | 1 + include/trace/hooks/cpufreq.h | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 63710748e07a..79212c880142 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -370,3 +370,4 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_usb_dev_resume); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_ipv6_gen_linklocal_addr); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_sound_usb_support_cpu_suspend); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_snd_compr_use_pause_in_drain); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_show_max_freq); diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 1e6b0eff68fb..89dbff9a8501 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -697,6 +697,7 @@ static ssize_t show_cpuinfo_max_freq(struct cpufreq_policy *policy, char *buf) unsigned int max_freq = policy->cpuinfo.max_freq; trace_android_vh_show_max_freq(policy, &max_freq); + trace_android_rvh_show_max_freq(policy, &max_freq); return sprintf(buf, "%u\n", max_freq); } diff --git a/include/trace/hooks/cpufreq.h b/include/trace/hooks/cpufreq.h index 7208da2e7e3e..500c96ac7776 100644 --- a/include/trace/hooks/cpufreq.h +++ b/include/trace/hooks/cpufreq.h @@ -11,6 +11,10 @@ #include #include +DECLARE_RESTRICTED_HOOK(android_rvh_show_max_freq, + TP_PROTO(struct cpufreq_policy *policy, unsigned int *max_freq), + TP_ARGS(policy, max_freq), 1); + DECLARE_HOOK(android_vh_show_max_freq, TP_PROTO(struct cpufreq_policy *policy, unsigned int *max_freq), TP_ARGS(policy, max_freq));