From: Viresh Kumar <viresh.kumar@linaro.org>
To: Rafael Wysocki <rjw@rjwysocki.net>,
Viresh Kumar <viresh.kumar@linaro.org>,
Ingo Molnar <mingo@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
Juri Lelli <juri.lelli@redhat.com>,
Vincent Guittot <vincent.guittot@linaro.org>,
Dietmar Eggemann <dietmar.eggemann@arm.com>,
Steven Rostedt <rostedt@goodmis.org>,
Ben Segall <bsegall@google.com>, Mel Gorman <mgorman@suse.de>
Cc: linux-pm@vger.kernel.org, Lukasz Luba <lukasz.luba@arm.com>,
cristian.marussi@arm.com, sudeep.holla@arm.com,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 4/4] cpufreq: Move traces and update to policy->cur to cpufreq core
Date: Wed, 16 Sep 2020 12:15:31 +0530 [thread overview]
Message-ID: <875fc2c8d800f075c2faf925b04461b85362887a.1600238586.git.viresh.kumar@linaro.org> (raw)
In-Reply-To: <cover.1600238586.git.viresh.kumar@linaro.org>
The cpufreq core handles the updates to policy->cur and recording of
cpufreq trace events for all the governors except schedutil's fast
switch case.
Move that as well to cpufreq core for consistency and readability.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
drivers/cpufreq/cpufreq.c | 14 ++++++++++++--
kernel/sched/cpufreq_schedutil.c | 12 +-----------
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index d5fe64e96be9..bc930f6ecff6 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -2056,11 +2056,21 @@ EXPORT_SYMBOL(cpufreq_unregister_notifier);
unsigned int cpufreq_driver_fast_switch(struct cpufreq_policy *policy,
unsigned int target_freq)
{
+ int cpu;
+
target_freq = clamp_val(target_freq, policy->min, policy->max);
target_freq = cpufreq_driver->fast_switch(policy, target_freq);
- if (target_freq)
- cpufreq_stats_record_transition(policy, target_freq);
+ if (!target_freq)
+ return 0;
+
+ policy->cur = target_freq;
+ cpufreq_stats_record_transition(policy, target_freq);
+
+ if (trace_cpu_frequency_enabled()) {
+ for_each_cpu(cpu, policy->cpus)
+ trace_cpu_frequency(target_freq, cpu);
+ }
return target_freq;
}
diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c
index e39008242cf4..28f6d1ad608b 100644
--- a/kernel/sched/cpufreq_schedutil.c
+++ b/kernel/sched/cpufreq_schedutil.c
@@ -115,21 +115,11 @@ static void sugov_fast_switch(struct sugov_policy *sg_policy, u64 time,
unsigned int next_freq)
{
struct cpufreq_policy *policy = sg_policy->policy;
- int cpu;
if (!sugov_update_next_freq(sg_policy, time, next_freq))
return;
- next_freq = cpufreq_driver_fast_switch(policy, next_freq);
- if (!next_freq)
- return;
-
- policy->cur = next_freq;
-
- if (trace_cpu_frequency_enabled()) {
- for_each_cpu(cpu, policy->cpus)
- trace_cpu_frequency(next_freq, cpu);
- }
+ cpufreq_driver_fast_switch(policy, next_freq);
}
static void sugov_deferred_update(struct sugov_policy *sg_policy, u64 time,
--
2.25.0.rc1.19.g042ed3e048af
prev parent reply other threads:[~2020-09-16 6:46 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-16 6:45 [PATCH V2 0/4] cpufreq: Record stats with fast-switching Viresh Kumar
2020-09-16 6:45 ` [PATCH V2 1/4] cpufreq: stats: Defer stats update to cpufreq_stats_record_transition() Viresh Kumar
2020-09-23 13:48 ` Rafael J. Wysocki
2020-09-24 9:25 ` Lukasz Luba
2020-09-24 10:24 ` Rafael J. Wysocki
2020-09-24 11:00 ` Lukasz Luba
2020-09-24 11:07 ` Rafael J. Wysocki
2020-09-24 12:39 ` Viresh Kumar
2020-09-24 16:10 ` Lukasz Luba
2020-09-25 6:09 ` Viresh Kumar
2020-09-25 8:10 ` Lukasz Luba
2020-09-24 13:15 ` Viresh Kumar
2020-09-25 10:04 ` Rafael J. Wysocki
2020-09-25 10:58 ` Viresh Kumar
2020-09-25 11:09 ` Rafael J. Wysocki
2020-09-25 11:26 ` Viresh Kumar
2020-09-25 8:21 ` Lukasz Luba
2020-09-25 10:46 ` Viresh Kumar
2020-09-16 6:45 ` [PATCH V2 2/4] cpufreq: stats: Remove locking Viresh Kumar
2020-09-16 6:45 ` [PATCH V2 3/4] cpufreq: stats: Enable stats for fast-switch as well Viresh Kumar
2020-09-23 15:14 ` Rafael J. Wysocki
2020-09-23 15:17 ` Rafael J. Wysocki
2020-09-16 6:45 ` Viresh Kumar [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=875fc2c8d800f075c2faf925b04461b85362887a.1600238586.git.viresh.kumar@linaro.org \
--to=viresh.kumar@linaro.org \
--cc=bsegall@google.com \
--cc=cristian.marussi@arm.com \
--cc=dietmar.eggemann@arm.com \
--cc=juri.lelli@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=lukasz.luba@arm.com \
--cc=mgorman@suse.de \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=rjw@rjwysocki.net \
--cc=rostedt@goodmis.org \
--cc=sudeep.holla@arm.com \
--cc=vincent.guittot@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).