Make IPA use PM_EM
Subsystems (2)
v9 cover Make IPA use PM_EM
This removes the IPA-specific energy model code in favor of PM_EM which does the same thing in a generic way. For more details, please read the cover letter of the v7:
https://lore.kernel.org/lkml/[email protected]/
Changes in v9:
- Rebased on 5.4-rc5 and fixed conflicts with pm_qos changes
Changes in v8:
- Fixed checkpatch errors (Rui)
Changes in v7
- Added patch 02/04 to fix the build error reported by the kbuild bot
Changes in v6
- Added Daniel's and Viresh's Acked-by to all patches
Changes in v5:
- Changed patch 02 to guard IPA-specific code in cpu_cooling.c with appropriate ifdefery (Daniel)
- Rebased on 5.2-rc2
Changes in v4:
- Added Viresh's Acked-by to all 3 patches
- Improved commit message of patch 3/3 to explain how it has no functional impact on existing users (Eduardo)
Changes in v3:
- Changed warning message for unordered tables to something more explicit (Viresh)
- Changed WARN() into a pr_err() for consistency
Changes in v2:
- Fixed patch 01/03 to actually enable CONFIG_ENERGY_MODEL
- Added "depends on ENERGY_MODEL" to IPA (Daniel)
- Added check to bail out if the freq table is unsorted (Viresh)
Quentin Perret (4):
arm64: defconfig: Enable CONFIG_ENERGY_MODEL
PM / EM: Declare EM data types unconditionally
thermal: cpu_cooling: Make the power-related code depend on IPA
thermal: cpu_cooling: Migrate to using the EM framework
arch/arm64/configs/defconfig | 1 + drivers/thermal/Kconfig | 1 + drivers/thermal/cpu_cooling.c | 404 ++++++++++++++-------------------- include/linux/energy_model.h | 3 +- 4 files changed, 167 insertions(+), 242 deletions(-)
Signature · 1 line
2.24.0.rc0.303.g954a862665-goog
PATCH v9 1/4 arm64: defconfig: Enable CONFIG_ENERGY_MODEL
The recently introduced Energy Model (EM) framework manages power cost tables for the CPUs of the system. Its only user right now is the scheduler, in the context of Energy Aware Scheduling (EAS).
However, the EM framework also offers a generic infrastructure that could replace subsystem-specific implementations of the same concepts, as this is the case in the thermal framework.
So, in order to prepare the migration of the thermal subsystem to use the EM framework, enable it in the default arm64 defconfig, which is the most commonly used architecture for IPA. This will also compile-in all of the EAS code, although it won't be enabled by default -- EAS requires to use the 'schedutil' CPUFreq governor while arm64 defaults to 'performance'.
--- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm64/configs/defconfig +1 -0
@@ -71,6 +71,7 @@ CONFIG_COMPAT=y CONFIG_RANDOMIZE_BASE=y CONFIG_HIBERNATION=y CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y +CONFIG_ENERGY_MODEL=y CONFIG_ARM_CPUIDLE=y CONFIG_ARM_PSCI_CPUIDLE=y CONFIG_CPU_FREQ=y
Signature · 1 line
2.24.0.rc0.303.g954a862665-goog
PATCH v9 2/4 PM / EM: Declare EM data types unconditionally
In reply to Quentin PerretThe structs representing capacity states and performance domains of an Energy Model are currently only defined for CONFIG_ENERGY_MODEL=y. That makes it hard for code outside PM_EM to manipulate those structures without a lot of ifdefery or stubbed accessors.
So, move the declaration of the two structs outside of the CONFIG_ENERGY_MODEL ifdef. The client code (e.g. EAS or thermal) always checks the return of em_cpu_get() before using it, so the exising code is still safe to use as-is.
--- include/linux/energy_model.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
include/linux/energy_model.h +1 -2
@@ -9,7 +9,6 @@#include <linux/sched/topology.h> #include <linux/types.h> -#ifdef CONFIG_ENERGY_MODEL /** * em_cap_state - Capacity state of a performance domain * @frequency: The CPU frequency in KHz, for consistency with CPUFreq
@@ -40,6 +39,7 @@ struct em_perf_domain {unsigned long cpus[0 ]; }; +#ifdef CONFIG_ENERGY_MODEL #define EM_CPU_MAX_POWER 0xFFFF struct em_data_callback {
@@ -160,7 +160,6 @@ static inline int em_pd_nr_cap_states(struct em_perf_domain *pd) }#else -struct em_perf_domain {};struct em_data_callback {};#define EM_DATA_CB (_active_power_cb) { }
Signature · 1 line
2.24.0.rc0.303.g954a862665-goog
PATCH v9 3/4 thermal: cpu_cooling: Make the power-related code depend on IPA
In reply to Quentin PerretThe core CPU cooling infrastructure has power-related functions that have only one client: IPA. Since there can be no user of those functions if IPA is not compiled in, make sure to guard them with checks on CONFIG_THERMAL_GOV_POWER_ALLOCATOR to not waste space unnecessarily.
--- drivers/thermal/cpu_cooling.c | 166 +++++++++++++++++----------------- 1 file changed, 81 insertions(+), 85 deletions(-)
drivers/thermal/cpu_cooling.c +81 -85
@@ -47,7 +47,9 @@*/ struct freq_table {u32 frequency; +#ifdef CONFIG_THERMAL_GOV_POWER_ALLOCATOR u32 power; +#endif };/**
@@ -95,8 +97,7 @@ static DEFINE_IDA(cpufreq_ida);static DEFINE_MUTEX (cooling_list_lock);static LIST_HEAD (cpufreq_cdev_list); -/* Below code defines functions to be used for cpufreq as cooling device */ - +#ifdef CONFIG_THERMAL_GOV_POWER_ALLOCATOR /** * get_level: Find the level for a particular frequency * @cpufreq_cdev: cpufreq_cdev for which the property is required
@@ -265,76 +266,6 @@ static u32 get_dynamic_power(struct cpufreq_cooling_device *cpufreq_cdev,return (raw_cpu_power * cpufreq_cdev->last_load) /100 ; } -/* cpufreq cooling device callback functions are defined below */ - -/** -* cpufreq_get_max_state - callback function to get the max cooling state. -* @cdev: thermal cooling device pointer. -* @state: fill this variable with the max cooling state. -* -* Callback for the thermal cooling device to return the cpufreq -* max cooling state. -* -* Return: 0 on success, an error code otherwise. -*/ -static int cpufreq_get_max_state (struct thermal_cooling_device *cdev, -unsigned long *state) -{ -struct cpufreq_cooling_device *cpufreq_cdev = cdev->devdata; - - *state = cpufreq_cdev->max_level; -return 0 ; -} - -/** -* cpufreq_get_cur_state - callback function to get the current cooling state. -* @cdev: thermal cooling device pointer. -* @state: fill this variable with the current cooling state. -* -* Callback for the thermal cooling device to return the cpufreq -* current cooling state. -* -* Return: 0 on success, an error code otherwise. -*/ -static int cpufreq_get_cur_state (struct thermal_cooling_device *cdev, -unsigned long *state) -{ -struct cpufreq_cooling_device *cpufreq_cdev = cdev->devdata; - - *state = cpufreq_cdev->cpufreq_state; - -return 0 ; -} - -/** -* cpufreq_set_cur_state - callback function to set the current cooling state. -* @cdev: thermal cooling device pointer. -* @state: set this variable to the current cooling state. -* -* Callback for the thermal cooling device to change the cpufreq -* current cooling state. -* -* Return: 0 on success, an error code otherwise. -*/ -static int cpufreq_set_cur_state (struct thermal_cooling_device *cdev, -unsigned long state) -{ -struct cpufreq_cooling_device *cpufreq_cdev = cdev->devdata; - -/* Request state should be less than max_level */ -if (WARN_ON (state > cpufreq_cdev->max_level)) -return -EINVAL ; - -/* Check if the old cooling action is same as new cooling action */ -if (cpufreq_cdev->cpufreq_state == state) -return 0 ; - - cpufreq_cdev->cpufreq_state = state; - -return freq_qos_update_request (&cpufreq_cdev->qos_req, - cpufreq_cdev->freq_table[state].frequency); -} -/** * cpufreq_get_requested_power() - get the current power * @cdev: &thermal_cooling_device pointer
@@ -478,22 +409,84 @@ static int cpufreq_power2state(struct thermal_cooling_device *cdev, power);return 0 ; } +#endif /* CONFIG_THERMAL_GOV_POWER_ALLOCATOR */ + +/* cpufreq cooling device callback functions are defined below */ + +/** +* cpufreq_get_max_state - callback function to get the max cooling state. +* @cdev: thermal cooling device pointer. +* @state: fill this variable with the max cooling state. +* +* Callback for the thermal cooling device to return the cpufreq +* max cooling state. +* +* Return: 0 on success, an error code otherwise. +*/ +static int cpufreq_get_max_state (struct thermal_cooling_device *cdev, +unsigned long *state) +{ +struct cpufreq_cooling_device *cpufreq_cdev = cdev->devdata; + + *state = cpufreq_cdev->max_level; +return 0 ; +} + +/** +* cpufreq_get_cur_state - callback function to get the current cooling state. +* @cdev: thermal cooling device pointer. +* @state: fill this variable with the current cooling state. +* +* Callback for the thermal cooling device to return the cpufreq +* current cooling state. +* +* Return: 0 on success, an error code otherwise. +*/ +static int cpufreq_get_cur_state (struct thermal_cooling_device *cdev, +unsigned long *state) +{ +struct cpufreq_cooling_device *cpufreq_cdev = cdev->devdata; + + *state = cpufreq_cdev->cpufreq_state; + +return 0 ; +} + +/** +* cpufreq_set_cur_state - callback function to set the current cooling state. +* @cdev: thermal cooling device pointer. +* @state: set this variable to the current cooling state. +* +* Callback for the thermal cooling device to change the cpufreq +* current cooling state. +* +* Return: 0 on success, an error code otherwise. +*/ +static int cpufreq_set_cur_state (struct thermal_cooling_device *cdev, +unsigned long state) +{ +struct cpufreq_cooling_device *cpufreq_cdev = cdev->devdata; + +/* Request state should be less than max_level */ +if (WARN_ON (state > cpufreq_cdev->max_level)) +return -EINVAL ; + +/* Check if the old cooling action is same as new cooling action */ +if (cpufreq_cdev->cpufreq_state == state) +return 0 ; + + cpufreq_cdev->cpufreq_state = state; + +return freq_qos_update_request (&cpufreq_cdev->qos_req, + cpufreq_cdev->freq_table[state].frequency); +}/* Bind cpufreq callbacks to thermal cooling device ops */ static struct thermal_cooling_device_ops cpufreq_cooling_ops = { - .get_max_state = cpufreq_get_max_state, - .get_cur_state = cpufreq_get_cur_state, - .set_cur_state = cpufreq_set_cur_state, -}; - -static struct thermal_cooling_device_ops cpufreq_power_cooling_ops = { .get_max_state = cpufreq_get_max_state, .get_cur_state = cpufreq_get_cur_state, .set_cur_state = cpufreq_set_cur_state, - .get_requested_power = cpufreq_get_requested_power, - .state2power = cpufreq_state2power, - .power2state = cpufreq_power2state, }; static unsigned int find_next_max(struct cpufreq_frequency_table *table,
@@ -603,17 +596,20 @@ __cpufreq_cooling_register(struct device_node *np,pr_debug ("%s: freq:%u KHz\n" , __func__, freq); } + cooling_ops = &cpufreq_cooling_ops; + +#ifdef CONFIG_THERMAL_GOV_POWER_ALLOCATOR if (capacitance) { ret =update_freq_table (cpufreq_cdev, capacitance);if (ret) { cdev =ERR_PTR (ret); goto remove_ida; } - - cooling_ops = &cpufreq_power_cooling_ops; - }else { - cooling_ops = &cpufreq_cooling_ops; + cooling_ops->get_requested_power = cpufreq_get_requested_power; + cooling_ops->state2power = cpufreq_state2power; + cooling_ops->power2state = cpufreq_power2state; } +#endif ret = freq_qos_add_request(&policy->constraints, &cpufreq_cdev->qos_req, FREQ_QOS_MAX,
Signature · 1 line
2.24.0.rc0.303.g954a862665-goog
PATCH v9 4/4 thermal: cpu_cooling: Migrate to using the EM framework
In reply to Quentin PerretThe newly introduced Energy Model framework manages power cost tables in a generic way. Moreover, it supports several types of models since the tables can come from DT or firmware (through SCMI) for example. On the other hand, the cpu_cooling subsystem manages its own power cost tables using only DT data.
In order to avoid the duplication of data in the kernel, and in order to enable IPA with EMs coming from more than just DT, remove the private tables from cpu_cooling.c and migrate it to using the centralized EM framework. Doing so should have no visible functional impact for existing users of IPA since:
- recent extenstions to the the PM_OPP infrastructure enable the registration of EMs in PM_EM using the DT property used by IPA;
- the existing upstream cpufreq drivers marked with the 'CPUFREQ_IS_COOLING_DEV' flag all use the aforementioned PM_OPP infrastructure, which means they all support PM_EM. The only two exceptions are qoriq-cpufreq which doesn't in fact use an EM and scmi-cpufreq which doesn't use DT for power costs.
For existing users of cpu_cooling, PM_EM tables will contain the exact same power values that IPA used to compute on its own until now. The only new dependency for them is to compile in CONFIG_ENERGY_MODEL.
The case where the thermal subsystem is used without an Energy Model (cpufreq_cooling_ops) is handled by looking directly at CPUFreq's frequency table which is already a dependency for cpu_cooling.c anyway. Since the thermal framework expects the cooling states in a particular order, bail out whenever the CPUFreq table is unsorted, since that is fairly uncommon in general, and there are currently no users of cpu_cooling for this use-case.
--- drivers/thermal/Kconfig | 1 + drivers/thermal/cpu_cooling.c | 248 ++++++++++++---------------------- 2 files changed, 89 insertions(+), 160 deletions(-)
drivers/thermal/Kconfig +1 -0
@@ -144,6 +144,7 @@ config THERMAL_GOV_USER_SPACE config THERMAL_GOV_POWER_ALLOCATOR bool "Power allocator thermal governor" + depends on ENERGY_MODEL help Enable this to manage platform thermals by dynamically allocating and limiting power to devices.
drivers/thermal/cpu_cooling.c +88 -160
403 lines not on this page · raw message
Signature · 1 line
2.24.0.rc0.303.g954a862665-goog