| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <b051b42f0c4f36d7177978e090c6a85df17922c6.1594707424.git.viresh.kumar@linaro.org>
Date: Tue, 14 Jul 2020 12:06:53 +0530
From: Viresh Kumar <viresh.kumar@...aro.org>
To: Ingo Molnar <mingo@...hat.com>,
Peter Zijlstra <peterz@...radead.org>,
Vincent Guittot <vincent.guittot@...aro.org>,
Zhang Rui <rui.zhang@...el.com>,
Daniel Lezcano <daniel.lezcano@...aro.org>,
Amit Daniel Kachhap <amit.kachhap@...il.com>,
Viresh Kumar <viresh.kumar@...aro.org>,
Javi Merino <javi.merino@...nel.org>,
Amit Kucheria <amit.kucheria@...durent.com>
Cc: linux-kernel@...r.kernel.org, Quentin Perret <qperret@...gle.com>,
Rafael Wysocki <rjw@...ysocki.net>, linux-pm@...r.kernel.org
Subject: [PATCH 2/2] thermal: cpufreq_cooling: Reuse effective_cpu_util()
Several parts of the kernel are already using the effective CPU
utilization to get the current load on the CPU, do the same here instead
of depending on the idle time of the CPU, which isn't that accurate
comparatively.
Note that, this (and CPU frequency scaling in general) doesn't work that
well with idle injection as that is done from rt threads and is counted
as load while it tries to do quite the opposite. That should be solved
separately though.
Signed-off-by: Viresh Kumar <viresh.kumar@...aro.org>
---
drivers/thermal/cpufreq_cooling.c | 65 +++++++------------------------
1 file changed, 15 insertions(+), 50 deletions(-)
diff --git a/drivers/thermal/cpufreq_cooling.c b/drivers/thermal/cpufreq_cooling.c
index 6c0e1b053126..74340b2b0da7 100644
--- a/drivers/thermal/cpufreq_cooling.c
+++ b/drivers/thermal/cpufreq_cooling.c
@@ -23,6 +23,7 @@
#include <linux/thermal.h>
#include <trace/events/thermal.h>
+#include "../../kernel/sched/sched.h"
/*
* Cooling state <-> CPUFreq frequency
@@ -38,16 +39,6 @@
* ...
*/
-/**
- * struct time_in_idle - Idle time stats
- * @time: previous reading of the absolute time that this cpu was idle
- * @timestamp: wall time of the last invocation of get_cpu_idle_time_us()
- */
-struct time_in_idle {
- u64 time;
- u64 timestamp;
-};
-
/**
* struct cpufreq_cooling_device - data for cooling device with cpufreq
* @id: unique integer value corresponding to each cpufreq_cooling_device
@@ -62,7 +53,6 @@ struct time_in_idle {
* registered cooling device.
* @policy: cpufreq policy.
* @node: list_head to link all cpufreq_cooling_device together.
- * @idle_time: idle time stats
* @qos_req: PM QoS contraint to apply
*
* This structure is required for keeping information of each registered
@@ -76,7 +66,6 @@ struct cpufreq_cooling_device {
struct em_perf_domain *em;
struct cpufreq_policy *policy;
struct list_head node;
- struct time_in_idle *idle_time;
struct freq_qos_request qos_req;
};
@@ -132,34 +121,21 @@ static u32 cpu_power_to_freq(struct cpufreq_cooling_device *cpufreq_cdev,
}
/**
- * get_load() - get load for a cpu since last updated
+ * get_load() - get current load for a cpu
* @cpufreq_cdev: &struct cpufreq_cooling_device for this cpu
* @cpu: cpu number
- * @cpu_idx: index of the cpu in time_in_idle*
+ * @cpu_idx: index of the cpu
*
- * Return: The average load of cpu @cpu in percentage since this
- * function was last called.
+ * Return: The current load of cpu @cpu in percentage.
*/
static u32 get_load(struct cpufreq_cooling_device *cpufreq_cdev, int cpu,
int cpu_idx)
{
- u32 load;
- u64 now, now_idle, delta_time, delta_idle;
- struct time_in_idle *idle_time = &cpufreq_cdev->idle_time[cpu_idx];
-
- now_idle = get_cpu_idle_time(cpu, &now, 0);
- delta_idle = now_idle - idle_time->time;
- delta_time = now - idle_time->timestamp;
+ unsigned long util = cpu_util_cfs(cpu_rq(cpu));
+ unsigned long max = arch_scale_cpu_capacity(cpu);
- if (delta_time <= delta_idle)
- load = 0;
- else
- load = div64_u64(100 * (delta_time - delta_idle), delta_time);
-
- idle_time->time = now_idle;
- idle_time->timestamp = now;
-
- return load;
+ util = effective_cpu_util(cpu, util, max, ENERGY_UTIL, NULL);
+ return (util * 100) / max;
}
/**
@@ -192,13 +168,12 @@ static u32 get_dynamic_power(struct cpufreq_cooling_device *cpufreq_cdev,
* Instead, we calculate the current power on the assumption that the
* immediate future will look like the immediate past.
*
- * We use the current frequency and the average load since this
- * function was last called. In reality, there could have been
- * multiple opps since this function was last called and that affects
- * the load calculation. While it's not perfectly accurate, this
- * simplification is good enough and works. REVISIT this, as more
- * complex code may be needed if experiments show that it's not
- * accurate enough.
+ * We use the current frequency and the current load. In reality,
+ * there could have been multiple opps since this function was last
+ * called and that affects the load calculation. While it's not
+ * perfectly accurate, this simplification is good enough and works.
+ * REVISIT this, as more complex code may be needed if experiments show
+ * that it's not accurate enough.
*
* Return: 0 on success, -E* if getting the static power failed.
*/
@@ -523,13 +498,6 @@ __cpufreq_cooling_register(struct device_node *np,
cpufreq_cdev->policy = policy;
num_cpus = cpumask_weight(policy->related_cpus);
- cpufreq_cdev->idle_time = kcalloc(num_cpus,
- sizeof(*cpufreq_cdev->idle_time),
- GFP_KERNEL);
- if (!cpufreq_cdev->idle_time) {
- cdev = ERR_PTR(-ENOMEM);
- goto free_cdev;
- }
/* max_level is an index, not a counter */
cpufreq_cdev->max_level = i - 1;
@@ -537,7 +505,7 @@ __cpufreq_cooling_register(struct device_node *np,
ret = ida_simple_get(&cpufreq_ida, 0, 0, GFP_KERNEL);
if (ret < 0) {
cdev = ERR_PTR(ret);
- goto free_idle_time;
+ goto free_cdev;
}
cpufreq_cdev->id = ret;
@@ -586,8 +554,6 @@ __cpufreq_cooling_register(struct device_node *np,
freq_qos_remove_request(&cpufreq_cdev->qos_req);
remove_ida:
ida_simple_remove(&cpufreq_ida, cpufreq_cdev->id);
-free_idle_time:
- kfree(cpufreq_cdev->idle_time);
free_cdev:
kfree(cpufreq_cdev);
return cdev;
@@ -680,7 +646,6 @@ void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev)
thermal_cooling_device_unregister(cdev);
freq_qos_remove_request(&cpufreq_cdev->qos_req);
ida_simple_remove(&cpufreq_ida, cpufreq_cdev->id);
- kfree(cpufreq_cdev->idle_time);
kfree(cpufreq_cdev);
}
EXPORT_SYMBOL_GPL(cpufreq_cooling_unregister);
--
2.25.0.rc1.19.g042ed3e048af
Powered by blists - more mailing lists