Energy Aware Scheduling
Subsystems (7)
v10 cover Energy Aware Scheduling
This patch series introduces Energy Aware Scheduling (EAS) for CFS tasks on platforms with asymmetric CPU topologies (e.g. Arm big.LITTLE).
For more details about the ideas behind it and the overall design, please refer to the cover letter of version 5 [1].
1. Version history
------------------
Changes v9[2]->v10:
- Re-factored schedutil_freq_util() to avoid useless identation (patch 02)
- Moved sched_cpufreq_governor_change() to linux/cpufreq.h (patch 08)
- Reworked the static key enabling code (patch 09)
Changes v8[3]->v9:
- Rebased on latest tip/sched/core (trivial conflict with PSI stuff in sched.h)
- Added documentation for the sched_energy_aware sysctl
Changes v7[4]->v8:
- Added kerneldoc to enum schedutil_type (patch 02)
- Added 'max' argument to schedutil_freq_util() (patch 02)
- Added schedutil_energy_util() wrapper (patch 02)
- Added smp_store_release() to the EM loading code (patch 03)
- Renamed 'obj' field of struct perf_domain to 'em_pd' (patch 05)
- Added plain WARN when the EM is too large for EAS (patch 07)
- Added dmesg warning when EAS gets disabled by switching from sugov (patch 08)
- Replaced sched_feat(ENERGY_AWARE) by a sysctl + static key (patches 09 and 10)
- Improved/refactored find_energy_efficient_cpu() and compute_energy() for readability (patches 13 and 14)
Changes v6[5]->v7:
- Replaced the sched_energy_present static key by a sched_feat
- Replaced the CPUFreq notifier in the dependency between sugov and EAS by a function call
- Squashed all sugov-refactoring patches into patch 02
- Clarified comment in em_fd_energy() to explain the choice of “energy” over “power”
- Added kerneldoc to structs in include/linux/energy_model.h
- Removed unnecessary memory barrier from the EM framework
- Fixed corner case in find_energy_efficient_cpu when prev_cpu is overutilized (and prev_energy = ULONG_MAX)
Changes v5[1]->v6:
- Rebased on Peter’s sched/core branch (that includes Morten's misfit patches [6] and the automatic detection of SD_ASYM_CPUCAPACITY [7])
- Removed patch 13/14 (not needed with the automatic flag detection)
- Added patch creating a dependency between sugov and EAS
- Renamed frequency domains to performance domains to avoid creating too deep assumptions in the code about the HW
- Renamed the sd_ea shortcut sd_asym_cpucapacity
- Added comment to explain why new tasks are not accounted when detecting the 'overutilized' flag
- Added comment explaining why forkees don’t go in find_energy_efficient_cpu()
Changes v4[8]->v5:
- Removed the RCU protection of the EM tables and the associated need for em_rescale_cpu_capacity().
- Factorized schedutil’s PELT aggregation function with EAS
- Improved comments/doc in the EM framework
- Added check on the uarch of CPUs in one fd in the EM framework
- Reduced CONFIG_ENERGY_MODEL ifdefery in kernel/sched/topology.c
- Cleaned-up update_sg_lb_stats parameters
- Improved comments in compute_energy() to explain the multi-rd scenarios
Changes v3[9]->v4:
- Replaced spinlock in EM framework by smp_store_release/READ_ONCE
- Fixed missing locks to protect rcu_assign_pointer in EM framework
- Fixed capacity calculation in EM framework on 32 bits system
- Fixed compilation issue for CONFIG_ENERGY_MODEL=n
- Removed cpumask from struct em_freq_domain, now dynamically allocated
- Power costs of the EM are specified in milliwatts
- Added example of CPUFreq driver modification
- Added doc/comments in the EM framework and better commit header
- Fixed integration issue with util_est in cpu_util_next()
- Changed scheduler topology code to have one freq. dom. list per rd
- Split sched topology patch in smaller patches
- Added doc/comments explaining the heuristic in the wake-up path
- Changed energy threshold for migration to from 1.5% to 6%
Changes v2[10]->v3:
- Removed the PM_OPP dependency by implementing a new EM framework
- Modified the scheduler topology code to take references on the EM data structures
- Simplified the overutilization mechanism into a system-wide flag
- Reworked the integration in the wake-up path using the sd_ea shortcut
- Rebased on tip/sched/core (247f2f6f3c70 "sched/core: Don't schedule threads on pre-empted vCPUs")
Changes v1[11]->v2:
- Reworked interface between fair.c and energy.[ch] (Remove #ifdef CONFIG_PM_OPP from energy.c) (Greg KH)
- Fixed licence & header issue in energy.[ch] (Greg KH)
- Reordered EAS path in select_task_rq_fair() (Joel)
- Avoid prev_cpu if not allowed in select_task_rq_fair() (Morten/Joel)
- Refactored compute_energy() (Patrick)
- Account for RT/IRQ pressure in task_fits() (Patrick)
- Use UTIL_EST and DL utilization during OPP estimation (Patrick/Juri)
- Optimize selection of CPU candidates in the energy-aware wake-up path
- Rebased on top of tip/sched/core (commit b720342849fe “sched/core:
Update Preempt_notifier_key to modern API”)
2. Test results
---------------
Two fundamentally different tests were executed. Firstly the energy test case shows the impact on energy consumption this patch-set has using a synthetic set of tasks. Secondly the performance test case provides the conventional hackbench metric numbers.
The tests run on two arm64 big.LITTLE platforms: Hikey960 (4xA73 + 4xA53) and Juno r0 (2xA57 + 4xA53).
Base kernel is tip/sched/core (based on 4.19), with some Hikey960 and Juno specific patches. Test branch: [12].
2.1 Energy test case
10 iterations of between 10 and 50 periodic rt-app tasks (16ms period, 5% duty-cycle) for 30 seconds with energy measurement. Unit is Joules. The goal is to save energy, so lower is better.
2.1.1 Hikey960
Energy is measured with an ACME Cape on an instrumented board. Numbers include consumption of big and little CPUs, LPDDR memory, GPU and most of the other small components on the board. They do not include consumption of the radio chip (turned-off anyway) and external connectors.
+----------+-----------------+-------------------------+ | | Without patches | With patches | +----------+--------+--------+------------------+------+ | Tasks nb | Mean | RSD* | Mean | RSD* | +----------+--------+--------+------------------+------+ | 10 | 32.55 | 1.59 | 28.91 (-11.20%) | 1.59 | | 20 | 53.39 | 0.91 | 42.58 (-20.25%) | 0.60 | | 30 | 66.16 | 2.73 | 60.30 (-8.86%) | 3.84 | | 40 | 90.70 | 3.63 | 81.42 (-10.23%) | 3.76 | | 50 | 132.07 | 7.37 | 108.18 (-18.09%) | 7.43 | +----------+-----------------+-------------------------+
2.1.2 Juno r0
Energy is measured with the onboard energy meter. Numbers include consumption of big and little CPUs.
+----------+-----------------+-------------------------+ | | Without patches | With patches | +----------+--------+--------+------------------+------+ | Tasks nb | Mean | RSD* | Mean | RSD* | +----------+--------+--------+------------------+------+ | 10 | 8.96 | 0.35 | 6.54 (-27.00%) | 0.38 | | 20 | 16.79 | 0.90 | 13.66 (-18.66%) | 0.94 | | 30 | 28.60 | 2.71 | 21.06 (-26.37%) | 0.98 | | 40 | 41.21 | 1.95 | 31.20 (-24.30%) | 2.80 | | 50 | 53.69 | 1.21 | 49.29 (-8.20%) | 1.39 | +----------+-----------------+-------------------------+
2.2 Performance test case
30 iterations of perf bench sched messaging --pipe --thread --group G --loop L with G=[1 2 4 8] and L=50000 (Hikey960)/16000 (Juno r0).
2.2.1 Hikey960
The impact of thermal capping was mitigated thanks to a heatsink, a fan, and a 30 sec delay between two successive executions. IPA is disabled to reduce the stddev.
+----------------+-----------------+-----------------------+ | | Without patches | With patches | +--------+-------+---------+-------+----------------+------+ | Groups | Tasks | Mean | RSD* | Mean | RSD* | +--------+-------+---------+-------+----------------+------+ | 1 | 40 | 8.32 | 0.09 | 8.45 (+1.64%) | 0.10 | | 2 | 80 | 15.16 | 0.07 | 15.32 (+1.04%) | 0.08 | | 4 | 160 | 31.29 | 0.20 | 31.64 (+1.12%) | 0.19 | | 8 | 320 | 66.25 | 0.28 | 66.69 (+0.67%) | 0.33 | +--------+-------+---------+-------+----------------+------+
2.2.2 Juno r0
+----------------+-----------------+-----------------------+ | | Without patches | With patches | +--------+-------+---------+-------+----------------+------+ | Groups | Tasks | Mean | RSD* | Mean | RSD* | +--------+-------+---------+-------+----------------+------+ | 1 | 40 | 8.38 | 0.09 | 8.50 (+1.41%) | 0.11 | | 2 | 80 | 15.32 | 0.10 | 15.67 (+2.31%) | 0.20 | | 4 | 160 | 29.12 | 0.20 | 29.65 (+1.82%) | 0.14 | | 8 | 320 | 58.42 | 0.26 | 59.81 (+2.38%) | 0.37 | +--------+-------+---------+-------+----------------+------+
*RSD: Relative Standard Deviation (std dev / mean)
[1] https://marc.info/?l=linux-kernel&m=153243513908731&w=2 (V5) [2] https://marc.info/?l=linux-kernel&m=154269969931689&w=2 (V9) [3] https://marc.info/?l=linux-kernel&m=153968492908835&w=2 (V8) [4] https://marc.info/?l=linux-kernel&m=153674360525432&w=2 (V7) [5] https://marc.info/?l=linux-kernel&m=153476300928169&w=2 (V6) [6] https://marc.info/?l=linux-kernel&m=153069968022982&w=2 (Misfit) [7] https://marc.info/?l=linux-kernel&m=153209362826476&w=2 (SD_ASYM_CPUCAPACITY) [8] https://marc.info/?l=linux-kernel&m=153018606728533&w=2 (V4) [9] https://marc.info/?l=linux-kernel&m=152691273111941&w=2 (V3)
[10] https://marc.info/?l=linux-kernel&m=152302902427143&w=2 (V2)
[11] https://marc.info/?l=linux-kernel&m=152153905805048&w=2 (V1)
[12] http://www.linux-arm.org/git?p=linux-qp.git;a=shortlog;h=refs/heads/upstream/eas_v10
Morten Rasmussen (1):
sched: Add over-utilization/tipping point indicator
Quentin Perret (14):
sched: Relocate arch_scale_cpu_capacity
sched/cpufreq: Prepare schedutil for Energy Aware Scheduling
PM: Introduce an Energy Model management framework
PM / EM: Expose the Energy Model in sysfs sched/topology: Reference the Energy Model of CPUs when available sched/topology: Lowest CPU asymmetry sched_domain level pointer sched/topology: Disable EAS on inappropriate platforms sched/topology: Make Energy Aware Scheduling depend on schedutil
sched: Introduce sched_energy_present static key
sched: Introduce a sysctl for Energy Aware Scheduling sched/fair: Clean-up update_sg_lb_stats parameters sched/fair: Introduce an energy estimation helper function sched/fair: Select an energy-efficient CPU on task wake-up
OPTIONAL: cpufreq: dt: Register an Energy Model
Documentation/sysctl/kernel.txt | 12 ++ drivers/cpufreq/cpufreq-dt.c | 48 ++++- drivers/cpufreq/cpufreq.c | 1 + include/linux/cpufreq.h | 8 + include/linux/energy_model.h | 189 +++++++++++++++++++ include/linux/sched/cpufreq.h | 6 + include/linux/sched/sysctl.h | 7 + include/linux/sched/topology.h | 19 ++ kernel/power/Kconfig | 15 ++ kernel/power/Makefile | 2 + kernel/power/energy_model.c | 291 +++++++++++++++++++++++++++++ kernel/sched/cpufreq_schedutil.c | 90 +++++++-- kernel/sched/fair.c | 305 +++++++++++++++++++++++++++++-- kernel/sched/sched.h | 84 ++++++--- kernel/sched/topology.c | 258 +++++++++++++++++++++++++- kernel/sysctl.c | 11 ++ 16 files changed, 1280 insertions(+), 66 deletions(-) create mode 100644 include/linux/energy_model.h create mode 100644 kernel/power/energy_model.c
Signature · 1 line
2.19.2
PATCH v10 1/15 sched: Relocate arch_scale_cpu_capacity
By default, arch_scale_cpu_capacity() is only visible from within the kernel/sched folder. Relocate it to include/linux/sched/topology.h to make it visible to other clients needing to know about the capacity of CPUs, such as the Energy Model framework.
--- include/linux/sched/topology.h | 19 +++++++++++++++++++ kernel/sched/sched.h | 21 --------------------- 2 files changed, 19 insertions(+), 21 deletions(-)
include/linux/sched/topology.h +19 -0
@@ -202,6 +202,17 @@ extern void set_sched_topology(struct sched_domain_topology_level *tl);# define SD_INIT_NAME (type)#endif +#ifndef arch_scale_cpu_capacity +static __always_inline +unsigned long arch_scale_cpu_capacity (struct sched_domain *sd,int cpu) +{ +if (sd && (sd->flags &SD_SHARE_CPUCAPACITY ) && (sd->span_weight >1 )) +return sd->smt_gain / sd->span_weight; + +return SCHED_CAPACITY_SCALE ; +} +#endif +#else /* CONFIG_SMP */ struct sched_domain_attr ;
@@ -217,6 +228,14 @@ static inline bool cpus_share_cache(int this_cpu, int that_cpu) return true; } +#ifndef arch_scale_cpu_capacity +static __always_inline +unsigned long arch_scale_cpu_capacity (void __always_unused *sd,int cpu) +{ +return SCHED_CAPACITY_SCALE ; +} +#endif +#endif /* !CONFIG_SMP */ static inline int task_node (const struct task_struct *p)
kernel/sched/sched.h +0 -21
@@ -1861,27 +1861,6 @@ unsigned long arch_scale_freq_capacity(int cpu) }#endif -#ifdef CONFIG_SMP -#ifndef arch_scale_cpu_capacity -static __always_inline -unsigned long arch_scale_cpu_capacity (struct sched_domain *sd,int cpu) -{ -if (sd && (sd->flags &SD_SHARE_CPUCAPACITY ) && (sd->span_weight >1 )) -return sd->smt_gain / sd->span_weight; - -return SCHED_CAPACITY_SCALE ; -} -#endif -#else -#ifndef arch_scale_cpu_capacity -static __always_inline -unsigned long arch_scale_cpu_capacity (void __always_unused *sd,int cpu) -{ -return SCHED_CAPACITY_SCALE ; -} -#endif -#endif -#ifdef CONFIG_SMP #ifdef CONFIG_PREEMPT
Signature · 1 line
2.19.2
tip-bot for Quentin Perret
merge bot[tip:sched/core] sched/topology: Relocate arch_scale_cpu_capacity() to the internal header
sched/topology: Relocate arch_scale_cpu_capacity() to the internal header
Commit-ID: 5bd0988be12733a42a1a3d50e3e2ddfd79e57518 Gitweb: https://git.kernel.org/tip/5bd0988be12733a42a1a3d50e3e2ddfd79e57518 Author: Quentin Perret <[email protected]> AuthorDate: Mon, 3 Dec 2018 09:56:14 +0000 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 11 Dec 2018 15:16:58 +0100
sched/topology: Relocate arch_scale_cpu_capacity() to the internal header
By default, arch_scale_cpu_capacity() is only visible from within the kernel/sched folder. Relocate it to include/linux/sched/topology.h to make it visible to other clients needing to know about the capacity of CPUs, such as the Energy Model framework.
This also shrinks the <linux/sched/topology.h> public header.
--- include/linux/sched/topology.h | 16 ++++++++++++++++ kernel/sched/sched.h | 18 ------------------ 2 files changed, 16 insertions(+), 18 deletions(-)
include/linux/sched/topology.h +16 -0
@@ -201,6 +201,14 @@ extern void set_sched_topology(struct sched_domain_topology_level *tl);# define SD_INIT_NAME (type)#endif +#ifndef arch_scale_cpu_capacity +static __always_inline +unsigned long arch_scale_cpu_capacity (struct sched_domain *sd,int cpu) +{ +return SCHED_CAPACITY_SCALE ; +} +#endif +#else /* CONFIG_SMP */ struct sched_domain_attr ;
@@ -216,6 +224,14 @@ static inline bool cpus_share_cache(int this_cpu, int that_cpu) return true; } +#ifndef arch_scale_cpu_capacity +static __always_inline +unsigned long arch_scale_cpu_capacity (void __always_unused *sd,int cpu) +{ +return SCHED_CAPACITY_SCALE ; +} +#endif +#endif /* !CONFIG_SMP */ static inline int task_node (const struct task_struct *p)
kernel/sched/sched.h +0 -18
@@ -1859,24 +1859,6 @@ unsigned long arch_scale_freq_capacity(int cpu) }#endif -#ifdef CONFIG_SMP -#ifndef arch_scale_cpu_capacity -static __always_inline -unsigned long arch_scale_cpu_capacity (struct sched_domain *sd,int cpu) -{ -return SCHED_CAPACITY_SCALE ; -} -#endif -#else -#ifndef arch_scale_cpu_capacity -static __always_inline -unsigned long arch_scale_cpu_capacity (void __always_unused *sd,int cpu) -{ -return SCHED_CAPACITY_SCALE ; -} -#endif -#endif -#ifdef CONFIG_SMP #ifdef CONFIG_PREEMPT
PATCH v10 2/15 sched/cpufreq: Prepare schedutil for Energy Aware Scheduling
In reply to Quentin PerretSchedutil requests frequency by aggregating utilization signals from the scheduler (CFS, RT, DL, IRQ) and applying a 25% margin on top of them. Since Energy Aware Scheduling (EAS) needs to be able to predict the frequency requests, it needs to forecast the decisions made by the governor.
In order to prepare the introduction of EAS, introduce schedutil_freq_util() to centralize the aforementioned signal aggregation and make it available to both schedutil and EAS. Since frequency selection and energy estimation still need to deal with RT and DL signals slightly differently, schedutil_freq_util() is called with a different 'type' parameter in those two contexts, and returns an aggregated utilization signal accordingly. While at it, introduce the map_util_freq() function which is designed to make schedutil's 25% margin usable easily for both sugov and EAS.
As EAS will be able to predict schedutil's frequency requests more accurately than any other governor by design, it'd be sensible to make sure EAS cannot be used without schedutil. This will be done later, once EAS has actually been introduced.
--- include/linux/sched/cpufreq.h | 6 ++++ kernel/sched/cpufreq_schedutil.c | 53 +++++++++++++++++++++++--------- kernel/sched/sched.h | 30 ++++++++++++++++++ 3 files changed, 74 insertions(+), 15 deletions(-)
include/linux/sched/cpufreq.h +6 -0
@@ -20,6 +20,12 @@ void cpufreq_add_update_util_hook(int cpu, struct update_util_data *data,void (*func)(struct update_util_data *data,u64 time, unsigned int flags));void cpufreq_remove_update_util_hook (int cpu); + +static inline unsigned long map_util_freq (unsigned long util, +unsigned long freq,unsigned long cap) +{ +return (freq + (freq >>2 )) * util / cap; +}#endif /* CONFIG_CPU_FREQ */ #endif /* _LINUX_SCHED_CPUFREQ_H */
kernel/sched/cpufreq_schedutil.c +38 -15
94 lines not on this page · raw message
kernel/sched/sched.h +30 -0
@@ -2193,6 +2193,31 @@ static inline void cpufreq_update_util(struct rq *rq, unsigned int flags) {}#endif #ifdef CONFIG_CPU_FREQ_GOV_SCHEDUTIL +/** +* enum schedutil_type - CPU utilization type +* @FREQUENCY_UTIL: Utilization used to select frequency +* @ENERGY_UTIL: Utilization used during energy calculation +* +* The utilization signals of all scheduling classes (CFS/RT/DL) and IRQ time +* need to be aggregated differently depending on the usage made of them. This +* enum is used within schedutil_freq_util() to differentiate the types of +* utilization expected by the callers, and adjust the aggregation accordingly. +*/ +enum schedutil_type { +FREQUENCY_UTIL , +ENERGY_UTIL , +}; + +unsigned long schedutil_freq_util (int cpu,unsigned long util_cfs, +unsigned long max,enum schedutil_type type); + +static inline unsigned long schedutil_energy_util (int cpu,unsigned long cfs) +{ +unsigned long max =arch_scale_cpu_capacity (NULL , cpu); + +return schedutil_freq_util (cpu, cfs, max,ENERGY_UTIL ); +} +static inline unsigned long cpu_bw_dl (struct rq *rq) {return (rq->dl.running_bw *SCHED_CAPACITY_SCALE ) >>BW_SHIFT ;
@@ -2219,6 +2244,11 @@ static inline unsigned long cpu_util_rt(struct rq *rq) {return READ_ONCE (rq->avg_rt.util_avg); } +#else /* CONFIG_CPU_FREQ_GOV_SCHEDUTIL */ +static inline unsigned long schedutil_energy_util (int cpu,unsigned long cfs) +{ +return cfs; +}#endif #ifdef CONFIG_HAVE_SCHED_AVG_IRQ
Signature · 1 line
2.19.2
Rafael J. Wysocki
maintainerRe: [PATCH v10 02/15] sched/cpufreq: Prepare schedutil for Energy Aware Scheduling
On Mon, Dec 3, 2018 at 10:56 AM Quentin Perret <[email protected]> wrote:
[cut]
Quoted 5 lines
#ifdef
CONFIG_CPU_FREQ_GOV_SCHEDUTILkernel/sched/sched.h +4
-0+/** +* enum schedutil_type - CPU utilization type +* @FREQUENCY_UTIL: Utilization used to select frequency +* @ENERGY_UTIL: Utilization used during energy calculation
kernel/sched/sched.h static inline void cpufreq_update_util(struct rq *rq, unsigned int flags) {} · line 2209
Quoted 10 lines
kernel/sched/sched.h +10
-0+* +* The utilization signals of all scheduling classes (CFS/RT/DL) and IRQ time +* need to be aggregated differently depending on the usage made of them. This +* enum is used within schedutil_freq_util() to differentiate the types of +* utilization expected by the callers, and adjust the aggregation accordingly. +*/ +enum schedutil_type { +FREQUENCY_UTIL , +ENERGY_UTIL , +};
Why not to use bool instead of this? Do you expect to have more than just two values in the future? If so, what would be the third one?
Re: [PATCH v10 02/15] sched/cpufreq: Prepare schedutil for Energy Aware Scheduling
Hi Rafael,
Quoted 14 lines · Rafael J. Wysocki
On Mon, Dec 3, 2018 at 10:56 AM Quentin Perret <[email protected]> wrote:
[cut]
Quoted 10 lines
#ifdef
CONFIG_CPU_FREQ_GOV_SCHEDUTIL
+/**
+ * enumschedutil_type- CPU utilization type
+ * @FREQUENCY_UTIL: Utilization used to select frequency
+ * @ENERGY_UTIL: Utilization used during energy calculation
+ *
+ * The utilization signals of all scheduling classes (CFS/RT/DL) and IRQ time
+ * need to be aggregated differently depending on the usage made of them. This
+ * enum is used withinschedutil_freq_util()to differentiate the types of
+ * utilization expected by the callers, and adjust the aggregation accordingly.
Quoted 8 lines
kernel/sched/sched.h static inline void cpufreq_update_util(struct rq *rq, unsigned int flags) {} · line 2209
Quoted 5 lines
+ */
kernel/sched/sched.h +4
-0+enum schedutil_type { +FREQUENCY_UTIL , +ENERGY_UTIL , +};Why not to use bool instead of this? Do you expect to have more than just two values in the future? If so, what would be the third one?
Indeed, the only reason is that an enum is easier to extend, if need be. I think you mentioned some time ago that CPUIdle could be, in principle, interested in having access to aggregated utilization signals of CPUs:
https://lore.kernel.org/lkml/CAJZ5v0j=EYnANGAj9bd44eeux1eCfeMtdn9npe5pSAzE8EVKaA@mail.gmail.com/
So yeah, I kept Peter's original enum and went for documenting the type, as you suggested on v7 :-)
Thanks,
Quentin
Re: [PATCH v10 02/15] sched/cpufreq: Prepare schedutil for Energy Aware Scheduling
Quoted 27 lines · Quentin Perret
Hi Rafael,
Quoted 14 lines · Rafael J. Wysocki
On Mon, Dec 3, 2018 at 10:56 AM Quentin Perret <[email protected]> wrote:
[cut]
Quoted 10 lines
#ifdef
CONFIG_CPU_FREQ_GOV_SCHEDUTIL
+/**
+ * enumschedutil_type- CPU utilization type
+ * @FREQUENCY_UTIL: Utilization used to select frequency
+ * @ENERGY_UTIL: Utilization used during energy calculation
+ *
+ * The utilization signals of all scheduling classes (CFS/RT/DL) and IRQ time
+ * need to be aggregated differently depending on the usage made of them. This
+ * enum is used withinschedutil_freq_util()to differentiate the types of
+ * utilization expected by the callers, and adjust the aggregation accordingly.Quoted 8 lines
kernel/sched/sched.h static inline void cpufreq_update_util(struct rq *rq, unsigned int flags) {} · line 2209
Quoted 5 lines
+ */
kernel/sched/sched.h +4
-0+enum schedutil_type { +FREQUENCY_UTIL , +ENERGY_UTIL , +};Why not to use bool instead of this? Do you expect to have more than just two values in the future? If so, what would be the third one?
Quoted 8 lines
Indeed, the only reason is that an enum is easier to extend, if need be. I think you mentioned some time ago that CPUIdle could be, in principle, interested in having access to aggregated utilization signals of CPUs:
https://lore.kernel.org/lkml/CAJZ5v0j=EYnANGAj9bd44eeux1eCfeMtdn9npe5pSAzE8EVKaA@mail.gmail.com/
So yeah, I kept Peter's original enum and went for documenting the type, as you suggested on v7 :-)
OK, so please feel free to add
to this patch.
Re: [PATCH v10 02/15] sched/cpufreq: Prepare schedutil for Energy Aware Scheduling
Quoted 34 lines · Rafael J. Wysocki
Quoted 33 lines · Quentin Perret
Hi Rafael,
Quoted 14 lines · Rafael J. Wysocki
On Mon, Dec 3, 2018 at 10:56 AM Quentin Perret <[email protected]> wrote:
[cut]
Quoted 10 lines
#ifdef
CONFIG_CPU_FREQ_GOV_SCHEDUTIL
+/**
+ * enumschedutil_type- CPU utilization type
+ * @FREQUENCY_UTIL: Utilization used to select frequency
+ * @ENERGY_UTIL: Utilization used during energy calculation
+ *
+ * The utilization signals of all scheduling classes (CFS/RT/DL) and IRQ time
+ * need to be aggregated differently depending on the usage made of them. This
+ * enum is used withinschedutil_freq_util()to differentiate the types of
+ * utilization expected by the callers, and adjust the aggregation accordingly.Quoted 8 lines
kernel/sched/sched.h static inline void cpufreq_update_util(struct rq *rq, unsigned int flags) {} · line 2209
Quoted 5 lines
+ */
kernel/sched/sched.h +4
-0+enum schedutil_type { +FREQUENCY_UTIL , +ENERGY_UTIL , +};Why not to use bool instead of this? Do you expect to have more than just two values in the future? If so, what would be the third one?
Indeed, the only reason is that an enum is easier to extend, if need be. I think you mentioned some time ago that CPUIdle could be, in principle, interested in having access to aggregated utilization signals of CPUs:
https://lore.kernel.org/lkml/CAJZ5v0j=EYnANGAj9bd44eeux1eCfeMtdn9npe5pSAzE8EVKaA@mail.gmail.com/
Quoted 8 lines
Quoted 2 lines
So yeah, I kept Peter's original enum and went for documenting the type, as you suggested on v7 :-)
OK, so please feel free to add
to this patch.
Thanks !
Quentin
tip-bot for Quentin Perret
merge bot[tip:sched/core] sched/cpufreq: Prepare schedutil for Energy Aware Scheduling
In reply to Quentin Perretsched/cpufreq: Prepare schedutil for Energy Aware Scheduling
Commit-ID: 938e5e4b0d1502a93e787985cb95b136b40717b7 Gitweb: https://git.kernel.org/tip/938e5e4b0d1502a93e787985cb95b136b40717b7 Author: Quentin Perret <[email protected]> AuthorDate: Mon, 3 Dec 2018 09:56:15 +0000 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 11 Dec 2018 15:16:58 +0100
sched/cpufreq: Prepare schedutil for Energy Aware Scheduling
Schedutil requests frequency by aggregating utilization signals from the scheduler (CFS, RT, DL, IRQ) and applying a 25% margin on top of them. Since Energy Aware Scheduling (EAS) needs to be able to predict the frequency requests, it needs to forecast the decisions made by the governor.
In order to prepare the introduction of EAS, introduce schedutil_freq_util() to centralize the aforementioned signal aggregation and make it available to both schedutil and EAS. Since frequency selection and energy estimation still need to deal with RT and DL signals slightly differently, schedutil_freq_util() is called with a different 'type' parameter in those two contexts, and returns an aggregated utilization signal accordingly. While at it, introduce the map_util_freq() function which is designed to make schedutil's 25% margin usable easily for both sugov and EAS.
As EAS will be able to predict schedutil's frequency requests more accurately than any other governor by design, it'd be sensible to make sure EAS cannot be used without schedutil. This will be done later, once EAS has actually been introduced.
--- include/linux/sched/cpufreq.h | 6 +++++ kernel/sched/cpufreq_schedutil.c | 53 ++++++++++++++++++++++++++++------------ kernel/sched/sched.h | 30 +++++++++++++++++++++++ 3 files changed, 74 insertions(+), 15 deletions(-)
include/linux/sched/cpufreq.h +6 -0
@@ -20,6 +20,12 @@ void cpufreq_add_update_util_hook(int cpu, struct update_util_data *data,void (*func)(struct update_util_data *data,u64 time, unsigned int flags));void cpufreq_remove_update_util_hook (int cpu); + +static inline unsigned long map_util_freq (unsigned long util, +unsigned long freq,unsigned long cap) +{ +return (freq + (freq >>2 )) * util / cap; +}#endif /* CONFIG_CPU_FREQ */ #endif /* _LINUX_SCHED_CPUFREQ_H */
kernel/sched/cpufreq_schedutil.c +38 -15
94 lines not on this page · raw message
kernel/sched/sched.h +30 -0
@@ -2191,6 +2191,31 @@ static inline void cpufreq_update_util(struct rq *rq, unsigned int flags) {}#endif #ifdef CONFIG_CPU_FREQ_GOV_SCHEDUTIL +/** +* enum schedutil_type - CPU utilization type +* @FREQUENCY_UTIL: Utilization used to select frequency +* @ENERGY_UTIL: Utilization used during energy calculation +* +* The utilization signals of all scheduling classes (CFS/RT/DL) and IRQ time +* need to be aggregated differently depending on the usage made of them. This +* enum is used within schedutil_freq_util() to differentiate the types of +* utilization expected by the callers, and adjust the aggregation accordingly. +*/ +enum schedutil_type { +FREQUENCY_UTIL , +ENERGY_UTIL , +}; + +unsigned long schedutil_freq_util (int cpu,unsigned long util_cfs, +unsigned long max,enum schedutil_type type); + +static inline unsigned long schedutil_energy_util (int cpu,unsigned long cfs) +{ +unsigned long max =arch_scale_cpu_capacity (NULL , cpu); + +return schedutil_freq_util (cpu, cfs, max,ENERGY_UTIL ); +} +static inline unsigned long cpu_bw_dl (struct rq *rq) {return (rq->dl.running_bw *SCHED_CAPACITY_SCALE ) >>BW_SHIFT ;
@@ -2217,6 +2242,11 @@ static inline unsigned long cpu_util_rt(struct rq *rq) {return READ_ONCE (rq->avg_rt.util_avg); } +#else /* CONFIG_CPU_FREQ_GOV_SCHEDUTIL */ +static inline unsigned long schedutil_energy_util (int cpu,unsigned long cfs) +{ +return cfs; +}#endif #ifdef CONFIG_HAVE_SCHED_AVG_IRQ
PATCH v10 3/15 PM: Introduce an Energy Model management framework
In reply to Quentin PerretSeveral subsystems in the kernel (task scheduler and/or thermal at the time of writing) can benefit from knowing about the energy consumed by CPUs. Yet, this information can come from different sources (DT or firmware for example), in different formats, hence making it hard to exploit without a standard API.
As an attempt to address this, introduce a centralized Energy Model (EM) management framework which aggregates the power values provided by drivers into a table for each performance domain in the system. The power cost tables are made available to interested clients (e.g. task scheduler or thermal) via platform-agnostic APIs. The overall design is represented by the diagram below (focused on Arm-related drivers as an example, but applicable to any architecture):
+---------------+ +-----------------+ +-------------+
| Thermal (IPA) | | Scheduler (EAS) | | Other |
+---------------+ +-----------------+ +-------------+
| | em_pd_energy() |
| | em_cpu_get() |
+-----------+ | +--------+
| | |
v v v
+---------------------+
| |
| Energy Model |
| |
| Framework |
| |
+---------------------+
^ ^ ^
| | | em_register_perf_domain()
+----------+ | +---------+
| | |
+---------------+ +---------------+ +--------------+
| cpufreq-dt | | arm_scmi | | Other |
+---------------+ +---------------+ +--------------+
^ ^ ^
| | |
+--------------+ +---------------+ +--------------+
| Device Tree | | Firmware | | ? |
+--------------+ +---------------+ +--------------+Drivers (typically, but not limited to, CPUFreq drivers) can register data in the EM framework using the em_register_perf_domain() API. The calling driver must provide a callback function with a standardized signature that will be used by the EM framework to build the power cost tables of the performance domain. This design should offer a lot of flexibility to calling drivers which are free of reading information from any location and to use any technique to compute power costs. Moreover, the capacity states registered by drivers in the EM framework are not required to match real performance states of the target. This is particularly important on targets where the performance states are not known by the OS.
The power cost coefficients managed by the EM framework are specified in milli-watts. Although the two potential users of those coefficients (IPA and EAS) only need relative correctness, IPA specifically needs to compare the power of CPUs with the power of other components (GPUs, for example), which are still expressed in absolute terms in their respective subsystems. Hence, specifying the power of CPUs in milli-watts should help transitioning IPA to using the EM framework without introducing new problems by keeping units comparable across sub-systems.
On the longer term, the EM of other devices than CPUs could also be managed by the EM framework, which would enable to remove the absolute unit. However, this is not absolutely required as a first step, so this extension of the EM framework is left for later.
On the client side, the EM framework offers APIs to access the power cost tables of a CPU (em_cpu_get()), and to estimate the energy consumed by the CPUs of a performance domain (em_pd_energy()). Clients such as the task scheduler can then use these APIs to access the shared data structures holding the Energy Model of CPUs.
--- include/linux/energy_model.h | 187 ++++++++++++++++++++++++++++++++ kernel/power/Kconfig | 15 +++ kernel/power/Makefile | 2 + kernel/power/energy_model.c | 201 +++++++++++++++++++++++++++++++++++ 4 files changed, 405 insertions(+) create mode 100644 include/linux/energy_model.h create mode 100644 kernel/power/energy_model.c
include/linux/energy_model.h new file +187 -0
@@ -0,0 +1,187 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_ENERGY_MODEL_H +#define _LINUX_ENERGY_MODEL_H +#include <linux/cpumask.h> +#include <linux/jump_label.h> +#include <linux/kobject.h> +#include <linux/rcupdate.h> +#include <linux/sched/cpufreq.h> +#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 +* @power: The power consumed by 1 CPU at this level, in milli-watts +* @cost: The cost coefficient associated with this level, used during +* energy calculation. Equal to: power * max_frequency / frequency +*/ +struct em_cap_state { +unsigned long frequency; +unsigned long power; +unsigned long cost; +}; + +/** +* em_perf_domain - Performance domain +* @table: List of capacity states, in ascending order +* @nr_cap_states: Number of capacity states +* @cpus: Cpumask covering the CPUs of the domain +* +* A "performance domain" represents a group of CPUs whose performance is +* scaled together. All CPUs of a performance domain must have the same +* micro-architecture. Performance domains often have a 1-to-1 mapping with +* CPUFreq policies. +*/ +struct em_perf_domain { +struct em_cap_state *table; +int nr_cap_states; +unsigned long cpus[0 ]; +}; + +#define EM_CPU_MAX_POWER 0xFFFF + +struct em_data_callback { +/** +* active_power() - Provide power at the next capacity state of a CPU +* @power : Active power at the capacity state in mW (modified) +* @freq : Frequency at the capacity state in kHz (modified) +* @cpu : CPU for which we do this operation +* +* active_power() must find the lowest capacity state of 'cpu' above +* 'freq' and update 'power' and 'freq' to the matching active power +* and frequency. +* +* The power is the one of a single CPU in the domain, expressed in +* milli-watts. It is expected to fit in the [0, EM_CPU_MAX_POWER] +* range. +* +* Return 0 on success. +*/ +int (*active_power)(unsigned long *power,unsigned long *freq,int cpu); +}; +#define EM_DATA_CB (_active_power_cb) { .active_power = &_active_power_cb } + +struct em_perf_domain *em_cpu_get (int cpu); +int em_register_perf_domain (cpumask_t *span,unsigned int nr_states, +struct em_data_callback *cb); + +/** +* em_pd_energy() - Estimates the energy consumed by the CPUs of a perf. domain +* @pd : performance domain for which energy has to be estimated +* @max_util : highest utilization among CPUs of the domain +* @sum_util : sum of the utilization of all CPUs in the domain +* +* Return: the sum of the energy consumed by the CPUs of the domain assuming +* a capacity state satisfying the max utilization of the domain. +*/ +static inline unsigned long em_pd_energy (struct em_perf_domain *pd, +unsigned long max_util,unsigned long sum_util) +{ +unsigned long freq, scale_cpu; +struct em_cap_state *cs; +int i, cpu; + +/* +* In order to predict the capacity state, map the utilization of the +* most utilized CPU of the performance domain to a requested frequency, +* like schedutil. +*/ + cpu =cpumask_first (to_cpumask (pd->cpus)); + scale_cpu =arch_scale_cpu_capacity (NULL , cpu); + cs = &pd->table[pd->nr_cap_states -1 ]; + freq =map_util_freq (max_util, cs->frequency, scale_cpu); + +/* +* Find the lowest capacity state of the Energy Model above the +* requested frequency. +*/ +for (i =0 ; i < pd->nr_cap_states; i++) { + cs = &pd->table[i]; +if (cs->frequency >= freq) +break ; + } + +/* +* The capacity of a CPU in the domain at that capacity state (cs) +* can be computed as: +* +* cs->freq * scale_cpu +* cs->cap = -------------------- (1) +* cpu_max_freq +* +* So, ignoring the costs of idle states (which are not available in +* the EM), the energy consumed by this CPU at that capacity state is +* estimated as: +* +* cs->power * cpu_util +* cpu_nrg = -------------------- (2) +* cs->cap +* +* since 'cpu_util / cs->cap' represents its percentage of busy time. +* +* NOTE: Although the result of this computation actually is in +* units of power, it can be manipulated as an energy value +* over a scheduling period, since it is assumed to be +* constant during that interval. +* +* By injecting (1) in (2), 'cpu_nrg' can be re-expressed as a product +* of two terms: +* +* cs->power * cpu_max_freq cpu_util +* cpu_nrg = ------------------------ * --------- (3) +* cs->freq scale_cpu +* +* The first term is static, and is stored in the em_cap_state struct +* as 'cs->cost'. +* +* Since all CPUs of the domain have the same micro-architecture, they +* share the same 'cs->cost', and the same CPU capacity. Hence, the +* total energy of the domain (which is the simple sum of the energy of +* all of its CPUs) can be factorized as: +* +* cs->cost * \Sum cpu_util +* pd_nrg = ------------------------ (4) +* scale_cpu +*/ +return cs->cost * sum_util / scale_cpu; +} + +/** +* em_pd_nr_cap_states() - Get the number of capacity states of a perf. domain +* @pd : performance domain for which this must be done +* +* Return: the number of capacity states in the performance domain table +*/ +static inline int em_pd_nr_cap_states (struct em_perf_domain *pd) +{ +return pd->nr_cap_states; +} + +#else +struct em_perf_domain {}; +struct em_data_callback {}; +#define EM_DATA_CB (_active_power_cb) { } + +static inline int em_register_perf_domain (cpumask_t *span, +unsigned int nr_states,struct em_data_callback *cb) +{ +return -EINVAL ; +} +static inline struct em_perf_domain *em_cpu_get (int cpu) +{ +return NULL ; +} +static inline unsigned long em_pd_energy (struct em_perf_domain *pd, +unsigned long max_util,unsigned long sum_util) +{ +return 0 ; +} +static inline int em_pd_nr_cap_states (struct em_perf_domain *pd) +{ +return 0 ; +} +#endif + +#endif
kernel/power/Kconfig +15 -0
@@ -298,3 +298,18 @@ config PM_GENERIC_DOMAINS_OF config CPU_PM bool + +config ENERGY_MODEL + bool "Energy Model for CPUs" + depends on SMP + depends on CPU_FREQ + default n + help + Several subsystems (thermal and/or the task scheduler for example) + can leverage information about the energy consumed by CPUs to make + smarter decisions. This config option enables the framework from + which subsystems can access the energy models. + + The exact usage of the energy model is subsystem-dependent. + + If in doubt, say N.
kernel/power/Makefile +2 -0
@@ -15,3 +15,5 @@ obj-$(CONFIG_PM_AUTOSLEEP) += autosleep.o obj-$(CONFIG_PM_WAKELOCKS) += wakelock.o obj-$(CONFIG_MAGIC_SYSRQ) += poweroff.o + +obj-$(CONFIG_ENERGY_MODEL) += energy_model.o
kernel/power/energy_model.c new file +201 -0
201 lines not on this page · raw message
Signature · 1 line
2.19.2
tip-bot for Quentin Perret
merge bot[tip:sched/core] PM: Introduce an Energy Model management framework
PM: Introduce an Energy Model management framework
Commit-ID: 27871f7a8a341ef5c636a337856369acf8013e4e Gitweb: https://git.kernel.org/tip/27871f7a8a341ef5c636a337856369acf8013e4e Author: Quentin Perret <[email protected]> AuthorDate: Mon, 3 Dec 2018 09:56:16 +0000 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 11 Dec 2018 15:16:58 +0100
PM: Introduce an Energy Model management framework
Several subsystems in the kernel (task scheduler and/or thermal at the time of writing) can benefit from knowing about the energy consumed by CPUs. Yet, this information can come from different sources (DT or firmware for example), in different formats, hence making it hard to exploit without a standard API.
As an attempt to address this, introduce a centralized Energy Model (EM) management framework which aggregates the power values provided by drivers into a table for each performance domain in the system. The power cost tables are made available to interested clients (e.g. task scheduler or thermal) via platform-agnostic APIs. The overall design is represented by the diagram below (focused on Arm-related drivers as an example, but applicable to any architecture):
+---------------+ +-----------------+ +-------------+
| Thermal (IPA) | | Scheduler (EAS) | | Other |
+---------------+ +-----------------+ +-------------+
| | em_pd_energy() |
| | em_cpu_get() |
+-----------+ | +--------+
| | |
v v v
+---------------------+
| |
| Energy Model |
| |
| Framework |
| |
+---------------------+
^ ^ ^
| | | em_register_perf_domain()
+----------+ | +---------+
| | |
+---------------+ +---------------+ +--------------+
| cpufreq-dt | | arm_scmi | | Other |
+---------------+ +---------------+ +--------------+
^ ^ ^
| | |
+--------------+ +---------------+ +--------------+
| Device Tree | | Firmware | | ? |
+--------------+ +---------------+ +--------------+Drivers (typically, but not limited to, CPUFreq drivers) can register data in the EM framework using the em_register_perf_domain() API. The calling driver must provide a callback function with a standardized signature that will be used by the EM framework to build the power cost tables of the performance domain. This design should offer a lot of flexibility to calling drivers which are free of reading information from any location and to use any technique to compute power costs. Moreover, the capacity states registered by drivers in the EM framework are not required to match real performance states of the target. This is particularly important on targets where the performance states are not known by the OS.
The power cost coefficients managed by the EM framework are specified in milli-watts. Although the two potential users of those coefficients (IPA and EAS) only need relative correctness, IPA specifically needs to compare the power of CPUs with the power of other components (GPUs, for example), which are still expressed in absolute terms in their respective subsystems. Hence, specifying the power of CPUs in milli-watts should help transitioning IPA to using the EM framework without introducing new problems by keeping units comparable across sub-systems.
On the longer term, the EM of other devices than CPUs could also be managed by the EM framework, which would enable to remove the absolute unit. However, this is not absolutely required as a first step, so this extension of the EM framework is left for later.
On the client side, the EM framework offers APIs to access the power cost tables of a CPU (em_cpu_get()), and to estimate the energy consumed by the CPUs of a performance domain (em_pd_energy()). Clients such as the task scheduler can then use these APIs to access the shared data structures holding the Energy Model of CPUs.
--- include/linux/energy_model.h | 187 ++++++++++++++++++++++++++++++++++++++++ kernel/power/Kconfig | 15 ++++ kernel/power/Makefile | 2 + kernel/power/energy_model.c | 201 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 405 insertions(+)
include/linux/energy_model.h new file +187 -0
@@ -0,0 +1,187 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_ENERGY_MODEL_H +#define _LINUX_ENERGY_MODEL_H +#include <linux/cpumask.h> +#include <linux/jump_label.h> +#include <linux/kobject.h> +#include <linux/rcupdate.h> +#include <linux/sched/cpufreq.h> +#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 +* @power: The power consumed by 1 CPU at this level, in milli-watts +* @cost: The cost coefficient associated with this level, used during +* energy calculation. Equal to: power * max_frequency / frequency +*/ +struct em_cap_state { +unsigned long frequency; +unsigned long power; +unsigned long cost; +}; + +/** +* em_perf_domain - Performance domain +* @table: List of capacity states, in ascending order +* @nr_cap_states: Number of capacity states +* @cpus: Cpumask covering the CPUs of the domain +* +* A "performance domain" represents a group of CPUs whose performance is +* scaled together. All CPUs of a performance domain must have the same +* micro-architecture. Performance domains often have a 1-to-1 mapping with +* CPUFreq policies. +*/ +struct em_perf_domain { +struct em_cap_state *table; +int nr_cap_states; +unsigned long cpus[0 ]; +}; + +#define EM_CPU_MAX_POWER 0xFFFF + +struct em_data_callback { +/** +* active_power() - Provide power at the next capacity state of a CPU +* @power : Active power at the capacity state in mW (modified) +* @freq : Frequency at the capacity state in kHz (modified) +* @cpu : CPU for which we do this operation +* +* active_power() must find the lowest capacity state of 'cpu' above +* 'freq' and update 'power' and 'freq' to the matching active power +* and frequency. +* +* The power is the one of a single CPU in the domain, expressed in +* milli-watts. It is expected to fit in the [0, EM_CPU_MAX_POWER] +* range. +* +* Return 0 on success. +*/ +int (*active_power)(unsigned long *power,unsigned long *freq,int cpu); +}; +#define EM_DATA_CB (_active_power_cb) { .active_power = &_active_power_cb } + +struct em_perf_domain *em_cpu_get (int cpu); +int em_register_perf_domain (cpumask_t *span,unsigned int nr_states, +struct em_data_callback *cb); + +/** +* em_pd_energy() - Estimates the energy consumed by the CPUs of a perf. domain +* @pd : performance domain for which energy has to be estimated +* @max_util : highest utilization among CPUs of the domain +* @sum_util : sum of the utilization of all CPUs in the domain +* +* Return: the sum of the energy consumed by the CPUs of the domain assuming +* a capacity state satisfying the max utilization of the domain. +*/ +static inline unsigned long em_pd_energy (struct em_perf_domain *pd, +unsigned long max_util,unsigned long sum_util) +{ +unsigned long freq, scale_cpu; +struct em_cap_state *cs; +int i, cpu; + +/* +* In order to predict the capacity state, map the utilization of the +* most utilized CPU of the performance domain to a requested frequency, +* like schedutil. +*/ + cpu =cpumask_first (to_cpumask (pd->cpus)); + scale_cpu =arch_scale_cpu_capacity (NULL , cpu); + cs = &pd->table[pd->nr_cap_states -1 ]; + freq =map_util_freq (max_util, cs->frequency, scale_cpu); + +/* +* Find the lowest capacity state of the Energy Model above the +* requested frequency. +*/ +for (i =0 ; i < pd->nr_cap_states; i++) { + cs = &pd->table[i]; +if (cs->frequency >= freq) +break ; + } + +/* +* The capacity of a CPU in the domain at that capacity state (cs) +* can be computed as: +* +* cs->freq * scale_cpu +* cs->cap = -------------------- (1) +* cpu_max_freq +* +* So, ignoring the costs of idle states (which are not available in +* the EM), the energy consumed by this CPU at that capacity state is +* estimated as: +* +* cs->power * cpu_util +* cpu_nrg = -------------------- (2) +* cs->cap +* +* since 'cpu_util / cs->cap' represents its percentage of busy time. +* +* NOTE: Although the result of this computation actually is in +* units of power, it can be manipulated as an energy value +* over a scheduling period, since it is assumed to be +* constant during that interval. +* +* By injecting (1) in (2), 'cpu_nrg' can be re-expressed as a product +* of two terms: +* +* cs->power * cpu_max_freq cpu_util +* cpu_nrg = ------------------------ * --------- (3) +* cs->freq scale_cpu +* +* The first term is static, and is stored in the em_cap_state struct +* as 'cs->cost'. +* +* Since all CPUs of the domain have the same micro-architecture, they +* share the same 'cs->cost', and the same CPU capacity. Hence, the +* total energy of the domain (which is the simple sum of the energy of +* all of its CPUs) can be factorized as: +* +* cs->cost * \Sum cpu_util +* pd_nrg = ------------------------ (4) +* scale_cpu +*/ +return cs->cost * sum_util / scale_cpu; +} + +/** +* em_pd_nr_cap_states() - Get the number of capacity states of a perf. domain +* @pd : performance domain for which this must be done +* +* Return: the number of capacity states in the performance domain table +*/ +static inline int em_pd_nr_cap_states (struct em_perf_domain *pd) +{ +return pd->nr_cap_states; +} + +#else +struct em_perf_domain {}; +struct em_data_callback {}; +#define EM_DATA_CB (_active_power_cb) { } + +static inline int em_register_perf_domain (cpumask_t *span, +unsigned int nr_states,struct em_data_callback *cb) +{ +return -EINVAL ; +} +static inline struct em_perf_domain *em_cpu_get (int cpu) +{ +return NULL ; +} +static inline unsigned long em_pd_energy (struct em_perf_domain *pd, +unsigned long max_util,unsigned long sum_util) +{ +return 0 ; +} +static inline int em_pd_nr_cap_states (struct em_perf_domain *pd) +{ +return 0 ; +} +#endif + +#endif
kernel/power/Kconfig +15 -0
@@ -298,3 +298,18 @@ config PM_GENERIC_DOMAINS_OF config CPU_PM bool + +config ENERGY_MODEL + bool "Energy Model for CPUs" + depends on SMP + depends on CPU_FREQ + default n + help + Several subsystems (thermal and/or the task scheduler for example) + can leverage information about the energy consumed by CPUs to make + smarter decisions. This config option enables the framework from + which subsystems can access the energy models. + + The exact usage of the energy model is subsystem-dependent. + + If in doubt, say N.
kernel/power/Makefile +2 -0
@@ -15,3 +15,5 @@ obj-$(CONFIG_PM_AUTOSLEEP) += autosleep.o obj-$(CONFIG_PM_WAKELOCKS) += wakelock.o obj-$(CONFIG_MAGIC_SYSRQ) += poweroff.o + +obj-$(CONFIG_ENERGY_MODEL) += energy_model.o
kernel/power/energy_model.c new file +201 -0
201 lines not on this page · raw message
PATCH v10 4/15 PM / EM: Expose the Energy Model in sysfs
In reply to Quentin PerretExpose the Energy Model (read-only) of all performance domains in sysfs for convenience. To do so, add a kobject to the CPU subsystem under the umbrella of which a kobject for each performance domain is attached.
The resulting hierarchy is as follows for a platform with two performance domains for example:
/sys/devices/system/cpu/energy_model
├── pd0
│ ├── cost
│ ├── cpus
│ ├── frequency
│ └── power
└── pd4
├── cost
├── cpus
├── frequency
└── powerIn this implementation, the kobject abstraction is only used as a convenient way of exposing data to sysfs. However, it could also be used in the future to allocate and release performance domains in a more dynamic way using reference counting.
--- include/linux/energy_model.h | 2 + kernel/power/energy_model.c | 90 ++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+)
include/linux/energy_model.h +2 -0
@@ -27,6 +27,7 @@ struct em_cap_state {* em_perf_domain - Performance domain * @table: List of capacity states, in ascending order * @nr_cap_states: Number of capacity states +* @kobj: Kobject used to expose the domain in sysfs * @cpus: Cpumask covering the CPUs of the domain * * A "performance domain" represents a group of CPUs whose performance is
@@ -37,6 +38,7 @@ struct em_cap_state {struct em_perf_domain {struct em_cap_state *table;int nr_cap_states; +struct kobject kobj;unsigned long cpus[0 ]; };
kernel/power/energy_model.c +90 -0
108 lines not on this page · raw message
Signature · 1 line
2.19.2
Re: [PATCH v10 04/15] PM / EM: Expose the Energy Model in sysfs
Quoted 24 lines · Quentin Perret
Expose the Energy Model (read-only) of all performance domains in sysfs for convenience. To do so, add a kobject to the CPU subsystem under the umbrella of which a kobject for each performance domain is attached.
The resulting hierarchy is as follows for a platform with two performance domains for example:
/sys/devices/system/cpu/energy_model├── pd0 │ ├── cost │ ├── cpus │ ├── frequency │ └── power └── pd4 ├── cost ├── cpus ├── frequency └── powerIn this implementation, the kobject abstraction is only used as a convenient way of exposing data to sysfs. However, it could also be used in the future to allocate and release performance domains in a more dynamic way using reference counting.
Quoted 7 lines
Cc Peter Zijlstra <[email protected]>Cc "Rafael J. Wysocki" <[email protected]>Signed-off-by Quentin Perret <[email protected]>--- include/linux/energy_model.h | 2 + kernel/power/energy_model.c | 90 ++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+)
Why is a read-only ABI added for 'convenience'? We really don't do that as ABIs are final and they come with responsibilities.
I think if this is for debug purposes it should be declared and put into debugfs or so.
If it's for some other purpose that purpose should be declared.
Thanks,
Ingo
Re: [PATCH v10 04/15] PM / EM: Expose the Energy Model in sysfs
Quoted 35 lines · Ingo Molnar
Quoted 24 lines · Quentin Perret
Expose the Energy Model (read-only) of all performance domains in sysfs for convenience. To do so, add a kobject to the CPU subsystem under the umbrella of which a kobject for each performance domain is attached.
The resulting hierarchy is as follows for a platform with two performance domains for example:
/sys/devices/system/cpu/energy_model├── pd0 │ ├── cost │ ├── cpus │ ├── frequency │ └── power └── pd4 ├── cost ├── cpus ├── frequency └── powerIn this implementation, the kobject abstraction is only used as a convenient way of exposing data to sysfs. However, it could also be used in the future to allocate and release performance domains in a more dynamic way using reference counting.
Quoted 7 lines
Cc Peter Zijlstra <[email protected]>Cc "Rafael J. Wysocki" <[email protected]>Signed-off-by Quentin Perret <[email protected]>--- include/linux/energy_model.h | 2 + kernel/power/energy_model.c | 90 ++++++++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+)
Quoted 7 lines
Why is a read-only ABI added for 'convenience'? We really don't do that as ABIs are final and they come with responsibilities.
I think if this is for debug purposes it should be declared and put into debugfs or so.
If it's for some other purpose that purpose should be declared.
This is basically supposed to look like the CPUFreq policy entries. You can get things like this for CPUFreq:
$ cat /sys/devices/system/cpu/cpufreq/policy1/scaling_available_frequencies 450000 625000 800000 950000 1100000
And things like this for the EM:
$ cat /sys/devices/system/cpu/energy_model/pd1/power 160 239 343 454 583
In general, I expect these two interfaces to be used for similar purposes. Now, whether or not they should be exposed in debugfs is a good question. I went for sysfs for consistency with CPUFreq, but I'm not opposed to a change in this area for the EM if you feel it's preferable.
Also, I'm happy to just drop this patch for now and to begin by not exposing the EM at all. It's easier to expose it later than to remove it once userspace tools depend on it.
Thanks,
Quentin
PATCH v10 5/15 sched/topology: Reference the Energy Model of CPUs when available
In reply to Quentin PerretThe existing scheduling domain hierarchy is defined to map to the cache topology of the system. However, Energy Aware Scheduling (EAS) requires more knowledge about the platform, and specifically needs to know about the span of Performance Domains (PD), which do not always align with caches.
To address this issue, use the Energy Model (EM) of the system to extend the scheduler topology code with a representation of the PDs, alongside the scheduling domains. More specifically, a linked list of PDs is attached to each root domain. When multiple root domains are in use, each list contains only the PDs covering the CPUs of its root domain. If a PD spans over CPUs of multiple different root domains, it will be duplicated in all lists.
The lists are fully maintained by the scheduler from partition_sched_domains() in order to cope with hotplug and cpuset changes. As for scheduling domains, the list are protected by RCU to ensure safe concurrent updates.
--- kernel/sched/sched.h | 21 +++++++ kernel/sched/topology.c | 134 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 151 insertions(+), 4 deletions(-)
kernel/sched/sched.h +21 -0
@@ -44,6 +44,7 @@#include <linux/ctype.h> #include <linux/debugfs.h> #include <linux/delayacct.h> +#include <linux/energy_model.h> #include <linux/init_task.h> #include <linux/kprobes.h> #include <linux/kthread.h>
@@ -708,6 +709,12 @@ static inline bool sched_asym_prefer(int a, int b)return arch_asym_cpu_priority (a) >arch_asym_cpu_priority (b); } +struct perf_domain { +struct em_perf_domain *em_pd; +struct perf_domain *next; +struct rcu_head rcu; +}; +/* * We add the notion of a root-domain which will be used to define per-domain * variables. Each exclusive cpuset essentially defines an island domain by
@@ -760,6 +767,12 @@ struct root_domain {struct cpupri cpupri;unsigned long max_cpu_capacity; + +/* +* NULL-terminated list of performance domains intersecting with the +* CPUs of the rd. Protected by RCU. +*/ +struct perf_domain *pd; };extern struct root_domain def_root_domain;
@@ -2278,3 +2291,11 @@ unsigned long scale_irq_capacity(unsigned long util, unsigned long irq, unsigned return util; }#endif + +#ifdef CONFIG_SMP +#ifdef CONFIG_ENERGY_MODEL +#define perf_domain_span (pd) (to_cpumask(((pd)->em_pd->cpus))) +#else +#define perf_domain_span (pd) NULL +#endif +#endif
kernel/sched/topology.c +130 -4
164 lines not on this page · raw message
Signature · 1 line
2.19.2
tip-bot for Quentin Perret
merge bot[tip:sched/core] sched/topology: Reference the Energy Model of CPUs when available
sched/topology: Reference the Energy Model of CPUs when available
Commit-ID: 6aa140fa4508933a6ac6717d65a403eb904d6c02 Gitweb: https://git.kernel.org/tip/6aa140fa4508933a6ac6717d65a403eb904d6c02 Author: Quentin Perret <[email protected]> AuthorDate: Mon, 3 Dec 2018 09:56:18 +0000 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 11 Dec 2018 15:16:59 +0100
sched/topology: Reference the Energy Model of CPUs when available
The existing scheduling domain hierarchy is defined to map to the cache topology of the system. However, Energy Aware Scheduling (EAS) requires more knowledge about the platform, and specifically needs to know about the span of Performance Domains (PD), which do not always align with caches.
To address this issue, use the Energy Model (EM) of the system to extend the scheduler topology code with a representation of the PDs, alongside the scheduling domains. More specifically, a linked list of PDs is attached to each root domain. When multiple root domains are in use, each list contains only the PDs covering the CPUs of its root domain. If a PD spans over CPUs of multiple different root domains, it will be duplicated in all lists.
The lists are fully maintained by the scheduler from partition_sched_domains() in order to cope with hotplug and cpuset changes. As for scheduling domains, the list are protected by RCU to ensure safe concurrent updates.
--- kernel/sched/sched.h | 21 ++++++++ kernel/sched/topology.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 151 insertions(+), 4 deletions(-)
kernel/sched/sched.h +21 -0
@@ -45,6 +45,7 @@#include <linux/ctype.h> #include <linux/debugfs.h> #include <linux/delayacct.h> +#include <linux/energy_model.h> #include <linux/init_task.h> #include <linux/kprobes.h> #include <linux/kthread.h>
@@ -709,6 +710,12 @@ static inline bool sched_asym_prefer(int a, int b)return arch_asym_cpu_priority (a) >arch_asym_cpu_priority (b); } +struct perf_domain { +struct em_perf_domain *em_pd; +struct perf_domain *next; +struct rcu_head rcu; +}; +/* * We add the notion of a root-domain which will be used to define per-domain * variables. Each exclusive cpuset essentially defines an island domain by
@@ -761,6 +768,12 @@ struct root_domain {struct cpupri cpupri;unsigned long max_cpu_capacity; + +/* +* NULL-terminated list of performance domains intersecting with the +* CPUs of the rd. Protected by RCU. +*/ +struct perf_domain *pd; };extern struct root_domain def_root_domain;
@@ -2276,3 +2289,11 @@ unsigned long scale_irq_capacity(unsigned long util, unsigned long irq, unsigned return util; }#endif + +#ifdef CONFIG_SMP +#ifdef CONFIG_ENERGY_MODEL +#define perf_domain_span (pd) (to_cpumask(((pd)->em_pd->cpus))) +#else +#define perf_domain_span (pd) NULL +#endif +#endif
kernel/sched/topology.c +130 -4
164 lines not on this page · raw message
PATCH v10 6/15 sched/topology: Lowest CPU asymmetry sched_domain level pointer
In reply to Quentin PerretAdd another member to the family of per-cpu sched_domain shortcut pointers. This one, sd_asym_cpucapacity, points to the lowest level at which the SD_ASYM_CPUCAPACITY flag is set. While at it, rename the sd_asym shortcut to sd_asym_packing to avoid confusions.
Generally speaking, the largest opportunity to save energy via scheduling comes from a smarter exploitation of heterogeneous platforms (i.e. big.LITTLE). Consequently, the sd_asym_cpucapacity shortcut will be used at first as the lowest domain where Energy-Aware Scheduling (EAS) should be applied. For example, it is possible to apply EAS within a socket on a multi-socket system, as long as each socket has an asymmetric topology. Energy-aware cross-sockets wake-up balancing will only happen when the system is over-utilized, or this_cpu and prev_cpu are in different sockets.
--- kernel/sched/fair.c | 2 +- kernel/sched/sched.h | 3 ++- kernel/sched/topology.c | 8 ++++++-- 3 files changed, 9 insertions(+), 4 deletions(-)
kernel/sched/fair.c +1 -1
@@ -9299,7 +9299,7 @@ static void nohz_balancer_kick(struct rq *rq) } } - sd =rcu_dereference (per_cpu (sd_asym, cpu)); + sd =rcu_dereference (per_cpu (sd_asym_packing, cpu));if (sd) {for_each_cpu (i,sched_domain_span (sd)) { if (i == cpu ||
kernel/sched/sched.h +2 -1
@@ -1305,7 +1305,8 @@ DECLARE_PER_CPU(int, sd_llc_size);DECLARE_PER_CPU (int, sd_llc_id); DECLARE_PER_CPU(struct sched_domain_shared *, sd_llc_shared); DECLARE_PER_CPU(struct sched_domain *, sd_numa); -DECLARE_PER_CPU(struct sched_domain *, sd_asym); +DECLARE_PER_CPU(struct sched_domain *, sd_asym_packing); +DECLARE_PER_CPU(struct sched_domain *, sd_asym_cpucapacity);extern struct static_key_false sched_asym_cpucapacity;struct sched_group_capacity {
kernel/sched/topology.c +6 -2
@@ -508,7 +508,8 @@ DEFINE_PER_CPU(int, sd_llc_size);DEFINE_PER_CPU (int, sd_llc_id); DEFINE_PER_CPU(struct sched_domain_shared *, sd_llc_shared); DEFINE_PER_CPU(struct sched_domain *, sd_numa); -DEFINE_PER_CPU(struct sched_domain *, sd_asym); +DEFINE_PER_CPU(struct sched_domain *, sd_asym_packing); +DEFINE_PER_CPU(struct sched_domain *, sd_asym_cpucapacity);DEFINE_STATIC_KEY_FALSE (sched_asym_cpucapacity);static void update_top_cache_domain (int cpu)
@@ -534,7 +535,10 @@ static void update_top_cache_domain(int cpu)rcu_assign_pointer (per_cpu (sd_numa, cpu), sd); sd =highest_flag_domain (cpu,SD_ASYM_PACKING ); -rcu_assign_pointer (per_cpu (sd_asym, cpu), sd); +rcu_assign_pointer (per_cpu (sd_asym_packing, cpu), sd); + + sd =lowest_flag_domain (cpu,SD_ASYM_CPUCAPACITY ); +rcu_assign_pointer (per_cpu (sd_asym_cpucapacity, cpu), sd); }/*
Signature · 1 line
2.19.2
tip-bot for Quentin Perret
merge bot[tip:sched/core] sched/topology: Add lowest CPU asymmetry sched_domain level pointer
sched/topology: Add lowest CPU asymmetry sched_domain level pointer
Commit-ID: 011b27bb5d3139e8b5fe9ceff1fc7f6dc3145071 Gitweb: https://git.kernel.org/tip/011b27bb5d3139e8b5fe9ceff1fc7f6dc3145071 Author: Quentin Perret <[email protected]> AuthorDate: Mon, 3 Dec 2018 09:56:19 +0000 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 11 Dec 2018 15:16:59 +0100
sched/topology: Add lowest CPU asymmetry sched_domain level pointer
Add another member to the family of per-cpu sched_domain shortcut pointers. This one, sd_asym_cpucapacity, points to the lowest level at which the SD_ASYM_CPUCAPACITY flag is set. While at it, rename the sd_asym shortcut to sd_asym_packing to avoid confusions.
Generally speaking, the largest opportunity to save energy via scheduling comes from a smarter exploitation of heterogeneous platforms (i.e. big.LITTLE). Consequently, the sd_asym_cpucapacity shortcut will be used at first as the lowest domain where Energy-Aware Scheduling (EAS) should be applied. For example, it is possible to apply EAS within a socket on a multi-socket system, as long as each socket has an asymmetric topology. Energy-aware cross-sockets wake-up balancing will only happen when the system is over-utilized, or this_cpu and prev_cpu are in different sockets.
--- kernel/sched/fair.c | 2 +- kernel/sched/sched.h | 3 ++- kernel/sched/topology.c | 8 ++++++-- 3 files changed, 9 insertions(+), 4 deletions(-)
kernel/sched/fair.c +1 -1
@@ -9299,7 +9299,7 @@ static void nohz_balancer_kick(struct rq *rq) } } - sd =rcu_dereference (per_cpu (sd_asym, cpu)); + sd =rcu_dereference (per_cpu (sd_asym_packing, cpu));if (sd) {for_each_cpu (i,sched_domain_span (sd)) { if (i == cpu ||
kernel/sched/sched.h +2 -1
@@ -1303,7 +1303,8 @@ DECLARE_PER_CPU(int, sd_llc_size);DECLARE_PER_CPU (int, sd_llc_id); DECLARE_PER_CPU(struct sched_domain_shared *, sd_llc_shared); DECLARE_PER_CPU(struct sched_domain *, sd_numa); -DECLARE_PER_CPU(struct sched_domain *, sd_asym); +DECLARE_PER_CPU(struct sched_domain *, sd_asym_packing); +DECLARE_PER_CPU(struct sched_domain *, sd_asym_cpucapacity);extern struct static_key_false sched_asym_cpucapacity;struct sched_group_capacity {
kernel/sched/topology.c +6 -2
@@ -508,7 +508,8 @@ DEFINE_PER_CPU(int, sd_llc_size);DEFINE_PER_CPU (int, sd_llc_id); DEFINE_PER_CPU(struct sched_domain_shared *, sd_llc_shared); DEFINE_PER_CPU(struct sched_domain *, sd_numa); -DEFINE_PER_CPU(struct sched_domain *, sd_asym); +DEFINE_PER_CPU(struct sched_domain *, sd_asym_packing); +DEFINE_PER_CPU(struct sched_domain *, sd_asym_cpucapacity);DEFINE_STATIC_KEY_FALSE (sched_asym_cpucapacity);static void update_top_cache_domain (int cpu)
@@ -534,7 +535,10 @@ static void update_top_cache_domain(int cpu)rcu_assign_pointer (per_cpu (sd_numa, cpu), sd); sd =highest_flag_domain (cpu,SD_ASYM_PACKING ); -rcu_assign_pointer (per_cpu (sd_asym, cpu), sd); +rcu_assign_pointer (per_cpu (sd_asym_packing, cpu), sd); + + sd =lowest_flag_domain (cpu,SD_ASYM_CPUCAPACITY ); +rcu_assign_pointer (per_cpu (sd_asym_cpucapacity, cpu), sd); }/*
PATCH v10 7/15 sched/topology: Disable EAS on inappropriate platforms
In reply to Quentin PerretEnergy Aware Scheduling (EAS) in its current form is most relevant on platforms with asymmetric CPU topologies (e.g. Arm big.LITTLE) since this is where there is a lot of potential for saving energy through scheduling. This is particularly true since the Energy Model only includes the active power costs of CPUs, hence not providing enough data to compare packing-vs-spreading strategies.
As such, disable EAS on root domains where the SD_ASYM_CPUCAPACITY flag is not set. While at it, disable EAS on systems where the complexity of the Energy Model is too high since that could lead to unacceptable scheduling overhead.
All in all, EAS can be used on a root domain if and only if:
1. an Energy Model is available;
2. the root domain has an asymmetric CPU capacity topology;
3. the complexity of the root domain's EM is low enough to keep scheduling overheads low.
--- kernel/sched/topology.c | 49 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-)
kernel/sched/topology.c +48 -1
@@ -270,12 +270,45 @@ static void destroy_perf_domain_rcu(struct rcu_head *rp)free_pd (pd); } +/* +* EAS can be used on a root domain if it meets all the following conditions: +* 1. an Energy Model (EM) is available; +* 2. the SD_ASYM_CPUCAPACITY flag is set in the sched_domain hierarchy. +* 3. the EM complexity is low enough to keep scheduling overheads low; +* +* The complexity of the Energy Model is defined as: +* +* C = nr_pd * (nr_cpus + nr_cs) +* +* with parameters defined as: +* - nr_pd: the number of performance domains +* - nr_cpus: the number of CPUs +* - nr_cs: the sum of the number of capacity states of all performance +* domains (for example, on a system with 2 performance domains, +* with 10 capacity states each, nr_cs = 2 * 10 = 20). +* +* It is generally not a good idea to use such a model in the wake-up path on +* very complex platforms because of the associated scheduling overheads. The +* arbitrary constraint below prevents that. It makes EAS usable up to 16 CPUs +* with per-CPU DVFS and less than 8 capacity states each, for example. +*/ +#define EM_MAX_COMPLEXITY 2048 +static void build_perf_domains (const struct cpumask *cpu_map) { +int i, nr_pd =0 , nr_cs =0 , nr_cpus =cpumask_weight (cpu_map);struct perf_domain *pd =NULL , *tmp;int cpu =cpumask_first (cpu_map);struct root_domain *rd =cpu_rq (cpu)->rd; -int i; + +/* EAS is enabled for asymmetric CPU capacity topologies. */ +if (!per_cpu (sd_asym_cpucapacity, cpu)) { +if (sched_debug ()) { +pr_info ("rd %*pbl: CPUs do not have asymmetric capacities\n" , +cpumask_pr_args (cpu_map)); + } + goto free; + }for_each_cpu (i, cpu_map) {/* Skip already covered CPUs. */
@@ -288,6 +321,20 @@ static void build_perf_domains(const struct cpumask *cpu_map) goto free; tmp->next = pd; pd = tmp; + +/* +* Count performance domains and capacity states for the +* complexity check. +*/ + nr_pd++; + nr_cs +=em_pd_nr_cap_states (pd->em_pd); + } + +/* Bail out if the Energy Model complexity is too high. */ +if (nr_pd * (nr_cs + nr_cpus) >EM_MAX_COMPLEXITY ) { +WARN (1 ,"rd %*pbl: Failed to start EAS, EM complexity is too high\n" , +cpumask_pr_args (cpu_map)); + goto free; }perf_domain_debug (cpu_map, pd);
Signature · 1 line
2.19.2
tip-bot for Quentin Perret
merge bot[tip:sched/core] sched/topology: Disable EAS on inappropriate platforms
sched/topology: Disable EAS on inappropriate platforms
Commit-ID: b68a4c0dba3b1e1dda1ede49f3c2fc72d3b54567 Gitweb: https://git.kernel.org/tip/b68a4c0dba3b1e1dda1ede49f3c2fc72d3b54567 Author: Quentin Perret <[email protected]> AuthorDate: Mon, 3 Dec 2018 09:56:20 +0000 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 11 Dec 2018 15:17:00 +0100
sched/topology: Disable EAS on inappropriate platforms
Energy Aware Scheduling (EAS) in its current form is most relevant on platforms with asymmetric CPU topologies (e.g. Arm big.LITTLE) since this is where there is a lot of potential for saving energy through scheduling. This is particularly true since the Energy Model only includes the active power costs of CPUs, hence not providing enough data to compare packing-vs-spreading strategies.
As such, disable EAS on root domains where the SD_ASYM_CPUCAPACITY flag is not set. While at it, disable EAS on systems where the complexity of the Energy Model is too high since that could lead to unacceptable scheduling overhead.
All in all, EAS can be used on a root domain if and only if:
1. an Energy Model is available;
2. the root domain has an asymmetric CPU capacity topology;
3. the complexity of the root domain's EM is low enough to keep scheduling overheads low.
--- kernel/sched/topology.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-)
kernel/sched/topology.c +48 -1
@@ -270,12 +270,45 @@ static void destroy_perf_domain_rcu(struct rcu_head *rp)free_pd (pd); } +/* +* EAS can be used on a root domain if it meets all the following conditions: +* 1. an Energy Model (EM) is available; +* 2. the SD_ASYM_CPUCAPACITY flag is set in the sched_domain hierarchy. +* 3. the EM complexity is low enough to keep scheduling overheads low; +* +* The complexity of the Energy Model is defined as: +* +* C = nr_pd * (nr_cpus + nr_cs) +* +* with parameters defined as: +* - nr_pd: the number of performance domains +* - nr_cpus: the number of CPUs +* - nr_cs: the sum of the number of capacity states of all performance +* domains (for example, on a system with 2 performance domains, +* with 10 capacity states each, nr_cs = 2 * 10 = 20). +* +* It is generally not a good idea to use such a model in the wake-up path on +* very complex platforms because of the associated scheduling overheads. The +* arbitrary constraint below prevents that. It makes EAS usable up to 16 CPUs +* with per-CPU DVFS and less than 8 capacity states each, for example. +*/ +#define EM_MAX_COMPLEXITY 2048 +static void build_perf_domains (const struct cpumask *cpu_map) { +int i, nr_pd =0 , nr_cs =0 , nr_cpus =cpumask_weight (cpu_map);struct perf_domain *pd =NULL , *tmp;int cpu =cpumask_first (cpu_map);struct root_domain *rd =cpu_rq (cpu)->rd; -int i; + +/* EAS is enabled for asymmetric CPU capacity topologies. */ +if (!per_cpu (sd_asym_cpucapacity, cpu)) { +if (sched_debug ()) { +pr_info ("rd %*pbl: CPUs do not have asymmetric capacities\n" , +cpumask_pr_args (cpu_map)); + } + goto free; + }for_each_cpu (i, cpu_map) {/* Skip already covered CPUs. */
@@ -288,6 +321,20 @@ static void build_perf_domains(const struct cpumask *cpu_map) goto free; tmp->next = pd; pd = tmp; + +/* +* Count performance domains and capacity states for the +* complexity check. +*/ + nr_pd++; + nr_cs +=em_pd_nr_cap_states (pd->em_pd); + } + +/* Bail out if the Energy Model complexity is too high. */ +if (nr_pd * (nr_cs + nr_cpus) >EM_MAX_COMPLEXITY ) { +WARN (1 ,"rd %*pbl: Failed to start EAS, EM complexity is too high\n" , +cpumask_pr_args (cpu_map)); + goto free; }perf_domain_debug (cpu_map, pd);
PATCH v10 8/15 sched/topology: Make Energy Aware Scheduling depend on schedutil
In reply to Quentin PerretEnergy Aware Scheduling (EAS) is designed with the assumption that frequencies of CPUs follow their utilization value. When using a CPUFreq governor other than schedutil, the chances of this assumption being true are small, if any. When schedutil is being used, EAS' predictions are at least consistent with the frequency requests. Although those requests have no guarantees to be honored by the hardware, they should at least guide DVFS in the right direction and provide some hope in regards to the EAS model being accurate.
To make sure EAS is only used in a sane configuration, create a strong dependency on schedutil being used. Since having sugov compiled-in does not provide that guarantee, make CPUFreq call a scheduler function on governor changes hence letting it rebuild the scheduling domains, check the governors of the online CPUs, and enable/disable EAS accordingly.
--- drivers/cpufreq/cpufreq.c | 1 + include/linux/cpufreq.h | 8 +++++++ kernel/sched/cpufreq_schedutil.c | 37 ++++++++++++++++++++++++++++++-- kernel/sched/sched.h | 4 +--- kernel/sched/topology.c | 28 ++++++++++++++++++++---- 5 files changed, 69 insertions(+), 9 deletions(-)
drivers/cpufreq/cpufreq.c +1 -0
@@ -2277,6 +2277,7 @@ static int cpufreq_set_policy(struct cpufreq_policy *policy, ret =cpufreq_start_governor (policy);if (!ret) {pr_debug ("cpufreq: governor change\n" ); +sched_cpufreq_governor_change (policy, old_gov);return 0 ; }cpufreq_exit_governor (policy);
include/linux/cpufreq.h +8 -0
@@ -950,6 +950,14 @@ static inline bool policy_has_boost_freq(struct cpufreq_policy *policy) }#endif +#if defined(CONFIG_ENERGY_MODEL ) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL ) +void sched_cpufreq_governor_change (struct cpufreq_policy *policy, +struct cpufreq_governor *old_gov); +#else +static inline void sched_cpufreq_governor_change (struct cpufreq_policy *policy, +struct cpufreq_governor *old_gov) { } +#endif +extern void arch_freq_prepare_all (void );extern unsigned int arch_freq_get_on_cpu (int cpu);
kernel/sched/cpufreq_schedutil.c +35 -2
@@ -624,7 +624,7 @@ static struct kobj_type sugov_tunables_ktype = {/********************** cpufreq governor interface *********************/ -static struct cpufreq_governor schedutil_gov; +struct cpufreq_governor schedutil_gov;static struct sugov_policy *sugov_policy_alloc (struct cpufreq_policy *policy) {
@@ -883,7 +883,7 @@ static void sugov_limits(struct cpufreq_policy *policy) sg_policy->need_freq_update = true; } -static struct cpufreq_governor schedutil_gov = { +struct cpufreq_governor schedutil_gov = { .name ="schedutil" , .owner =THIS_MODULE , .dynamic_switching = true,
@@ -906,3 +906,36 @@ static int __init sugov_register(void)return cpufreq_register_governor (&schedutil_gov); }fs_initcall (sugov_register); + +#ifdef CONFIG_ENERGY_MODEL +extern bool sched_energy_update; +extern struct mutex sched_energy_mutex; + +static void rebuild_sd_workfn (struct work_struct *work) +{ +mutex_lock (&sched_energy_mutex); + sched_energy_update = true; +rebuild_sched_domains (); + sched_energy_update = false; +mutex_unlock (&sched_energy_mutex); +} +static DECLARE_WORK(rebuild_sd_work, rebuild_sd_workfn); + +/* +* EAS shouldn't be attempted without sugov, so rebuild the sched_domains +* on governor changes to make sure the scheduler knows about it. +*/ +void sched_cpufreq_governor_change (struct cpufreq_policy *policy, +struct cpufreq_governor *old_gov) +{ +if (old_gov == &schedutil_gov || policy->governor == &schedutil_gov) { +/* +* When called from the cpufreq_register_driver() path, the +* cpu_hotplug_lock is already held, so use a work item to +* avoid nested locking in rebuild_sched_domains(). +*/ +schedule_work (&rebuild_sd_work); + } + +} +#endif
kernel/sched/sched.h +1 -3
@@ -2293,10 +2293,8 @@ unsigned long scale_irq_capacity(unsigned long util, unsigned long irq, unsigned }#endif -#ifdef CONFIG_SMP -#ifdef CONFIG_ENERGY_MODEL +#if defined(CONFIG_ENERGY_MODEL ) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL )#define perf_domain_span (pd) (to_cpumask(((pd)->em_pd->cpus)))#else #define perf_domain_span (pd) NULL#endif -#endif
kernel/sched/topology.c +24 -4
@@ -201,7 +201,10 @@ sd_parent_degenerate(struct sched_domain *sd, struct sched_domain *parent)return 1 ; } -#ifdef CONFIG_ENERGY_MODEL +#if defined(CONFIG_ENERGY_MODEL ) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL ) +DEFINE_MUTEX (sched_energy_mutex); +bool sched_energy_update; +static void free_pd (struct perf_domain *pd) {struct perf_domain *tmp;
@@ -275,6 +278,7 @@ static void destroy_perf_domain_rcu(struct rcu_head *rp)* 1. an Energy Model (EM) is available; * 2. the SD_ASYM_CPUCAPACITY flag is set in the sched_domain hierarchy. * 3. the EM complexity is low enough to keep scheduling overheads low; +* 4. schedutil is driving the frequency of all CPUs of the rd; * * The complexity of the Energy Model is defined as: *
@@ -294,12 +298,15 @@ static void destroy_perf_domain_rcu(struct rcu_head *rp)*/ #define EM_MAX_COMPLEXITY 2048 +extern struct cpufreq_governor schedutil_gov;static void build_perf_domains (const struct cpumask *cpu_map) {int i, nr_pd =0 , nr_cs =0 , nr_cpus =cpumask_weight (cpu_map);struct perf_domain *pd =NULL , *tmp;int cpu =cpumask_first (cpu_map);struct root_domain *rd =cpu_rq (cpu)->rd; +struct cpufreq_policy *policy; +struct cpufreq_governor *gov;/* EAS is enabled for asymmetric CPU capacity topologies. */ if (!per_cpu (sd_asym_cpucapacity, cpu)) {
@@ -315,6 +322,19 @@ static void build_perf_domains(const struct cpumask *cpu_map)if (find_pd (pd, i))continue ; +/* Do not attempt EAS if schedutil is not being used. */ + policy =cpufreq_cpu_get (i); +if (!policy) + goto free; + gov = policy->governor; +cpufreq_cpu_put (policy); +if (gov != &schedutil_gov) { +if (rd->pd) +pr_warn ("rd %*pbl: Disabling EAS, schedutil is mandatory\n" , +cpumask_pr_args (cpu_map)); + goto free; + } +/* Create the new pd and add it to the local list. */ tmp =pd_init (i);if (!tmp)
@@ -356,7 +376,7 @@ static void build_perf_domains(const struct cpumask *cpu_map) }#else static void free_pd (struct perf_domain *pd) { } -#endif /* CONFIG_ENERGY_MODEL */ +#endif /* CONFIG_ENERGY_MODEL && CONFIG_CPU_FREQ_GOV_SCHEDUTIL*/ static void free_rootdomain (struct rcu_head *rcu) {
@@ -2154,10 +2174,10 @@ void partition_sched_domains(int ndoms_new, cpumask_var_t doms_new[], ; } -#ifdef CONFIG_ENERGY_MODEL +#if defined(CONFIG_ENERGY_MODEL ) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL )/* Build perf. domains: */ for (i =0 ; i < ndoms_new; i++) { -for (j =0 ; j < n; j++) { +for (j =0 ; j < n && !sched_energy_update; j++) {if (cpumask_equal (doms_new[i], doms_cur[j]) &&cpu_rq (cpumask_first (doms_cur[j]))->rd->pd) goto match3;
Signature · 1 line
2.19.2
tip-bot for Quentin Perret
merge bot[tip:sched/core] sched/topology: Make Energy Aware Scheduling depend on schedutil
sched/topology: Make Energy Aware Scheduling depend on schedutil
Commit-ID: 531b5c9f5cd05ead53324f419b32685a22eebe8b Gitweb: https://git.kernel.org/tip/531b5c9f5cd05ead53324f419b32685a22eebe8b Author: Quentin Perret <[email protected]> AuthorDate: Mon, 3 Dec 2018 09:56:21 +0000 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 11 Dec 2018 15:17:00 +0100
sched/topology: Make Energy Aware Scheduling depend on schedutil
Energy Aware Scheduling (EAS) is designed with the assumption that frequencies of CPUs follow their utilization value. When using a CPUFreq governor other than schedutil, the chances of this assumption being true are small, if any. When schedutil is being used, EAS' predictions are at least consistent with the frequency requests. Although those requests have no guarantees to be honored by the hardware, they should at least guide DVFS in the right direction and provide some hope in regards to the EAS model being accurate.
To make sure EAS is only used in a sane configuration, create a strong dependency on schedutil being used. Since having sugov compiled-in does not provide that guarantee, make CPUFreq call a scheduler function on governor changes hence letting it rebuild the scheduling domains, check the governors of the online CPUs, and enable/disable EAS accordingly.
--- drivers/cpufreq/cpufreq.c | 1 + include/linux/cpufreq.h | 8 ++++++++ kernel/sched/cpufreq_schedutil.c | 37 +++++++++++++++++++++++++++++++++++-- kernel/sched/sched.h | 4 +--- kernel/sched/topology.c | 28 ++++++++++++++++++++++++---- 5 files changed, 69 insertions(+), 9 deletions(-)
drivers/cpufreq/cpufreq.c +1 -0
@@ -2277,6 +2277,7 @@ static int cpufreq_set_policy(struct cpufreq_policy *policy, ret =cpufreq_start_governor (policy);if (!ret) {pr_debug ("cpufreq: governor change\n" ); +sched_cpufreq_governor_change (policy, old_gov);return 0 ; }cpufreq_exit_governor (policy);
include/linux/cpufreq.h +8 -0
@@ -950,6 +950,14 @@ static inline bool policy_has_boost_freq(struct cpufreq_policy *policy) }#endif +#if defined(CONFIG_ENERGY_MODEL ) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL ) +void sched_cpufreq_governor_change (struct cpufreq_policy *policy, +struct cpufreq_governor *old_gov); +#else +static inline void sched_cpufreq_governor_change (struct cpufreq_policy *policy, +struct cpufreq_governor *old_gov) { } +#endif +extern void arch_freq_prepare_all (void );extern unsigned int arch_freq_get_on_cpu (int cpu);
kernel/sched/cpufreq_schedutil.c +35 -2
@@ -624,7 +624,7 @@ static struct kobj_type sugov_tunables_ktype = {/********************** cpufreq governor interface *********************/ -static struct cpufreq_governor schedutil_gov; +struct cpufreq_governor schedutil_gov;static struct sugov_policy *sugov_policy_alloc (struct cpufreq_policy *policy) {
@@ -883,7 +883,7 @@ static void sugov_limits(struct cpufreq_policy *policy) sg_policy->need_freq_update = true; } -static struct cpufreq_governor schedutil_gov = { +struct cpufreq_governor schedutil_gov = { .name ="schedutil" , .owner =THIS_MODULE , .dynamic_switching = true,
@@ -906,3 +906,36 @@ static int __init sugov_register(void)return cpufreq_register_governor (&schedutil_gov); }fs_initcall (sugov_register); + +#ifdef CONFIG_ENERGY_MODEL +extern bool sched_energy_update; +extern struct mutex sched_energy_mutex; + +static void rebuild_sd_workfn (struct work_struct *work) +{ +mutex_lock (&sched_energy_mutex); + sched_energy_update = true; +rebuild_sched_domains (); + sched_energy_update = false; +mutex_unlock (&sched_energy_mutex); +} +static DECLARE_WORK(rebuild_sd_work, rebuild_sd_workfn); + +/* +* EAS shouldn't be attempted without sugov, so rebuild the sched_domains +* on governor changes to make sure the scheduler knows about it. +*/ +void sched_cpufreq_governor_change (struct cpufreq_policy *policy, +struct cpufreq_governor *old_gov) +{ +if (old_gov == &schedutil_gov || policy->governor == &schedutil_gov) { +/* +* When called from the cpufreq_register_driver() path, the +* cpu_hotplug_lock is already held, so use a work item to +* avoid nested locking in rebuild_sched_domains(). +*/ +schedule_work (&rebuild_sd_work); + } + +} +#endif
kernel/sched/sched.h +1 -3
@@ -2291,10 +2291,8 @@ unsigned long scale_irq_capacity(unsigned long util, unsigned long irq, unsigned }#endif -#ifdef CONFIG_SMP -#ifdef CONFIG_ENERGY_MODEL +#if defined(CONFIG_ENERGY_MODEL ) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL )#define perf_domain_span (pd) (to_cpumask(((pd)->em_pd->cpus)))#else #define perf_domain_span (pd) NULL#endif -#endif
kernel/sched/topology.c +24 -4
@@ -201,7 +201,10 @@ sd_parent_degenerate(struct sched_domain *sd, struct sched_domain *parent)return 1 ; } -#ifdef CONFIG_ENERGY_MODEL +#if defined(CONFIG_ENERGY_MODEL ) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL ) +DEFINE_MUTEX (sched_energy_mutex); +bool sched_energy_update; +static void free_pd (struct perf_domain *pd) {struct perf_domain *tmp;
@@ -275,6 +278,7 @@ static void destroy_perf_domain_rcu(struct rcu_head *rp)* 1. an Energy Model (EM) is available; * 2. the SD_ASYM_CPUCAPACITY flag is set in the sched_domain hierarchy. * 3. the EM complexity is low enough to keep scheduling overheads low; +* 4. schedutil is driving the frequency of all CPUs of the rd; * * The complexity of the Energy Model is defined as: *
@@ -294,12 +298,15 @@ static void destroy_perf_domain_rcu(struct rcu_head *rp)*/ #define EM_MAX_COMPLEXITY 2048 +extern struct cpufreq_governor schedutil_gov;static void build_perf_domains (const struct cpumask *cpu_map) {int i, nr_pd =0 , nr_cs =0 , nr_cpus =cpumask_weight (cpu_map);struct perf_domain *pd =NULL , *tmp;int cpu =cpumask_first (cpu_map);struct root_domain *rd =cpu_rq (cpu)->rd; +struct cpufreq_policy *policy; +struct cpufreq_governor *gov;/* EAS is enabled for asymmetric CPU capacity topologies. */ if (!per_cpu (sd_asym_cpucapacity, cpu)) {
@@ -315,6 +322,19 @@ static void build_perf_domains(const struct cpumask *cpu_map)if (find_pd (pd, i))continue ; +/* Do not attempt EAS if schedutil is not being used. */ + policy =cpufreq_cpu_get (i); +if (!policy) + goto free; + gov = policy->governor; +cpufreq_cpu_put (policy); +if (gov != &schedutil_gov) { +if (rd->pd) +pr_warn ("rd %*pbl: Disabling EAS, schedutil is mandatory\n" , +cpumask_pr_args (cpu_map)); + goto free; + } +/* Create the new pd and add it to the local list. */ tmp =pd_init (i);if (!tmp)
@@ -356,7 +376,7 @@ free: }#else static void free_pd (struct perf_domain *pd) { } -#endif /* CONFIG_ENERGY_MODEL */ +#endif /* CONFIG_ENERGY_MODEL && CONFIG_CPU_FREQ_GOV_SCHEDUTIL*/ static void free_rootdomain (struct rcu_head *rcu) {
@@ -2152,10 +2172,10 @@ match2: ; } -#ifdef CONFIG_ENERGY_MODEL +#if defined(CONFIG_ENERGY_MODEL ) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL )/* Build perf. domains: */ for (i =0 ; i < ndoms_new; i++) { -for (j =0 ; j < n; j++) { +for (j =0 ; j < n && !sched_energy_update; j++) {if (cpumask_equal (doms_new[i], doms_cur[j]) &&cpu_rq (cpumask_first (doms_cur[j]))->rd->pd) goto match3;
PATCH v10 9/15 sched: Introduce sched_energy_present static key
In reply to Quentin PerretIn order to make sure Energy Aware Scheduling (EAS) will not impact systems where no Energy Model is available, introduce a static key guarding the access to EAS code. Since EAS is enabled on a per-root-domain basis, the static key is enabled when at least one root domain meets all conditions for EAS.
--- kernel/sched/sched.h | 4 ++++ kernel/sched/topology.c | 28 ++++++++++++++++++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-)
kernel/sched/sched.h +4 -0
@@ -2298,3 +2298,7 @@ unsigned long scale_irq_capacity(unsigned long util, unsigned long irq, unsigned#else #define perf_domain_span (pd) NULL#endif + +#ifdef CONFIG_SMP +extern struct static_key_false sched_energy_present; +#endif
kernel/sched/topology.c +24 -4
@@ -201,6 +201,7 @@ sd_parent_degenerate(struct sched_domain *sd, struct sched_domain *parent)return 1 ; } +DEFINE_STATIC_KEY_FALSE (sched_energy_present);#if defined(CONFIG_ENERGY_MODEL ) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL )DEFINE_MUTEX (sched_energy_mutex);bool sched_energy_update;
@@ -273,6 +274,19 @@ static void destroy_perf_domain_rcu(struct rcu_head *rp)free_pd (pd); } +static void sched_energy_set (bool has_eas) +{ +if (!has_eas &&static_branch_unlikely (&sched_energy_present)) { +if (sched_debug ()) +pr_info ("%s: stopping EAS\n" , __func__); +static_branch_disable_cpuslocked (&sched_energy_present); + }else if (has_eas && !static_branch_unlikely (&sched_energy_present)) { +if (sched_debug ()) +pr_info ("%s: starting EAS\n" , __func__); +static_branch_enable_cpuslocked (&sched_energy_present); + } +} +/* * EAS can be used on a root domain if it meets all the following conditions: * 1. an Energy Model (EM) is available;
@@ -299,7 +313,7 @@ static void destroy_perf_domain_rcu(struct rcu_head *rp)#define EM_MAX_COMPLEXITY 2048extern struct cpufreq_governor schedutil_gov; -static void build_perf_domains (const struct cpumask *cpu_map) +static bool build_perf_domains (const struct cpumask *cpu_map) {int i, nr_pd =0 , nr_cs =0 , nr_cpus =cpumask_weight (cpu_map);struct perf_domain *pd =NULL , *tmp;
@@ -365,7 +379,7 @@ static void build_perf_domains(const struct cpumask *cpu_map)if (tmp)call_rcu (&tmp->rcu, destroy_perf_domain_rcu); -return ; +return !!pd; free:free_pd (pd);
@@ -373,6 +387,8 @@ static void build_perf_domains(const struct cpumask *cpu_map)rcu_assign_pointer (rd->pd,NULL );if (tmp)call_rcu (&tmp->rcu, destroy_perf_domain_rcu); + + return false; }#else static void free_pd (struct perf_domain *pd) { }
@@ -2116,6 +2132,7 @@ static int dattrs_equal(struct sched_domain_attr *cur, int idx_cur,void partition_sched_domains (int ndoms_new,cpumask_var_t doms_new[],struct sched_domain_attr *dattr_new) { +bool __maybe_unused has_eas = false;int i, j, n;int new_topology;
@@ -2179,14 +2196,17 @@ void partition_sched_domains(int ndoms_new, cpumask_var_t doms_new[],for (i =0 ; i < ndoms_new; i++) {for (j =0 ; j < n && !sched_energy_update; j++) {if (cpumask_equal (doms_new[i], doms_cur[j]) && -cpu_rq (cpumask_first (doms_cur[j]))->rd->pd) +cpu_rq (cpumask_first (doms_cur[j]))->rd->pd) { + has_eas = true; goto match3; + } }/* No match - add perf. domains for a new rd */ -build_perf_domains (doms_new[i]); + has_eas |=build_perf_domains (doms_new[i]); match3: ; } +sched_energy_set (has_eas);#endif /* Remember the new sched domains: */
Signature · 1 line
2.19.2
tip-bot for Quentin Perret
merge bot[tip:sched/core] sched/toplogy: Introduce the 'sched_energy_present' static key
sched/toplogy: Introduce the 'sched_energy_present' static key
Commit-ID: 1f74de8798c93ce14801cc4e772603e51c841c33 Gitweb: https://git.kernel.org/tip/1f74de8798c93ce14801cc4e772603e51c841c33 Author: Quentin Perret <[email protected]> AuthorDate: Mon, 3 Dec 2018 09:56:22 +0000 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 11 Dec 2018 15:17:01 +0100
sched/toplogy: Introduce the 'sched_energy_present' static key
In order to make sure Energy Aware Scheduling (EAS) will not impact systems where no Energy Model is available, introduce a static key guarding the access to EAS code. Since EAS is enabled on a per-root-domain basis, the static key is enabled when at least one root domain meets all conditions for EAS.
--- kernel/sched/sched.h | 4 ++++ kernel/sched/topology.c | 28 ++++++++++++++++++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-)
kernel/sched/sched.h +4 -0
@@ -2296,3 +2296,7 @@ unsigned long scale_irq_capacity(unsigned long util, unsigned long irq, unsigned#else #define perf_domain_span (pd) NULL#endif + +#ifdef CONFIG_SMP +extern struct static_key_false sched_energy_present; +#endif
kernel/sched/topology.c +24 -4
@@ -201,6 +201,7 @@ sd_parent_degenerate(struct sched_domain *sd, struct sched_domain *parent)return 1 ; } +DEFINE_STATIC_KEY_FALSE (sched_energy_present);#if defined(CONFIG_ENERGY_MODEL ) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL )DEFINE_MUTEX (sched_energy_mutex);bool sched_energy_update;
@@ -273,6 +274,19 @@ static void destroy_perf_domain_rcu(struct rcu_head *rp)free_pd (pd); } +static void sched_energy_set (bool has_eas) +{ +if (!has_eas &&static_branch_unlikely (&sched_energy_present)) { +if (sched_debug ()) +pr_info ("%s: stopping EAS\n" , __func__); +static_branch_disable_cpuslocked (&sched_energy_present); + }else if (has_eas && !static_branch_unlikely (&sched_energy_present)) { +if (sched_debug ()) +pr_info ("%s: starting EAS\n" , __func__); +static_branch_enable_cpuslocked (&sched_energy_present); + } +} +/* * EAS can be used on a root domain if it meets all the following conditions: * 1. an Energy Model (EM) is available;
@@ -299,7 +313,7 @@ static void destroy_perf_domain_rcu(struct rcu_head *rp)#define EM_MAX_COMPLEXITY 2048extern struct cpufreq_governor schedutil_gov; -static void build_perf_domains (const struct cpumask *cpu_map) +static bool build_perf_domains (const struct cpumask *cpu_map) {int i, nr_pd =0 , nr_cs =0 , nr_cpus =cpumask_weight (cpu_map);struct perf_domain *pd =NULL , *tmp;
@@ -365,7 +379,7 @@ static void build_perf_domains(const struct cpumask *cpu_map)if (tmp)call_rcu (&tmp->rcu, destroy_perf_domain_rcu); -return ; +return !!pd; free:free_pd (pd);
@@ -373,6 +387,8 @@ free:rcu_assign_pointer (rd->pd,NULL );if (tmp)call_rcu (&tmp->rcu, destroy_perf_domain_rcu); + + return false; }#else static void free_pd (struct perf_domain *pd) { }
@@ -2114,6 +2130,7 @@ static int dattrs_equal(struct sched_domain_attr *cur, int idx_cur,void partition_sched_domains (int ndoms_new,cpumask_var_t doms_new[],struct sched_domain_attr *dattr_new) { +bool __maybe_unused has_eas = false;int i, j, n;int new_topology;
@@ -2177,14 +2194,17 @@ match2:for (i =0 ; i < ndoms_new; i++) {for (j =0 ; j < n && !sched_energy_update; j++) {if (cpumask_equal (doms_new[i], doms_cur[j]) && -cpu_rq (cpumask_first (doms_cur[j]))->rd->pd) +cpu_rq (cpumask_first (doms_cur[j]))->rd->pd) { + has_eas = true; goto match3; + } }/* No match - add perf. domains for a new rd */ -build_perf_domains (doms_new[i]); + has_eas |=build_perf_domains (doms_new[i]); match3: ; } +sched_energy_set (has_eas);#endif /* Remember the new sched domains: */
Re: [tip:sched/core] sched/toplogy: Introduce the 'sched_energy_present' static key
Quoted 8 lines · tip-bot for Quentin Perret
Commit-ID: 1f74de8798c93ce14801cc4e772603e51c841c33 Gitweb: https://git.kernel.org/tip/1f74de8798c93ce14801cc4e772603e51c841c33 Author: Quentin Perret <[email protected]> AuthorDate: Mon, 3 Dec 2018 09:56:22 +0000 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 11 Dec 2018 15:17:01 +0100sched/toplogy: Introduce the '
sched_energy_present' static key
Argh, this one needs a quick fix too :-(
s/toplogy/topology
PATCH v10 10/15 sched: Introduce a sysctl for Energy Aware Scheduling
In reply to Quentin PerretIn its current state, Energy Aware Scheduling (EAS) starts automatically on asymmetric platforms having an Energy Model (EM). However, there are users who want to have an EM (for thermal management for example), but don't want EAS with it.
In order to let users disable EAS explicitly, introduce a new sysctl called 'sched_energy_aware'. It is enabled by default so that EAS can start automatically on platforms where it makes sense. Flipping it to 0 rebuilds the scheduling domains and disables EAS.
--- Documentation/sysctl/kernel.txt | 12 ++++++++++++ include/linux/sched/sysctl.h | 7 +++++++ kernel/sched/topology.c | 29 +++++++++++++++++++++++++++++ kernel/sysctl.c | 11 +++++++++++ 4 files changed, 59 insertions(+)
Documentation/sysctl/kernel.txt +12 -0
@@ -78,6 +78,7 @@ show up in /proc/sys/kernel: - reboot-cmd [ SPARC only ] - rtsig-max - rtsig-nr +- sched_energy_aware - seccomp/ ==> Documentation/userspace-api/seccomp_filter.rst - sem - sem_next_id [ sysv ipc ]
@@ -872,6 +873,17 @@ rtsig-nr shows the number of RT signals currently queued. ============================================================== +sched_energy_aware: + +Enables/disables Energy Aware Scheduling (EAS). EAS starts +automatically on platforms where it can run (that is, +platforms with asymmetric CPU topologies and having an Energy +Model available). If your platform happens to meet the +requirements for EAS but you do not want to use it, change +this value to 0. + +============================================================== + sched_schedstats: Enables/disables scheduler statistics. Enabling this feature
include/linux/sched/sysctl.h +7 -0
@@ -83,4 +83,11 @@ extern int sysctl_schedstats(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos); +#if defined(CONFIG_ENERGY_MODEL ) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL ) +extern unsigned int sysctl_sched_energy_aware; +extern int sched_energy_aware_handler (struct ctl_table *table,int write, +void __user *buffer,size_t *lenp, +loff_t *ppos); +#endif +#endif /* _LINUX_SCHED_SYSCTL_H */
kernel/sched/topology.c +29 -0
@@ -203,9 +203,35 @@ sd_parent_degenerate(struct sched_domain *sd, struct sched_domain *parent)DEFINE_STATIC_KEY_FALSE (sched_energy_present);#if defined(CONFIG_ENERGY_MODEL ) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL ) +unsigned int sysctl_sched_energy_aware =1 ;DEFINE_MUTEX (sched_energy_mutex);bool sched_energy_update; +#ifdef CONFIG_PROC_SYSCTL +int sched_energy_aware_handler (struct ctl_table *table,int write, +void __user *buffer,size_t *lenp,loff_t *ppos) +{ +int ret, state; + +if (write && !capable (CAP_SYS_ADMIN )) +return -EPERM ; + + ret =proc_dointvec_minmax (table, write, buffer, lenp, ppos); +if (!ret && write) { + state =static_branch_unlikely (&sched_energy_present); +if (state != sysctl_sched_energy_aware) { +mutex_lock (&sched_energy_mutex); + sched_energy_update =1 ; +rebuild_sched_domains (); + sched_energy_update =0 ; +mutex_unlock (&sched_energy_mutex); + } + } + +return ret; +} +#endif +static void free_pd (struct perf_domain *pd) {struct perf_domain *tmp;
@@ -322,6 +348,9 @@ static bool build_perf_domains(const struct cpumask *cpu_map)struct cpufreq_policy *policy;struct cpufreq_governor *gov; +if (!sysctl_sched_energy_aware) + goto free; +/* EAS is enabled for asymmetric CPU capacity topologies. */ if (!per_cpu (sd_asym_cpucapacity, cpu)) {if (sched_debug ()) {
kernel/sysctl.c +11 -0
@@ -466,6 +466,17 @@ static struct ctl_table kern_table[] = { .extra1 = &one, },#endif +#if defined(CONFIG_ENERGY_MODEL) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL) + { + .procname = "sched_energy_aware", + .data = &sysctl_sched_energy_aware, + .maxlen = sizeof(unsigned int), + .mode = 0644, + .proc_handler = sched_energy_aware_handler, + .extra1 = &zero, + .extra2 = &one, + }, +#endif #ifdef CONFIG_PROVE_LOCKING { .procname = "prove_locking",
Signature · 1 line
2.19.2
Re: [PATCH v10 10/15] sched: Introduce a sysctl for Energy Aware Scheduling
Quoted 4 lines · Quentin Perret
In its current state, Energy Aware Scheduling (EAS) starts automatically on asymmetric platforms having an Energy Model (EM). However, there are users who want to have an EM (for thermal management for example), but don't want EAS with it.
Well, then introduce a new Kconfig variant for EAS, if it's super important to allow this to be disabled.
Why do we want to disable it - is it not reliable in some circumstances?
Quoted 4 lines
In order to let users disable EAS explicitly, introduce a new sysctl called '
sched_energy_aware'. It is enabled by default so that EAS can start automatically on platforms where it makes sense. Flipping it to 0 rebuilds the scheduling domains and disables EAS.
Yeah, making this a sysctl ABI is asking for trouble - this really should be a Kconfig or debug space knob, at most.
Thanks,
Ingo
Re: [PATCH v10 10/15] sched: Introduce a sysctl for Energy Aware Scheduling
Hi Ingo,
Quoted 8 lines · Ingo Molnar
Quoted 4 lines · Quentin Perret
In its current state, Energy Aware Scheduling (EAS) starts automatically on asymmetric platforms having an Energy Model (EM). However, there are users who want to have an EM (for thermal management for example), but don't want EAS with it.
Quoted 4 lines
Well, then introduce a new
Kconfigvariant for EAS, if it's super important to allow this to be disabled.Why do we want to disable it - is it not reliable in some circumstances?
There are people out there using big.little systems who do not care about energy. Not very many of them, that is true, but they exist. And those people can be interested in having an Energy Model for IPA/thermal but also want to spread tasks to minimize latency for example. So those guys will appreciate a knob, I think. Otherwise EAS gets enabled/disabled only by side effects (by enabling/disabling schedutil for example).
Quoted 7 lines
Quoted 4 lines
In order to let users disable EAS explicitly, introduce a new sysctl called '
sched_energy_aware'. It is enabled by default so that EAS can start automatically on platforms where it makes sense. Flipping it to 0 rebuilds the scheduling domains and disables EAS.Yeah, making this a sysctl ABI is asking for trouble - this really should be a
Kconfigor debug space knob, at most.
My original proposal was a sched_feat, but Peter didn't like it because, well, it's a debug knob :-). I'm personally not against a Kconfig, I just had the feeling scheduler-specific Kconfig weren't welcome in general. But if you feel like EAS could be a reasonable exception to the rule, I won't argue. Otherwise, Juri suggested to have a command line option at some point. Would that be a better solution ?
Also, when you say we're asking for trouble, what are you referring to exactly ? There are a couple of existing sysctl to enable/disable scheduler features.
Thanks,
Quentin
Peter Zijlstra
maintainerRe: [PATCH v10 10/15] sched: Introduce a sysctl for Energy Aware Scheduling
Quoted 16 lines · Quentin Perret
Hi Ingo,
Quoted 8 lines · Ingo Molnar
Quoted 4 lines · Quentin Perret
In its current state, Energy Aware Scheduling (EAS) starts automatically on asymmetric platforms having an Energy Model (EM). However, there are users who want to have an EM (for thermal management for example), but don't want EAS with it.
Quoted 4 lines
Well, then introduce a new
Kconfigvariant for EAS, if it's super important to allow this to be disabled.Why do we want to disable it - is it not reliable in some circumstances?
Quoted 7 lines
There are people out there using big.little systems who do not care about energy. Not very many of them, that is true, but they exist. And those people can be interested in having an Energy Model for IPA/thermal but also want to spread tasks to minimize latency for example. So those guys will appreciate a knob, I think. Otherwise EAS gets enabled/disabled only by side effects (by enabling/disabling schedutil for example).
Right, also we have a sysctl for numa-balancing, I figured having one for eas would not be weird.
tip-bot for Quentin Perret
merge bot[tip:sched/core] sched/topology: Introduce a sysctl for Energy Aware Scheduling
In reply to Quentin Perretsched/topology: Introduce a sysctl for Energy Aware Scheduling
Commit-ID: 85ff0ec647a3bdfda7fc4ae567f529c141721eb1 Gitweb: https://git.kernel.org/tip/85ff0ec647a3bdfda7fc4ae567f529c141721eb1 Author: Quentin Perret <[email protected]> AuthorDate: Mon, 3 Dec 2018 09:56:23 +0000 Committer: Ingo Molnar <[email protected]> CommitDate: Mon, 21 Jan 2019 11:27:53 +0100
sched/topology: Introduce a sysctl for Energy Aware Scheduling
In its current state, Energy Aware Scheduling (EAS) starts automatically on asymmetric platforms having an Energy Model (EM). However, there are users who want to have an EM (for thermal management for example), but don't want EAS with it.
In order to let users disable EAS explicitly, introduce a new sysctl called 'sched_energy_aware'. It is enabled by default so that EAS can start automatically on platforms where it makes sense. Flipping it to 0 rebuilds the scheduling domains and disables EAS.
--- Documentation/sysctl/kernel.txt | 12 ++++++++++++ include/linux/sched/sysctl.h | 7 +++++++ kernel/sched/topology.c | 29 +++++++++++++++++++++++++++++ kernel/sysctl.c | 11 +++++++++++ 4 files changed, 59 insertions(+)
Documentation/sysctl/kernel.txt +12 -0
@@ -79,6 +79,7 @@ show up in /proc/sys/kernel: - reboot-cmd [ SPARC only ] - rtsig-max - rtsig-nr +- sched_energy_aware - seccomp/ ==> Documentation/userspace-api/seccomp_filter.rst - sem - sem_next_id [ sysv ipc ]
@@ -890,6 +891,17 @@ rtsig-nr shows the number of RT signals currently queued. ============================================================== +sched_energy_aware: + +Enables/disables Energy Aware Scheduling (EAS). EAS starts +automatically on platforms where it can run (that is, +platforms with asymmetric CPU topologies and having an Energy +Model available). If your platform happens to meet the +requirements for EAS but you do not want to use it, change +this value to 0. + +============================================================== + sched_schedstats: Enables/disables scheduler statistics. Enabling this feature
include/linux/sched/sysctl.h +7 -0
@@ -83,4 +83,11 @@ extern int sysctl_schedstats(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos); +#if defined(CONFIG_ENERGY_MODEL ) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL ) +extern unsigned int sysctl_sched_energy_aware; +extern int sched_energy_aware_handler (struct ctl_table *table,int write, +void __user *buffer,size_t *lenp, +loff_t *ppos); +#endif +#endif /* _LINUX_SCHED_SYSCTL_H */
kernel/sched/topology.c +29 -0
@@ -203,9 +203,35 @@ sd_parent_degenerate(struct sched_domain *sd, struct sched_domain *parent)DEFINE_STATIC_KEY_FALSE (sched_energy_present);#if defined(CONFIG_ENERGY_MODEL ) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL ) +unsigned int sysctl_sched_energy_aware =1 ;DEFINE_MUTEX (sched_energy_mutex);bool sched_energy_update; +#ifdef CONFIG_PROC_SYSCTL +int sched_energy_aware_handler (struct ctl_table *table,int write, +void __user *buffer,size_t *lenp,loff_t *ppos) +{ +int ret, state; + +if (write && !capable (CAP_SYS_ADMIN )) +return -EPERM ; + + ret =proc_dointvec_minmax (table, write, buffer, lenp, ppos); +if (!ret && write) { + state =static_branch_unlikely (&sched_energy_present); +if (state != sysctl_sched_energy_aware) { +mutex_lock (&sched_energy_mutex); + sched_energy_update =1 ; +rebuild_sched_domains (); + sched_energy_update =0 ; +mutex_unlock (&sched_energy_mutex); + } + } + +return ret; +} +#endif +static void free_pd (struct perf_domain *pd) {struct perf_domain *tmp;
@@ -322,6 +348,9 @@ static bool build_perf_domains(const struct cpumask *cpu_map)struct cpufreq_policy *policy;struct cpufreq_governor *gov; +if (!sysctl_sched_energy_aware) + goto free; +/* EAS is enabled for asymmetric CPU capacity topologies. */ if (!per_cpu (sd_asym_cpucapacity, cpu)) {if (sched_debug ()) {
kernel/sysctl.c +11 -0
@@ -467,6 +467,17 @@ static struct ctl_table kern_table[] = { .extra1 = &one, },#endif +#if defined(CONFIG_ENERGY_MODEL) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL) + { + .procname = "sched_energy_aware", + .data = &sysctl_sched_energy_aware, + .maxlen = sizeof(unsigned int), + .mode = 0644, + .proc_handler = sched_energy_aware_handler, + .extra1 = &zero, + .extra2 = &one, + }, +#endif #ifdef CONFIG_PROVE_LOCKING { .procname = "prove_locking",
tip-bot for Quentin Perret
merge bot[tip:sched/core] sched/topology: Introduce a sysctl for Energy Aware Scheduling
In reply to Quentin Perretsched/topology: Introduce a sysctl for Energy Aware Scheduling
Commit-ID: 570139c80d73a5aa60c2500163378412b3836fc9 Gitweb: https://git.kernel.org/tip/570139c80d73a5aa60c2500163378412b3836fc9 Author: Quentin Perret <[email protected]> AuthorDate: Mon, 3 Dec 2018 09:56:23 +0000 Committer: Ingo Molnar <[email protected]> CommitDate: Mon, 21 Jan 2019 14:40:28 +0100
sched/topology: Introduce a sysctl for Energy Aware Scheduling
In its current state, Energy Aware Scheduling (EAS) starts automatically on asymmetric platforms having an Energy Model (EM). However, there are users who want to have an EM (for thermal management for example), but don't want EAS with it.
In order to let users disable EAS explicitly, introduce a new sysctl called 'sched_energy_aware'. It is enabled by default so that EAS can start automatically on platforms where it makes sense. Flipping it to 0 rebuilds the scheduling domains and disables EAS.
--- Documentation/sysctl/kernel.txt | 12 ++++++++++++ include/linux/sched/sysctl.h | 7 +++++++ kernel/sched/topology.c | 29 +++++++++++++++++++++++++++++ kernel/sysctl.c | 11 +++++++++++ 4 files changed, 59 insertions(+)
Documentation/sysctl/kernel.txt +12 -0
@@ -79,6 +79,7 @@ show up in /proc/sys/kernel: - reboot-cmd [ SPARC only ] - rtsig-max - rtsig-nr +- sched_energy_aware - seccomp/ ==> Documentation/userspace-api/seccomp_filter.rst - sem - sem_next_id [ sysv ipc ]
@@ -890,6 +891,17 @@ rtsig-nr shows the number of RT signals currently queued. ============================================================== +sched_energy_aware: + +Enables/disables Energy Aware Scheduling (EAS). EAS starts +automatically on platforms where it can run (that is, +platforms with asymmetric CPU topologies and having an Energy +Model available). If your platform happens to meet the +requirements for EAS but you do not want to use it, change +this value to 0. + +============================================================== + sched_schedstats: Enables/disables scheduler statistics. Enabling this feature
include/linux/sched/sysctl.h +7 -0
@@ -83,4 +83,11 @@ extern int sysctl_schedstats(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos); +#if defined(CONFIG_ENERGY_MODEL ) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL ) +extern unsigned int sysctl_sched_energy_aware; +extern int sched_energy_aware_handler (struct ctl_table *table,int write, +void __user *buffer,size_t *lenp, +loff_t *ppos); +#endif +#endif /* _LINUX_SCHED_SYSCTL_H */
kernel/sched/topology.c +29 -0
@@ -203,9 +203,35 @@ sd_parent_degenerate(struct sched_domain *sd, struct sched_domain *parent)DEFINE_STATIC_KEY_FALSE (sched_energy_present);#if defined(CONFIG_ENERGY_MODEL ) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL ) +unsigned int sysctl_sched_energy_aware =1 ;DEFINE_MUTEX (sched_energy_mutex);bool sched_energy_update; +#ifdef CONFIG_PROC_SYSCTL +int sched_energy_aware_handler (struct ctl_table *table,int write, +void __user *buffer,size_t *lenp,loff_t *ppos) +{ +int ret, state; + +if (write && !capable (CAP_SYS_ADMIN )) +return -EPERM ; + + ret =proc_dointvec_minmax (table, write, buffer, lenp, ppos); +if (!ret && write) { + state =static_branch_unlikely (&sched_energy_present); +if (state != sysctl_sched_energy_aware) { +mutex_lock (&sched_energy_mutex); + sched_energy_update =1 ; +rebuild_sched_domains (); + sched_energy_update =0 ; +mutex_unlock (&sched_energy_mutex); + } + } + +return ret; +} +#endif +static void free_pd (struct perf_domain *pd) {struct perf_domain *tmp;
@@ -322,6 +348,9 @@ static bool build_perf_domains(const struct cpumask *cpu_map)struct cpufreq_policy *policy;struct cpufreq_governor *gov; +if (!sysctl_sched_energy_aware) + goto free; +/* EAS is enabled for asymmetric CPU capacity topologies. */ if (!per_cpu (sd_asym_cpucapacity, cpu)) {if (sched_debug ()) {
kernel/sysctl.c +11 -0
@@ -467,6 +467,17 @@ static struct ctl_table kern_table[] = { .extra1 = &one, },#endif +#if defined(CONFIG_ENERGY_MODEL) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL) + { + .procname = "sched_energy_aware", + .data = &sysctl_sched_energy_aware, + .maxlen = sizeof(unsigned int), + .mode = 0644, + .proc_handler = sched_energy_aware_handler, + .extra1 = &zero, + .extra2 = &one, + }, +#endif #ifdef CONFIG_PROVE_LOCKING { .procname = "prove_locking",
tip-bot for Quentin Perret
merge bot[tip:sched/core] sched/topology: Introduce a sysctl for Energy Aware Scheduling
In reply to Quentin Perretsched/topology: Introduce a sysctl for Energy Aware Scheduling
Commit-ID: 8d5d0cfb63cbcb4005e19a332b31d687b1d01e58 Gitweb: https://git.kernel.org/tip/8d5d0cfb63cbcb4005e19a332b31d687b1d01e58 Author: Quentin Perret <[email protected]> AuthorDate: Mon, 3 Dec 2018 09:56:23 +0000 Committer: Ingo Molnar <[email protected]> CommitDate: Sun, 27 Jan 2019 12:29:37 +0100
sched/topology: Introduce a sysctl for Energy Aware Scheduling
In its current state, Energy Aware Scheduling (EAS) starts automatically on asymmetric platforms having an Energy Model (EM). However, there are users who want to have an EM (for thermal management for example), but don't want EAS with it.
In order to let users disable EAS explicitly, introduce a new sysctl called 'sched_energy_aware'. It is enabled by default so that EAS can start automatically on platforms where it makes sense. Flipping it to 0 rebuilds the scheduling domains and disables EAS.
--- Documentation/sysctl/kernel.txt | 12 ++++++++++++ include/linux/sched/sysctl.h | 7 +++++++ kernel/sched/topology.c | 29 +++++++++++++++++++++++++++++ kernel/sysctl.c | 11 +++++++++++ 4 files changed, 59 insertions(+)
Documentation/sysctl/kernel.txt +12 -0
@@ -79,6 +79,7 @@ show up in /proc/sys/kernel: - reboot-cmd [ SPARC only ] - rtsig-max - rtsig-nr +- sched_energy_aware - seccomp/ ==> Documentation/userspace-api/seccomp_filter.rst - sem - sem_next_id [ sysv ipc ]
@@ -890,6 +891,17 @@ rtsig-nr shows the number of RT signals currently queued. ============================================================== +sched_energy_aware: + +Enables/disables Energy Aware Scheduling (EAS). EAS starts +automatically on platforms where it can run (that is, +platforms with asymmetric CPU topologies and having an Energy +Model available). If your platform happens to meet the +requirements for EAS but you do not want to use it, change +this value to 0. + +============================================================== + sched_schedstats: Enables/disables scheduler statistics. Enabling this feature
include/linux/sched/sysctl.h +7 -0
@@ -83,4 +83,11 @@ extern int sysctl_schedstats(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos); +#if defined(CONFIG_ENERGY_MODEL ) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL ) +extern unsigned int sysctl_sched_energy_aware; +extern int sched_energy_aware_handler (struct ctl_table *table,int write, +void __user *buffer,size_t *lenp, +loff_t *ppos); +#endif +#endif /* _LINUX_SCHED_SYSCTL_H */
kernel/sched/topology.c +29 -0
@@ -203,9 +203,35 @@ sd_parent_degenerate(struct sched_domain *sd, struct sched_domain *parent)DEFINE_STATIC_KEY_FALSE (sched_energy_present);#if defined(CONFIG_ENERGY_MODEL ) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL ) +unsigned int sysctl_sched_energy_aware =1 ;DEFINE_MUTEX (sched_energy_mutex);bool sched_energy_update; +#ifdef CONFIG_PROC_SYSCTL +int sched_energy_aware_handler (struct ctl_table *table,int write, +void __user *buffer,size_t *lenp,loff_t *ppos) +{ +int ret, state; + +if (write && !capable (CAP_SYS_ADMIN )) +return -EPERM ; + + ret =proc_dointvec_minmax (table, write, buffer, lenp, ppos); +if (!ret && write) { + state =static_branch_unlikely (&sched_energy_present); +if (state != sysctl_sched_energy_aware) { +mutex_lock (&sched_energy_mutex); + sched_energy_update =1 ; +rebuild_sched_domains (); + sched_energy_update =0 ; +mutex_unlock (&sched_energy_mutex); + } + } + +return ret; +} +#endif +static void free_pd (struct perf_domain *pd) {struct perf_domain *tmp;
@@ -322,6 +348,9 @@ static bool build_perf_domains(const struct cpumask *cpu_map)struct cpufreq_policy *policy;struct cpufreq_governor *gov; +if (!sysctl_sched_energy_aware) + goto free; +/* EAS is enabled for asymmetric CPU capacity topologies. */ if (!per_cpu (sd_asym_cpucapacity, cpu)) {if (sched_debug ()) {
kernel/sysctl.c +11 -0
@@ -467,6 +467,17 @@ static struct ctl_table kern_table[] = { .extra1 = &one, },#endif +#if defined(CONFIG_ENERGY_MODEL) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL) + { + .procname = "sched_energy_aware", + .data = &sysctl_sched_energy_aware, + .maxlen = sizeof(unsigned int), + .mode = 0644, + .proc_handler = sched_energy_aware_handler, + .extra1 = &zero, + .extra2 = &one, + }, +#endif #ifdef CONFIG_PROVE_LOCKING { .procname = "prove_locking",
PATCH v10 11/15 sched/fair: Clean-up update_sg_lb_stats parameters
In reply to Quentin PerretIn preparation for the introduction of a new root domain flag which can be set during load balance (the 'overutilized' flag), clean-up the set of parameters passed to update_sg_lb_stats(). More specifically, the 'local_group' and 'local_idx' parameters can be removed since they can easily be reconstructed from within the function.
While at it, transform the 'overload' parameter into a flag stored in the 'sg_status' parameter hence facilitating the definition of new flags when needed.
--- kernel/sched/fair.c | 27 +++++++++++---------------- kernel/sched/sched.h | 3 +++ 2 files changed, 14 insertions(+), 16 deletions(-)
kernel/sched/fair.c +11 -16
@@ -7905,16 +7905,16 @@ static bool update_nohz_stats(struct rq *rq, bool force)* update_sg_lb_stats - Update sched_group's statistics for load balancing. * @env: The load balancing environment. * @group: sched_group whose statistics are to be updated. -* @load_idx: Load index of sched_domain of this_cpu for load calc. -* @local_group: Does group contain this_cpu. * @sgs: variable to hold the statistics for this group. -* @overload: Indicate pullable load (e.g. >1 runnable task). +* @sg_status: Holds flag indicating the status of the sched_group */ static inline void update_sg_lb_stats (struct lb_env *env, -struct sched_group *group,int load_idx, -int local_group,struct sg_lb_stats *sgs, -bool *overload) +struct sched_group *group, +struct sg_lb_stats *sgs, +int *sg_status) { +int local_group =cpumask_test_cpu (env->dst_cpu,sched_group_span (group)); +int load_idx =get_sd_load_idx (env->sd, env->idle);unsigned long load;int i, nr_running;
@@ -7938,7 +7938,7 @@ static inline void update_sg_lb_stats(struct lb_env *env, nr_running = rq->nr_running;if (nr_running >1 ) - *overload = true; + *sg_status |=SG_OVERLOAD ;#ifdef CONFIG_NUMA_BALANCING sgs->nr_numa_running += rq->nr_numa_running;
@@ -7954,7 +7954,7 @@ static inline void update_sg_lb_stats(struct lb_env *env,if (env->sd->flags &SD_ASYM_CPUCAPACITY && sgs->group_misfit_task_load < rq->misfit_task_load) { sgs->group_misfit_task_load = rq->misfit_task_load; - *overload =1 ; + *sg_status |=SG_OVERLOAD ; } }
@@ -8099,17 +8099,14 @@ static inline void update_sd_lb_stats(struct lb_env *env, struct sd_lb_stats *sdstruct sched_group *sg = env->sd->groups;struct sg_lb_stats *local = &sds->local_stat;struct sg_lb_stats tmp_sgs; -int load_idx; -bool overload = false;bool prefer_sibling = child && child->flags &SD_PREFER_SIBLING ; +int sg_status =0 ;#ifdef CONFIG_NO_HZ_COMMON if (env->idle ==CPU_NEWLY_IDLE &&READ_ONCE (nohz.has_blocked)) env->flags |=LBF_NOHZ_STATS ;#endif - load_idx =get_sd_load_idx (env->sd, env->idle); - do { struct sg_lb_stats *sgs = &tmp_sgs; int local_group;
@@ -8124,8 +8121,7 @@ static inline void update_sd_lb_stats(struct lb_env *env, struct sd_lb_stats *sdupdate_group_capacity (env->sd, env->dst_cpu); } -update_sg_lb_stats (env, sg, load_idx, local_group, sgs, - &overload); +update_sg_lb_stats (env, sg, sgs, &sg_status);if (local_group) goto next_group;
@@ -8175,8 +8171,7 @@ static inline void update_sd_lb_stats(struct lb_env *env, struct sd_lb_stats *sdif (!env->sd->parent) {/* update overload indicator if we are at root domain */ -if (READ_ONCE (env->dst_rq->rd->overload) != overload) -WRITE_ONCE (env->dst_rq->rd->overload, overload); +WRITE_ONCE (env->dst_rq->rd->overload, sg_status &SG_OVERLOAD ); } }
kernel/sched/sched.h +3 -0
@@ -715,6 +715,9 @@ struct perf_domain {struct rcu_head rcu; }; +/* Scheduling group status flags */ +#define SG_OVERLOAD 0x1/* More than one runnable task on a CPU. */ +/* * We add the notion of a root-domain which will be used to define per-domain * variables. Each exclusive cpuset essentially defines an island domain by
Signature · 1 line
2.19.2
tip-bot for Quentin Perret
merge bot[tip:sched/core] sched/fair: Clean-up update_sg_lb_stats parameters
sched/fair: Clean-up update_sg_lb_stats parameters
Commit-ID: 630246a06ae2a7a12d1fce85f1e5681032982791 Gitweb: https://git.kernel.org/tip/630246a06ae2a7a12d1fce85f1e5681032982791 Author: Quentin Perret <[email protected]> AuthorDate: Mon, 3 Dec 2018 09:56:24 +0000 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 11 Dec 2018 15:17:01 +0100
sched/fair: Clean-up update_sg_lb_stats parameters
In preparation for the introduction of a new root domain flag which can be set during load balance (the 'overutilized' flag), clean-up the set of parameters passed to update_sg_lb_stats(). More specifically, the 'local_group' and 'local_idx' parameters can be removed since they can easily be reconstructed from within the function.
While at it, transform the 'overload' parameter into a flag stored in the 'sg_status' parameter hence facilitating the definition of new flags when needed.
--- kernel/sched/fair.c | 27 +++++++++++---------------- kernel/sched/sched.h | 3 +++ 2 files changed, 14 insertions(+), 16 deletions(-)
kernel/sched/fair.c +11 -16
@@ -7905,16 +7905,16 @@ static bool update_nohz_stats(struct rq *rq, bool force)* update_sg_lb_stats - Update sched_group's statistics for load balancing. * @env: The load balancing environment. * @group: sched_group whose statistics are to be updated. -* @load_idx: Load index of sched_domain of this_cpu for load calc. -* @local_group: Does group contain this_cpu. * @sgs: variable to hold the statistics for this group. -* @overload: Indicate pullable load (e.g. >1 runnable task). +* @sg_status: Holds flag indicating the status of the sched_group */ static inline void update_sg_lb_stats (struct lb_env *env, -struct sched_group *group,int load_idx, -int local_group,struct sg_lb_stats *sgs, -bool *overload) +struct sched_group *group, +struct sg_lb_stats *sgs, +int *sg_status) { +int local_group =cpumask_test_cpu (env->dst_cpu,sched_group_span (group)); +int load_idx =get_sd_load_idx (env->sd, env->idle);unsigned long load;int i, nr_running;
@@ -7938,7 +7938,7 @@ static inline void update_sg_lb_stats(struct lb_env *env, nr_running = rq->nr_running;if (nr_running >1 ) - *overload = true; + *sg_status |=SG_OVERLOAD ;#ifdef CONFIG_NUMA_BALANCING sgs->nr_numa_running += rq->nr_numa_running;
@@ -7954,7 +7954,7 @@ static inline void update_sg_lb_stats(struct lb_env *env,if (env->sd->flags &SD_ASYM_CPUCAPACITY && sgs->group_misfit_task_load < rq->misfit_task_load) { sgs->group_misfit_task_load = rq->misfit_task_load; - *overload =1 ; + *sg_status |=SG_OVERLOAD ; } }
@@ -8099,17 +8099,14 @@ static inline void update_sd_lb_stats(struct lb_env *env, struct sd_lb_stats *sdstruct sched_group *sg = env->sd->groups;struct sg_lb_stats *local = &sds->local_stat;struct sg_lb_stats tmp_sgs; -int load_idx; -bool overload = false;bool prefer_sibling = child && child->flags &SD_PREFER_SIBLING ; +int sg_status =0 ;#ifdef CONFIG_NO_HZ_COMMON if (env->idle ==CPU_NEWLY_IDLE &&READ_ONCE (nohz.has_blocked)) env->flags |=LBF_NOHZ_STATS ;#endif - load_idx =get_sd_load_idx (env->sd, env->idle); - do { struct sg_lb_stats *sgs = &tmp_sgs; int local_group;
@@ -8124,8 +8121,7 @@ static inline void update_sd_lb_stats(struct lb_env *env, struct sd_lb_stats *sdupdate_group_capacity (env->sd, env->dst_cpu); } -update_sg_lb_stats (env, sg, load_idx, local_group, sgs, - &overload); +update_sg_lb_stats (env, sg, sgs, &sg_status);if (local_group) goto next_group;
@@ -8175,8 +8171,7 @@ next_group:if (!env->sd->parent) {/* update overload indicator if we are at root domain */ -if (READ_ONCE (env->dst_rq->rd->overload) != overload) -WRITE_ONCE (env->dst_rq->rd->overload, overload); +WRITE_ONCE (env->dst_rq->rd->overload, sg_status &SG_OVERLOAD ); } }
kernel/sched/sched.h +3 -0
@@ -716,6 +716,9 @@ struct perf_domain {struct rcu_head rcu; }; +/* Scheduling group status flags */ +#define SG_OVERLOAD 0x1/* More than one runnable task on a CPU. */ +/* * We add the notion of a root-domain which will be used to define per-domain * variables. Each exclusive cpuset essentially defines an island domain by
PATCH v10 12/15 sched: Add over-utilization/tipping point indicator
In reply to Quentin PerretFrom: Morten Rasmussen <[email protected]>
Energy-aware scheduling is only meant to be active while the system is _not_ over-utilized. That is, there are spare cycles available to shift tasks around based on their actual utilization to get a more energy-efficient task distribution without depriving any tasks. When above the tipping point task placement is done the traditional way based on load_avg, spreading the tasks across as many cpus as possible based on priority scaled load to preserve smp_nice. Below the tipping point we want to use util_avg instead. We need to define a criteria for when we make the switch.
The util_avg for each cpu converges towards 100% regardless of how many additional tasks we may put on it. If we define over-utilized as:
sum_{cpus}(rq.cfs.avg.util_avg) + margin > sum_{cpus}(rq.capacity)
some individual cpus may be over-utilized running multiple tasks even when the above condition is false. That should be okay as long as we try to spread the tasks out to avoid per-cpu over-utilization as much as possible and if all tasks have the _same_ priority. If the latter isn't true, we have to consider priority to preserve smp_nice.
For example, we could have n_cpus nice=-10 util_avg=55% tasks and n_cpus/2 nice=0 util_avg=60% tasks. Balancing based on util_avg we are likely to end up with nice=-10 tasks sharing cpus and nice=0 tasks getting their own as we 1.5*n_cpus tasks in total and 55%+55% is less over-utilized than 55%+60% for those cpus that have to be shared. The system utilization is only 85% of the system capacity, but we are breaking smp_nice.
To be sure not to break smp_nice, we have defined over-utilization conservatively as when any cpu in the system is fully utilized at its highest frequency instead:
cpu_rq(any).cfs.avg.util_avg + margin > cpu_rq(any).capacity
IOW, as soon as one cpu is (nearly) 100% utilized, we switch to load_avg to factor in priority to preserve smp_nice.
With this definition, we can skip periodic load-balance as no cpu has an always-running task when the system is not over-utilized. All tasks will be periodic and we can balance them at wake-up. This conservative condition does however mean that some scenarios that could benefit from energy-aware decisions even if one cpu is fully utilized would not get those benefits.
For systems where some cpus might have reduced capacity on some cpus (RT-pressure and/or big.LITTLE), we want periodic load-balance checks as soon a just a single cpu is fully utilized as it might one of those with reduced capacity and in that case we want to migrate it.
[ Added a comment explaining why new tasks are not accounted during
overutilization detection ]
--- kernel/sched/fair.c | 59 ++++++++++++++++++++++++++++++++++++++++++-- kernel/sched/sched.h | 4 +++ 2 files changed, 61 insertions(+), 2 deletions(-)
kernel/sched/fair.c +57 -2
@@ -5082,6 +5082,24 @@ static inline void hrtick_update(struct rq *rq) }#endif +#ifdef CONFIG_SMP +static inline unsigned long cpu_util (int cpu); +static unsigned long capacity_of (int cpu); + +static inline bool cpu_overutilized (int cpu) +{ +return (capacity_of (cpu) *1024 ) < (cpu_util (cpu) * capacity_margin); +} + +static inline void update_overutilized_status (struct rq *rq) +{ +if (!READ_ONCE (rq->rd->overutilized) &&cpu_overutilized (rq->cpu)) +WRITE_ONCE (rq->rd->overutilized,SG_OVERUTILIZED ); +} +#else +static inline void update_overutilized_status (struct rq *rq) { } +#endif +/* * The enqueue_task method is called before nr_running is * increased. Here we update the fair scheduling stats and
@@ -5139,8 +5157,26 @@ enqueue_task_fair(struct rq *rq, struct task_struct *p, int flags)update_cfs_group (se); } -if (!se) +if (!se) {add_nr_running (rq,1 ); +/* +* Since new tasks are assigned an initial util_avg equal to +* half of the spare capacity of their CPU, tiny tasks have the +* ability to cross the overutilized threshold, which will +* result in the load balancer ruining all the task placement +* done by EAS. As a way to mitigate that effect, do not account +* for the first enqueue operation of new tasks during the +* overutilized flag detection. +* +* A better way of solving this problem would be to wait for +* the PELT signals of tasks to converge before taking them +* into account, but that is not straightforward to implement, +* and the following generally works well enough in practice. +*/ +if (flags &ENQUEUE_WAKEUP ) +update_overutilized_status (rq); + + }hrtick_update (rq); }
@@ -7940,6 +7976,9 @@ static inline void update_sg_lb_stats(struct lb_env *env,if (nr_running >1 ) *sg_status |=SG_OVERLOAD ; +if (cpu_overutilized (i)) + *sg_status |=SG_OVERUTILIZED ; +#ifdef CONFIG_NUMA_BALANCING sgs->nr_numa_running += rq->nr_numa_running; sgs->nr_preferred_running += rq->nr_preferred_running;
@@ -8170,8 +8209,15 @@ static inline void update_sd_lb_stats(struct lb_env *env, struct sd_lb_stats *sd env->fbq_type =fbq_classify_group (&sds->busiest_stat);if (!env->sd->parent) { +struct root_domain *rd = env->dst_rq->rd; +/* update overload indicator if we are at root domain */ -WRITE_ONCE (env->dst_rq->rd->overload, sg_status &SG_OVERLOAD ); +WRITE_ONCE (rd->overload, sg_status &SG_OVERLOAD ); + +/* Update over-utilization (tipping point, U >= 0) indicator */ +WRITE_ONCE (rd->overutilized, sg_status &SG_OVERUTILIZED ); + }else if (sg_status &SG_OVERUTILIZED ) { +WRITE_ONCE (env->dst_rq->rd->overutilized,SG_OVERUTILIZED ); } }
@@ -8398,6 +8444,14 @@ static struct sched_group *find_busiest_group(struct lb_env *env)* this level. */ update_sd_lb_stats (env, &sds); + +if (static_branch_unlikely (&sched_energy_present)) { +struct root_domain *rd = env->dst_rq->rd; + +if (rcu_dereference (rd->pd) && !READ_ONCE (rd->overutilized)) + goto out_balanced; + } + local = &sds.local_stat; busiest = &sds.busiest_stat;
@@ -9798,6 +9852,7 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr, int queued)task_tick_numa (rq, curr);update_misfit_status (curr, rq); +update_overutilized_status (task_rq (curr)); }/*
kernel/sched/sched.h +4 -0
@@ -717,6 +717,7 @@ struct perf_domain {/* Scheduling group status flags */ #define SG_OVERLOAD 0x1/* More than one runnable task on a CPU. */ +#define SG_OVERUTILIZED 0x2/* One or more CPUs are over-utilized. */ /* * We add the notion of a root-domain which will be used to define per-domain
@@ -740,6 +741,9 @@ struct root_domain {*/ int overload; +/* Indicate one or more cpus over-utilized (tipping point) */ +int overutilized; +/* * The bit corresponding to a CPU gets set here if such CPU has more * than one runnable -deadline task (as it is below for RT tasks).
Signature · 1 line
2.19.2
tip-bot for Morten Rasmussen
merge bot[tip:sched/core] sched/fair: Add over-utilization/tipping point indicator
sched/fair: Add over-utilization/tipping point indicator
Commit-ID: 2802bf3cd936fe2c8033a696d375a4d9d3974de4 Gitweb: https://git.kernel.org/tip/2802bf3cd936fe2c8033a696d375a4d9d3974de4 Author: Morten Rasmussen <[email protected]> AuthorDate: Mon, 3 Dec 2018 09:56:25 +0000 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 11 Dec 2018 15:17:01 +0100
sched/fair: Add over-utilization/tipping point indicator
Energy-aware scheduling is only meant to be active while the system is _not_ over-utilized. That is, there are spare cycles available to shift tasks around based on their actual utilization to get a more energy-efficient task distribution without depriving any tasks. When above the tipping point task placement is done the traditional way based on load_avg, spreading the tasks across as many cpus as possible based on priority scaled load to preserve smp_nice. Below the tipping point we want to use util_avg instead. We need to define a criteria for when we make the switch.
The util_avg for each cpu converges towards 100% regardless of how many additional tasks we may put on it. If we define over-utilized as:
sum_{cpus}(rq.cfs.avg.util_avg) + margin > sum_{cpus}(rq.capacity)
some individual cpus may be over-utilized running multiple tasks even when the above condition is false. That should be okay as long as we try to spread the tasks out to avoid per-cpu over-utilization as much as possible and if all tasks have the _same_ priority. If the latter isn't true, we have to consider priority to preserve smp_nice.
For example, we could have n_cpus nice=-10 util_avg=55% tasks and n_cpus/2 nice=0 util_avg=60% tasks. Balancing based on util_avg we are likely to end up with nice=-10 tasks sharing cpus and nice=0 tasks getting their own as we 1.5*n_cpus tasks in total and 55%+55% is less over-utilized than 55%+60% for those cpus that have to be shared. The system utilization is only 85% of the system capacity, but we are breaking smp_nice.
To be sure not to break smp_nice, we have defined over-utilization conservatively as when any cpu in the system is fully utilized at its highest frequency instead:
cpu_rq(any).cfs.avg.util_avg + margin > cpu_rq(any).capacity
IOW, as soon as one cpu is (nearly) 100% utilized, we switch to load_avg to factor in priority to preserve smp_nice.
With this definition, we can skip periodic load-balance as no cpu has an always-running task when the system is not over-utilized. All tasks will be periodic and we can balance them at wake-up. This conservative condition does however mean that some scenarios that could benefit from energy-aware decisions even if one cpu is fully utilized would not get those benefits.
For systems where some cpus might have reduced capacity on some cpus (RT-pressure and/or big.LITTLE), we want periodic load-balance checks as soon a just a single cpu is fully utilized as it might one of those with reduced capacity and in that case we want to migrate it.
[ peterz: Added a comment explaining why new tasks are not accounted during
overutilization detection. ]
--- kernel/sched/fair.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++-- kernel/sched/sched.h | 4 ++++ 2 files changed, 61 insertions(+), 2 deletions(-)
kernel/sched/fair.c +57 -2
@@ -5082,6 +5082,24 @@ static inline void hrtick_update(struct rq *rq) }#endif +#ifdef CONFIG_SMP +static inline unsigned long cpu_util (int cpu); +static unsigned long capacity_of (int cpu); + +static inline bool cpu_overutilized (int cpu) +{ +return (capacity_of (cpu) *1024 ) < (cpu_util (cpu) * capacity_margin); +} + +static inline void update_overutilized_status (struct rq *rq) +{ +if (!READ_ONCE (rq->rd->overutilized) &&cpu_overutilized (rq->cpu)) +WRITE_ONCE (rq->rd->overutilized,SG_OVERUTILIZED ); +} +#else +static inline void update_overutilized_status (struct rq *rq) { } +#endif +/* * The enqueue_task method is called before nr_running is * increased. Here we update the fair scheduling stats and
@@ -5139,8 +5157,26 @@ enqueue_task_fair(struct rq *rq, struct task_struct *p, int flags)update_cfs_group (se); } -if (!se) +if (!se) {add_nr_running (rq,1 ); +/* +* Since new tasks are assigned an initial util_avg equal to +* half of the spare capacity of their CPU, tiny tasks have the +* ability to cross the overutilized threshold, which will +* result in the load balancer ruining all the task placement +* done by EAS. As a way to mitigate that effect, do not account +* for the first enqueue operation of new tasks during the +* overutilized flag detection. +* +* A better way of solving this problem would be to wait for +* the PELT signals of tasks to converge before taking them +* into account, but that is not straightforward to implement, +* and the following generally works well enough in practice. +*/ +if (flags &ENQUEUE_WAKEUP ) +update_overutilized_status (rq); + + }hrtick_update (rq); }
@@ -7940,6 +7976,9 @@ static inline void update_sg_lb_stats(struct lb_env *env,if (nr_running >1 ) *sg_status |=SG_OVERLOAD ; +if (cpu_overutilized (i)) + *sg_status |=SG_OVERUTILIZED ; +#ifdef CONFIG_NUMA_BALANCING sgs->nr_numa_running += rq->nr_numa_running; sgs->nr_preferred_running += rq->nr_preferred_running;
@@ -8170,8 +8209,15 @@ next_group: env->fbq_type =fbq_classify_group (&sds->busiest_stat);if (!env->sd->parent) { +struct root_domain *rd = env->dst_rq->rd; +/* update overload indicator if we are at root domain */ -WRITE_ONCE (env->dst_rq->rd->overload, sg_status &SG_OVERLOAD ); +WRITE_ONCE (rd->overload, sg_status &SG_OVERLOAD ); + +/* Update over-utilization (tipping point, U >= 0) indicator */ +WRITE_ONCE (rd->overutilized, sg_status &SG_OVERUTILIZED ); + }else if (sg_status &SG_OVERUTILIZED ) { +WRITE_ONCE (env->dst_rq->rd->overutilized,SG_OVERUTILIZED ); } }
@@ -8398,6 +8444,14 @@ static struct sched_group *find_busiest_group(struct lb_env *env)* this level. */ update_sd_lb_stats (env, &sds); + +if (static_branch_unlikely (&sched_energy_present)) { +struct root_domain *rd = env->dst_rq->rd; + +if (rcu_dereference (rd->pd) && !READ_ONCE (rd->overutilized)) + goto out_balanced; + } + local = &sds.local_stat; busiest = &sds.busiest_stat;
@@ -9798,6 +9852,7 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr, int queued)task_tick_numa (rq, curr);update_misfit_status (curr, rq); +update_overutilized_status (task_rq (curr)); }/*
kernel/sched/sched.h +4 -0
@@ -718,6 +718,7 @@ struct perf_domain {/* Scheduling group status flags */ #define SG_OVERLOAD 0x1/* More than one runnable task on a CPU. */ +#define SG_OVERUTILIZED 0x2/* One or more CPUs are over-utilized. */ /* * We add the notion of a root-domain which will be used to define per-domain
@@ -741,6 +742,9 @@ struct root_domain {*/ int overload; +/* Indicate one or more cpus over-utilized (tipping point) */ +int overutilized; +/* * The bit corresponding to a CPU gets set here if such CPU has more * than one runnable -deadline task (as it is below for RT tasks).
PATCH v10 13/15 sched/fair: Introduce an energy estimation helper function
In reply to Quentin PerretIn preparation for the definition of an energy-aware wakeup path, introduce a helper function to estimate the consequence on system energy when a specific task wakes-up on a specific CPU. compute_energy() estimates the capacity state to be reached by all performance domains and estimates the consumption of each online CPU according to its Energy Model and its percentage of busy time.
--- kernel/sched/fair.c | 76 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+)
kernel/sched/fair.c +76 -0
@@ -6377,6 +6377,82 @@ static int wake_cap(struct task_struct *p, int cpu, int prev_cpu)return !task_fits_capacity (p, min_cap); } +/* +* Predicts what cpu_util(@cpu) would return if @p was migrated (and enqueued) +* to @dst_cpu. +*/ +static unsigned long cpu_util_next (int cpu,struct task_struct *p,int dst_cpu) +{ +struct cfs_rq *cfs_rq = &cpu_rq (cpu)->cfs; +unsigned long util_est, util =READ_ONCE (cfs_rq->avg.util_avg); + +/* +* If @p migrates from @cpu to another, remove its contribution. Or, +* if @p migrates from another CPU to @cpu, add its contribution. In +* the other cases, @cpu is not impacted by the migration, so the +* util_avg should already be correct. +*/ +if (task_cpu (p) == cpu && dst_cpu != cpu) +sub_positive (&util,task_util (p)); +else if (task_cpu (p) != cpu && dst_cpu == cpu) + util +=task_util (p); + +if (sched_feat (UTIL_EST )) { + util_est =READ_ONCE (cfs_rq->avg.util_est.enqueued); + +/* +* During wake-up, the task isn't enqueued yet and doesn't +* appear in the cfs_rq->avg.util_est.enqueued of any rq, +* so just add it (if needed) to "simulate" what will be +* cpu_util() after the task has been enqueued. +*/ +if (dst_cpu == cpu) + util_est +=_task_util_est (p); + + util =max (util, util_est); + } + +return min (util,capacity_orig_of (cpu)); +} + +/* +* compute_energy(): Estimates the energy that would be consumed if @p was +* migrated to @dst_cpu. compute_energy() predicts what will be the utilization +* landscape of the * CPUs after the task migration, and uses the Energy Model +* to compute what would be the energy if we decided to actually migrate that +* task. +*/ +static long +compute_energy (struct task_struct *p,int dst_cpu,struct perf_domain *pd) +{ +long util, max_util, sum_util, energy =0 ; +int cpu; + +for (; pd; pd = pd->next) { + max_util = sum_util =0 ; +/* +* The capacity state of CPUs of the current rd can be driven by +* CPUs of another rd if they belong to the same performance +* domain. So, account for the utilization of these CPUs too +* by masking pd with cpu_online_mask instead of the rd span. +* +* If an entire performance domain is outside of the current rd, +* it will not appear in its pd list and will not be accounted +* by compute_energy(). +*/ +for_each_cpu_and (cpu,perf_domain_span (pd), cpu_online_mask) { + util =cpu_util_next (cpu, p, dst_cpu); + util =schedutil_energy_util (cpu, util); + max_util =max (util, max_util); + sum_util += util; + } + + energy +=em_pd_energy (pd->em_pd, max_util, sum_util); + } + +return energy; +} +/* * select_task_rq_fair: Select target runqueue for the waking task in domains * that have the 'sd_flag' flag set. In practice, this is SD_BALANCE_WAKE,
Signature · 1 line
2.19.2
tip-bot for Quentin Perret
merge bot[tip:sched/core] sched/fair: Introduce an energy estimation helper function
sched/fair: Introduce an energy estimation helper function
Commit-ID: 390031e4c309c94ecc07a558187eb5185200df83 Gitweb: https://git.kernel.org/tip/390031e4c309c94ecc07a558187eb5185200df83 Author: Quentin Perret <[email protected]> AuthorDate: Mon, 3 Dec 2018 09:56:26 +0000 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 11 Dec 2018 15:17:02 +0100
sched/fair: Introduce an energy estimation helper function
In preparation for the definition of an energy-aware wakeup path, introduce a helper function to estimate the consequence on system energy when a specific task wakes-up on a specific CPU. compute_energy() estimates the capacity state to be reached by all performance domains and estimates the consumption of each online CPU according to its Energy Model and its percentage of busy time.
--- kernel/sched/fair.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+)
kernel/sched/fair.c +76 -0
@@ -6377,6 +6377,82 @@ static int wake_cap(struct task_struct *p, int cpu, int prev_cpu)return !task_fits_capacity (p, min_cap); } +/* +* Predicts what cpu_util(@cpu) would return if @p was migrated (and enqueued) +* to @dst_cpu. +*/ +static unsigned long cpu_util_next (int cpu,struct task_struct *p,int dst_cpu) +{ +struct cfs_rq *cfs_rq = &cpu_rq (cpu)->cfs; +unsigned long util_est, util =READ_ONCE (cfs_rq->avg.util_avg); + +/* +* If @p migrates from @cpu to another, remove its contribution. Or, +* if @p migrates from another CPU to @cpu, add its contribution. In +* the other cases, @cpu is not impacted by the migration, so the +* util_avg should already be correct. +*/ +if (task_cpu (p) == cpu && dst_cpu != cpu) +sub_positive (&util,task_util (p)); +else if (task_cpu (p) != cpu && dst_cpu == cpu) + util +=task_util (p); + +if (sched_feat (UTIL_EST )) { + util_est =READ_ONCE (cfs_rq->avg.util_est.enqueued); + +/* +* During wake-up, the task isn't enqueued yet and doesn't +* appear in the cfs_rq->avg.util_est.enqueued of any rq, +* so just add it (if needed) to "simulate" what will be +* cpu_util() after the task has been enqueued. +*/ +if (dst_cpu == cpu) + util_est +=_task_util_est (p); + + util =max (util, util_est); + } + +return min (util,capacity_orig_of (cpu)); +} + +/* +* compute_energy(): Estimates the energy that would be consumed if @p was +* migrated to @dst_cpu. compute_energy() predicts what will be the utilization +* landscape of the * CPUs after the task migration, and uses the Energy Model +* to compute what would be the energy if we decided to actually migrate that +* task. +*/ +static long +compute_energy (struct task_struct *p,int dst_cpu,struct perf_domain *pd) +{ +long util, max_util, sum_util, energy =0 ; +int cpu; + +for (; pd; pd = pd->next) { + max_util = sum_util =0 ; +/* +* The capacity state of CPUs of the current rd can be driven by +* CPUs of another rd if they belong to the same performance +* domain. So, account for the utilization of these CPUs too +* by masking pd with cpu_online_mask instead of the rd span. +* +* If an entire performance domain is outside of the current rd, +* it will not appear in its pd list and will not be accounted +* by compute_energy(). +*/ +for_each_cpu_and (cpu,perf_domain_span (pd), cpu_online_mask) { + util =cpu_util_next (cpu, p, dst_cpu); + util =schedutil_energy_util (cpu, util); + max_util =max (util, max_util); + sum_util += util; + } + + energy +=em_pd_energy (pd->em_pd, max_util, sum_util); + } + +return energy; +} +/* * select_task_rq_fair: Select target runqueue for the waking task in domains * that have the 'sd_flag' flag set. In practice, this is SD_BALANCE_WAKE,
PATCH v10 14/15 sched/fair: Select an energy-efficient CPU on task wake-up
In reply to Quentin PerretIf an Energy Model (EM) is available and if the system isn't overutilized, re-route waking tasks into an energy-aware placement algorithm. The selection of an energy-efficient CPU for a task is achieved by estimating the impact on system-level active energy resulting from the placement of the task on the CPU with the highest spare capacity in each performance domain. This strategy spreads tasks in a performance domain and avoids overly aggressive task packing. The best CPU energy-wise is then selected if it saves a large enough amount of energy with respect to prev_cpu.
Although it has already shown significant benefits on some existing targets, this approach cannot scale to platforms with numerous CPUs. This is an attempt to do something useful as writing a fast heuristic that performs reasonably well on a broad spectrum of architectures isn't an easy task. As such, the scope of usability of the energy-aware wake-up path is restricted to systems with the SD_ASYM_CPUCAPACITY flag set, and where the EM isn't too complex.
--- kernel/sched/fair.c | 143 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 141 insertions(+), 2 deletions(-)
kernel/sched/fair.c +141 -2
@@ -6453,6 +6453,137 @@ compute_energy(struct task_struct *p, int dst_cpu, struct perf_domain *pd)return energy; } +/* +* find_energy_efficient_cpu(): Find most energy-efficient target CPU for the +* waking task. find_energy_efficient_cpu() looks for the CPU with maximum +* spare capacity in each performance domain and uses it as a potential +* candidate to execute the task. Then, it uses the Energy Model to figure +* out which of the CPU candidates is the most energy-efficient. +* +* The rationale for this heuristic is as follows. In a performance domain, +* all the most energy efficient CPU candidates (according to the Energy +* Model) are those for which we'll request a low frequency. When there are +* several CPUs for which the frequency request will be the same, we don't +* have enough data to break the tie between them, because the Energy Model +* only includes active power costs. With this model, if we assume that +* frequency requests follow utilization (e.g. using schedutil), the CPU with +* the maximum spare capacity in a performance domain is guaranteed to be among +* the best candidates of the performance domain. +* +* In practice, it could be preferable from an energy standpoint to pack +* small tasks on a CPU in order to let other CPUs go in deeper idle states, +* but that could also hurt our chances to go cluster idle, and we have no +* ways to tell with the current Energy Model if this is actually a good +* idea or not. So, find_energy_efficient_cpu() basically favors +* cluster-packing, and spreading inside a cluster. That should at least be +* a good thing for latency, and this is consistent with the idea that most +* of the energy savings of EAS come from the asymmetry of the system, and +* not so much from breaking the tie between identical CPUs. That's also the +* reason why EAS is enabled in the topology code only for systems where +* SD_ASYM_CPUCAPACITY is set. +* +* NOTE: Forkees are not accepted in the energy-aware wake-up path because +* they don't have any useful utilization data yet and it's not possible to +* forecast their impact on energy consumption. Consequently, they will be +* placed by find_idlest_cpu() on the least loaded CPU, which might turn out +* to be energy-inefficient in some use-cases. The alternative would be to +* bias new tasks towards specific types of CPUs first, or to try to infer +* their util_avg from the parent task, but those heuristics could hurt +* other use-cases too. So, until someone finds a better way to solve this, +* let's keep things simple by re-using the existing slow path. +*/ + +static int find_energy_efficient_cpu (struct task_struct *p,int prev_cpu) +{ +unsigned long prev_energy =ULONG_MAX , best_energy =ULONG_MAX ; +struct root_domain *rd =cpu_rq (smp_processor_id ())->rd; +int cpu, best_energy_cpu = prev_cpu; +struct perf_domain *head, *pd; +unsigned long cpu_cap, util; +struct sched_domain *sd; + +rcu_read_lock (); + pd =rcu_dereference (rd->pd); +if (!pd ||READ_ONCE (rd->overutilized)) + goto fail; + head = pd; + +/* +* Energy-aware wake-up happens on the lowest sched_domain starting +* from sd_asym_cpucapacity spanning over this_cpu and prev_cpu. +*/ + sd =rcu_dereference (*this_cpu_ptr (&sd_asym_cpucapacity)); +while (sd && !cpumask_test_cpu (prev_cpu,sched_domain_span (sd))) + sd = sd->parent; +if (!sd) + goto fail; + +sync_entity_load_avg (&p->se); +if (!task_util_est (p)) + goto unlock; + +for (; pd; pd = pd->next) { +unsigned long cur_energy, spare_cap, max_spare_cap =0 ; +int max_spare_cap_cpu =-1 ; + +for_each_cpu_and (cpu,perf_domain_span (pd),sched_domain_span (sd)) { +if (!cpumask_test_cpu (cpu, &p->cpus_allowed)) +continue ; + +/* Skip CPUs that will be overutilized. */ + util =cpu_util_next (cpu, p, cpu); + cpu_cap =capacity_of (cpu); +if (cpu_cap *1024 < util * capacity_margin) +continue ; + +/* Always use prev_cpu as a candidate. */ +if (cpu == prev_cpu) { + prev_energy =compute_energy (p, prev_cpu, head); + best_energy =min (best_energy, prev_energy); +continue ; + } + +/* +* Find the CPU with the maximum spare capacity in +* the performance domain +*/ + spare_cap = cpu_cap - util; +if (spare_cap > max_spare_cap) { + max_spare_cap = spare_cap; + max_spare_cap_cpu = cpu; + } + } + +/* Evaluate the energy impact of using this CPU. */ +if (max_spare_cap_cpu >=0 ) { + cur_energy =compute_energy (p, max_spare_cap_cpu, head); +if (cur_energy < best_energy) { + best_energy = cur_energy; + best_energy_cpu = max_spare_cap_cpu; + } + } + } +unlock: +rcu_read_unlock (); + +/* +* Pick the best CPU if prev_cpu cannot be used, or if it saves at +* least 6% of the energy used by prev_cpu. +*/ +if (prev_energy ==ULONG_MAX ) +return best_energy_cpu; + +if ((prev_energy - best_energy) > (prev_energy >>4 )) +return best_energy_cpu; + +return prev_cpu; + +fail: +rcu_read_unlock (); + +return -1 ; +} +/* * select_task_rq_fair: Select target runqueue for the waking task in domains * that have the 'sd_flag' flag set. In practice, this is SD_BALANCE_WAKE,
@@ -6476,8 +6607,16 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_fif (sd_flag &SD_BALANCE_WAKE ) {record_wakee (p); - want_affine = !wake_wide (p) && !wake_cap (p, cpu, prev_cpu) - &&cpumask_test_cpu (cpu, &p->cpus_allowed); + +if (static_branch_unlikely (&sched_energy_present)) { + new_cpu =find_energy_efficient_cpu (p, prev_cpu); +if (new_cpu >=0 ) +return new_cpu; + new_cpu = prev_cpu; + } + + want_affine = !wake_wide (p) && !wake_cap (p, cpu, prev_cpu) && +cpumask_test_cpu (cpu, &p->cpus_allowed); }rcu_read_lock ();
Signature · 1 line
2.19.2
tip-bot for Quentin Perret
merge bot[tip:sched/core] sched/fair: Select an energy-efficient CPU on task wake-up
sched/fair: Select an energy-efficient CPU on task wake-up
Commit-ID: 732cd75b8c920d3727e69957b14faa7c2d7c3b75 Gitweb: https://git.kernel.org/tip/732cd75b8c920d3727e69957b14faa7c2d7c3b75 Author: Quentin Perret <[email protected]> AuthorDate: Mon, 3 Dec 2018 09:56:27 +0000 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 11 Dec 2018 15:17:02 +0100
sched/fair: Select an energy-efficient CPU on task wake-up
If an Energy Model (EM) is available and if the system isn't overutilized, re-route waking tasks into an energy-aware placement algorithm. The selection of an energy-efficient CPU for a task is achieved by estimating the impact on system-level active energy resulting from the placement of the task on the CPU with the highest spare capacity in each performance domain. This strategy spreads tasks in a performance domain and avoids overly aggressive task packing. The best CPU energy-wise is then selected if it saves a large enough amount of energy with respect to prev_cpu.
Although it has already shown significant benefits on some existing targets, this approach cannot scale to platforms with numerous CPUs. This is an attempt to do something useful as writing a fast heuristic that performs reasonably well on a broad spectrum of architectures isn't an easy task. As such, the scope of usability of the energy-aware wake-up path is restricted to systems with the SD_ASYM_CPUCAPACITY flag set, and where the EM isn't too complex.
--- kernel/sched/fair.c | 143 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 141 insertions(+), 2 deletions(-)
kernel/sched/fair.c +141 -2
@@ -6453,6 +6453,137 @@ compute_energy(struct task_struct *p, int dst_cpu, struct perf_domain *pd)return energy; } +/* +* find_energy_efficient_cpu(): Find most energy-efficient target CPU for the +* waking task. find_energy_efficient_cpu() looks for the CPU with maximum +* spare capacity in each performance domain and uses it as a potential +* candidate to execute the task. Then, it uses the Energy Model to figure +* out which of the CPU candidates is the most energy-efficient. +* +* The rationale for this heuristic is as follows. In a performance domain, +* all the most energy efficient CPU candidates (according to the Energy +* Model) are those for which we'll request a low frequency. When there are +* several CPUs for which the frequency request will be the same, we don't +* have enough data to break the tie between them, because the Energy Model +* only includes active power costs. With this model, if we assume that +* frequency requests follow utilization (e.g. using schedutil), the CPU with +* the maximum spare capacity in a performance domain is guaranteed to be among +* the best candidates of the performance domain. +* +* In practice, it could be preferable from an energy standpoint to pack +* small tasks on a CPU in order to let other CPUs go in deeper idle states, +* but that could also hurt our chances to go cluster idle, and we have no +* ways to tell with the current Energy Model if this is actually a good +* idea or not. So, find_energy_efficient_cpu() basically favors +* cluster-packing, and spreading inside a cluster. That should at least be +* a good thing for latency, and this is consistent with the idea that most +* of the energy savings of EAS come from the asymmetry of the system, and +* not so much from breaking the tie between identical CPUs. That's also the +* reason why EAS is enabled in the topology code only for systems where +* SD_ASYM_CPUCAPACITY is set. +* +* NOTE: Forkees are not accepted in the energy-aware wake-up path because +* they don't have any useful utilization data yet and it's not possible to +* forecast their impact on energy consumption. Consequently, they will be +* placed by find_idlest_cpu() on the least loaded CPU, which might turn out +* to be energy-inefficient in some use-cases. The alternative would be to +* bias new tasks towards specific types of CPUs first, or to try to infer +* their util_avg from the parent task, but those heuristics could hurt +* other use-cases too. So, until someone finds a better way to solve this, +* let's keep things simple by re-using the existing slow path. +*/ + +static int find_energy_efficient_cpu (struct task_struct *p,int prev_cpu) +{ +unsigned long prev_energy =ULONG_MAX , best_energy =ULONG_MAX ; +struct root_domain *rd =cpu_rq (smp_processor_id ())->rd; +int cpu, best_energy_cpu = prev_cpu; +struct perf_domain *head, *pd; +unsigned long cpu_cap, util; +struct sched_domain *sd; + +rcu_read_lock (); + pd =rcu_dereference (rd->pd); +if (!pd ||READ_ONCE (rd->overutilized)) + goto fail; + head = pd; + +/* +* Energy-aware wake-up happens on the lowest sched_domain starting +* from sd_asym_cpucapacity spanning over this_cpu and prev_cpu. +*/ + sd =rcu_dereference (*this_cpu_ptr (&sd_asym_cpucapacity)); +while (sd && !cpumask_test_cpu (prev_cpu,sched_domain_span (sd))) + sd = sd->parent; +if (!sd) + goto fail; + +sync_entity_load_avg (&p->se); +if (!task_util_est (p)) + goto unlock; + +for (; pd; pd = pd->next) { +unsigned long cur_energy, spare_cap, max_spare_cap =0 ; +int max_spare_cap_cpu =-1 ; + +for_each_cpu_and (cpu,perf_domain_span (pd),sched_domain_span (sd)) { +if (!cpumask_test_cpu (cpu, &p->cpus_allowed)) +continue ; + +/* Skip CPUs that will be overutilized. */ + util =cpu_util_next (cpu, p, cpu); + cpu_cap =capacity_of (cpu); +if (cpu_cap *1024 < util * capacity_margin) +continue ; + +/* Always use prev_cpu as a candidate. */ +if (cpu == prev_cpu) { + prev_energy =compute_energy (p, prev_cpu, head); + best_energy =min (best_energy, prev_energy); +continue ; + } + +/* +* Find the CPU with the maximum spare capacity in +* the performance domain +*/ + spare_cap = cpu_cap - util; +if (spare_cap > max_spare_cap) { + max_spare_cap = spare_cap; + max_spare_cap_cpu = cpu; + } + } + +/* Evaluate the energy impact of using this CPU. */ +if (max_spare_cap_cpu >=0 ) { + cur_energy =compute_energy (p, max_spare_cap_cpu, head); +if (cur_energy < best_energy) { + best_energy = cur_energy; + best_energy_cpu = max_spare_cap_cpu; + } + } + } +unlock: +rcu_read_unlock (); + +/* +* Pick the best CPU if prev_cpu cannot be used, or if it saves at +* least 6% of the energy used by prev_cpu. +*/ +if (prev_energy ==ULONG_MAX ) +return best_energy_cpu; + +if ((prev_energy - best_energy) > (prev_energy >>4 )) +return best_energy_cpu; + +return prev_cpu; + +fail: +rcu_read_unlock (); + +return -1 ; +} +/* * select_task_rq_fair: Select target runqueue for the waking task in domains * that have the 'sd_flag' flag set. In practice, this is SD_BALANCE_WAKE,
@@ -6476,8 +6607,16 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_fif (sd_flag &SD_BALANCE_WAKE ) {record_wakee (p); - want_affine = !wake_wide (p) && !wake_cap (p, cpu, prev_cpu) - &&cpumask_test_cpu (cpu, &p->cpus_allowed); + +if (static_branch_unlikely (&sched_energy_present)) { + new_cpu =find_energy_efficient_cpu (p, prev_cpu); +if (new_cpu >=0 ) +return new_cpu; + new_cpu = prev_cpu; + } + + want_affine = !wake_wide (p) && !wake_cap (p, cpu, prev_cpu) && +cpumask_test_cpu (cpu, &p->cpus_allowed); }rcu_read_lock ();
PATCH v10 15/15 OPTIONAL: cpufreq: dt: Register an Energy Model
In reply to Quentin Perret*******************************************************************
* This patch illustrates the usage of the newly introduced Energy *
* Model framework and isn't supposed to be merged as-is. *
*******************************************************************
The Energy Model framework provides an API to register the active power of CPUs. Call this API from the cpufreq-dt driver with an estimation of the power as P = C * V^2 * f with C, V, and f respectively the capacitance of the CPU and the voltage and frequency of the OPP.
The CPU capacitance is read from the "dynamic-power-coefficient" DT binding (originally introduced for thermal/IPA), and the voltage and frequency values from PM_OPP.
--- drivers/cpufreq/cpufreq-dt.c | 48 +++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-)
drivers/cpufreq/cpufreq-dt.c +47 -1
@@ -16,6 +16,7 @@#include <linux/cpu_cooling.h> #include <linux/cpufreq.h> #include <linux/cpumask.h> +#include <linux/energy_model.h> #include <linux/err.h> #include <linux/module.h> #include <linux/of.h>
@@ -150,8 +151,50 @@ static int resources_available(void)return 0 ; } +static int __maybe_unused of_est_power (unsigned long *mW,unsigned long *KHz, +int cpu) +{ +unsigned long mV, Hz, MHz; +struct device *cpu_dev; +struct dev_pm_opp *opp; +struct device_node *np; +u32 cap; +u64 tmp; + + cpu_dev =get_cpu_device (cpu); +if (!cpu_dev) +return -ENODEV ; + + np =of_node_get (cpu_dev->of_node); +if (!np) +return -EINVAL ; + +if (of_property_read_u32 (np,"dynamic-power-coefficient" , &cap)) +return -EINVAL ; + + Hz = *KHz *1000 ; + opp =dev_pm_opp_find_freq_ceil (cpu_dev, &Hz); +if (IS_ERR (opp)) +return -EINVAL ; + + mV =dev_pm_opp_get_voltage (opp) /1000 ; +dev_pm_opp_put (opp); +if (!mV) +return -EINVAL ; + + MHz = Hz /1000000 ; + tmp = (u64 )cap * mV * mV * MHz; +do_div (tmp,1000000000 ); + + *mW = (unsigned long )tmp; + *KHz = Hz /1000 ; + +return 0 ; +} +static int cpufreq_init (struct cpufreq_policy *policy) { +struct em_data_callback em_cb =EM_DATA_CB (of_est_power);struct cpufreq_frequency_table *freq_table;struct opp_table *opp_table =NULL ;struct private_data *priv;
@@ -160,7 +203,7 @@ static int cpufreq_init(struct cpufreq_policy *policy)unsigned int transition_latency;bool fallback = false;const char *name; -int ret; +int ret, nr_opp; cpu_dev =get_cpu_device (policy->cpu);if (!cpu_dev) {
@@ -237,6 +280,7 @@ static int cpufreq_init(struct cpufreq_policy *policy) ret = -EPROBE_DEFER ; goto out_free_opp; } + nr_opp = ret;if (fallback) {cpumask_setall (policy->cpus);
@@ -280,6 +324,8 @@ static int cpufreq_init(struct cpufreq_policy *policy) policy->cpuinfo.transition_latency = transition_latency; policy->dvfs_possible_from_any_cpu = true; +em_register_perf_domain (policy->cpus, nr_opp, &em_cb); +return 0 ; out_free_cpufreq_table:
Signature · 1 line
2.19.2
Re: [PATCH v10 15/15] OPTIONAL: cpufreq: dt: Register an Energy Model
Hi Quentin,
Quoted 102 lines · Quentin Perret
*******************************************************************
* This patch illustrates the usage of the newly introduced Energy *
* Model framework and isn't supposed to be merged as-is. *
*******************************************************************The Energy Model framework provides an API to register the active power of CPUs. Call this API from the cpufreq-dt driver with an estimation of the power as P = C * V^2 * f with C, V, and f respectively the capacitance of the CPU and the voltage and frequency of the OPP.
The CPU capacitance is read from the "dynamic-power-coefficient" DT binding (originally introduced for thermal/IPA), and the voltage and frequency values from
PM_OPP.Cc "Rafael J. Wysocki" <[email protected]>Cc Viresh Kumar <[email protected]>Signed-off-by Quentin Perret <[email protected]>--- drivers/cpufreq/cpufreq-dt.c | 48 +++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-)drivers/cpufreq/cpufreq-dt.c +45
-1@@ -16,6 +16,7 @@#include <linux/cpu_cooling.h> #include <linux/cpufreq.h> #include <linux/cpumask.h> +#include <linux/energy_model.h> #include <linux/err.h> #include <linux/module.h> #include <linux/of.h> @@ -150,8 +151,50 @@ static int resources_available(void)return 0 ; } +static int __maybe_unused of_est_power (unsigned long *mW,unsigned long *KHz, +int cpu) +{ +unsigned long mV, Hz, MHz; +struct device *cpu_dev; +struct dev_pm_opp *opp; +struct device_node *np; +u32 cap; +u64 tmp; + + cpu_dev =get_cpu_device (cpu); +if (!cpu_dev) +return -ENODEV ; + + np =of_node_get (cpu_dev->of_node); +if (!np) +return -EINVAL ; + +if (of_property_read_u32 (np,"dynamic-power-coefficient" , &cap)) +return -EINVAL ; + + Hz = *KHz *1000 ; + opp =dev_pm_opp_find_freq_ceil (cpu_dev, &Hz); +if (IS_ERR (opp)) +return -EINVAL ; + + mV =dev_pm_opp_get_voltage (opp) /1000 ; +dev_pm_opp_put (opp); +if (!mV) +return -EINVAL ; + + MHz = Hz /1000000 ; + tmp = (u64 )cap * mV * mV * MHz; +do_div (tmp,1000000000 ); + + *mW = (unsigned long )tmp; + *KHz = Hz /1000 ; + +return 0 ; +} +static int cpufreq_init (struct cpufreq_policy *policy) { +struct em_data_callback em_cb =EM_DATA_CB (of_est_power);struct cpufreq_frequency_table *freq_table;struct opp_table *opp_table =NULL ;struct private_data *priv;@@ -160,7 +203,7 @@ static int cpufreq_init(struct cpufreq_policy *policy)unsigned int transition_latency;bool fallback = false;const char *name; -int ret; +int ret, nr_opp; cpu_dev =get_cpu_device (policy->cpu);if (!cpu_dev) {@@ -237,6 +280,7 @@ static int cpufreq_init(struct cpufreq_policy *policy) ret = -EPROBE_DEFER ; goto out_free_opp; } + nr_opp = ret;if (fallback) {cpumask_setall (policy->cpus);
drivers/cpufreq/cpufreq-dt.c static int cpufreq_init(struct cpufreq_policy *policy) · line 327
Quoted 4 lines
drivers/cpufreq/cpufreq-dt.c +1
-0@@ -280,6 +324,8 @@ static int cpufreq_init(struct cpufreq_policy *policy) policy->cpuinfo.transition_latency = transition_latency; policy->dvfs_possible_from_any_cpu = true; +em_register_perf_domain (policy->cpus, nr_opp, &em_cb);
Shouldn't there also be a function to unregister a perf domain to be called from cpufreq_exit()?
->exit() is called on suspend when the CPUs are taken offline, and ->init() on resume, hence em_register_perf_domain() is called multiple times, but without doing any cleanup.
Cheers
Matthias
Re: [PATCH v10 15/15] OPTIONAL: cpufreq: dt: Register an Energy Model
Hi Matthias ,
Quoted 27 lines · Matthias Kaehlcke
Quoted 27 lines
static int
cpufreq_init(struct cpufreq_policy *policy){drivers/cpufreq/cpufreq-dt.c +3
-1+struct em_data_callback em_cb =EM_DATA_CB (of_est_power);struct cpufreq_frequency_table *freq_table;struct opp_table *opp_table =NULL ;struct private_data *priv;@@ -160,7 +203,7 @@ static int cpufreq_init(struct cpufreq_policy *policy)unsigned int transition_latency;bool fallback = false;const char *name; -int ret; +int ret, nr_opp; cpu_dev =get_cpu_device (policy->cpu);if (!cpu_dev) {@@ -237,6 +280,7 @@ static int cpufreq_init(struct cpufreq_policy *policy) ret = -EPROBE_DEFER ; goto out_free_opp; } + nr_opp = ret;if (fallback) {cpumask_setall (policy->cpus);@@ -280,6 +324,8 @@ static int cpufreq_init(struct cpufreq_policy *policy) policy->cpuinfo.transition_latency = transition_latency; policy->dvfs_possible_from_any_cpu = true;
Quoted 8 lines
drivers/cpufreq/cpufreq-dt.c static int cpufreq_init(struct cpufreq_policy *policy) · line 327
Quoted 1 line
drivers/cpufreq/cpufreq-dt.c +1
-0+em_register_perf_domain (policy->cpus, nr_opp, &em_cb);Shouldn't there also be a function to unregister a perf domain to be called from
cpufreq_exit()?->exit() is called on suspend when the CPUs are taken offline, and ->init() on resume, hence
em_register_perf_domain()is called multiple times, but without doing any cleanup.
Right, but this is safe to do as em_register_perf_domain() checks for the existence of the domain straight away. So the second time you call this em_register_perf_domain() should just bail out. Are you seeing an issue with this ?
As of now, the EM framework is really simple -- it justs allocates the pd tables once during boot, and they stay in memory forever. While arguably less than optimal, that makes things a whole lot easier to manage on the client side (i.e. the scheduler) w/o needing RCU protection or so.
Thanks,
Quentin
Re: [PATCH v10 15/15] OPTIONAL: cpufreq: dt: Register an Energy Model
Quoted 44 lines · Quentin Perret
Hi Matthias ,
Quoted 27 lines · Matthias Kaehlcke
Quoted 27 lines
static int
cpufreq_init(struct cpufreq_policy *policy){drivers/cpufreq/cpufreq-dt.c +3
-1+struct em_data_callback em_cb =EM_DATA_CB (of_est_power);struct cpufreq_frequency_table *freq_table;struct opp_table *opp_table =NULL ;struct private_data *priv;@@ -160,7 +203,7 @@ static int cpufreq_init(struct cpufreq_policy *policy)unsigned int transition_latency;bool fallback = false;const char *name; -int ret; +int ret, nr_opp; cpu_dev =get_cpu_device (policy->cpu);if (!cpu_dev) {@@ -237,6 +280,7 @@ static int cpufreq_init(struct cpufreq_policy *policy) ret = -EPROBE_DEFER ; goto out_free_opp; } + nr_opp = ret;if (fallback) {cpumask_setall (policy->cpus);@@ -280,6 +324,8 @@ static int cpufreq_init(struct cpufreq_policy *policy) policy->cpuinfo.transition_latency = transition_latency; policy->dvfs_possible_from_any_cpu = true;Quoted 8 lines
drivers/cpufreq/cpufreq-dt.c static int cpufreq_init(struct cpufreq_policy *policy) · line 327
Quoted 1 line
drivers/cpufreq/cpufreq-dt.c +1
-0+em_register_perf_domain (policy->cpus, nr_opp, &em_cb);Shouldn't there also be a function to unregister a perf domain to be called from
cpufreq_exit()?->exit() is called on suspend when the CPUs are taken offline, and ->init() on resume, hence
em_register_perf_domain()is called multiple times, but without doing any cleanup.Right, but this is safe to do as
em_register_perf_domain()checks for the existence of the domain straight away. So the second time you call thisem_register_perf_domain()should just bail out. Are you seeing an issue with this ?
Quoted 5 lines
As of now, the EM framework is really simple -- it justs allocates the pd tables once during boot, and they stay in memory forever. While arguably less than optimal, that makes things a whole lot easier to manage on the client side (i.e. the scheduler) w/o needing RCU protection or so.
I think registering the perf domain only once is fine, since the info isn't supposed to change and will likely be used again after _exit(). However since we have em_cpu_get() I'd suggest to use it and only call em_register_perf_domain() if no perf domain is registered yet for the CPU. This makes it more evident that the registration is only done once and simplifies error handling (currently not done at all), since it's not necessary to check for the special case -EEXIST.
Cheers
Matthias
Re: [PATCH v10 15/15] OPTIONAL: cpufreq: dt: Register an Energy Model
Quoted 7 lines · Matthias Kaehlcke
I think registering the perf domain only once is fine, since the info isn't supposed to change and will likely be used again after
_exit(). However since we haveem_cpu_get()I'd suggest to use it and only callem_register_perf_domain()if no perf domain is registered yet for the CPU. This makes it more evident that the registration is only done once and simplifies error handling (currently not done at all), since it's not necessary to check for the special case-EEXIST.
Right, a check on em_cpu_get() on the driver side shouldn't hurt. We don't actually have upstream drivers using that API yet but I intend to change that soon. I guess we'll need to have that discussion with each individual CPUFreq driver maintainer but that hopefully shouldn't be a problem.
Thanks for the feedback,
Quentin