| Message ID | 9a5442b916f9667e714dd84fe4e3fc26f8bcc887.1606198885.git.viresh.kumar@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | cpufreq_cooling: Get effective CPU utilization from scheduler | expand |
Hey Viresh, On Tuesday 24 Nov 2020 at 11:56:15 (+0530), Viresh Kumar wrote: > There is nothing schedutil specific in schedutil_cpu_util(), rename it > to effective_cpu_util(). Also create and expose another wrapper > sched_cpu_util() which can be used by other parts of the kernel, like > thermal core (that will be done in a later commit). > > Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> > --- > include/linux/sched.h | 21 +++++++++++++++++++++ > kernel/sched/core.c | 11 +++++++++-- > kernel/sched/cpufreq_schedutil.c | 2 +- > kernel/sched/fair.c | 6 +++--- > kernel/sched/sched.h | 19 ++----------------- > 5 files changed, 36 insertions(+), 23 deletions(-) > > diff --git a/include/linux/sched.h b/include/linux/sched.h > index 063cd120b459..926b944dae5e 100644 > --- a/include/linux/sched.h > +++ b/include/linux/sched.h > @@ -1926,6 +1926,27 @@ extern long sched_getaffinity(pid_t pid, struct cpumask *mask); > #define TASK_SIZE_OF(tsk) TASK_SIZE > #endif > > +#ifdef CONFIG_SMP > +/** > + * enum cpu_util_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 sched_cpu_util() to differentiate the types of > + * utilization expected by the callers, and adjust the aggregation accordingly. > + */ > +enum cpu_util_type { > + FREQUENCY_UTIL, > + ENERGY_UTIL, > +}; > + > +/* Returns effective CPU utilization, as seen by the scheduler */ > +unsigned long sched_cpu_util(int cpu, enum cpu_util_type type, > + unsigned long max); Are 'type' and 'max' useful to anybody outside of kernel/sched ? If not then how about we hide them, keep the cpu_util_type enum in kernel/sched/sched.h and evaluate arch_scale_cpu_capacity() in sched_cpu_util() directly? Thanks, Quentin
On 24-11-20, 09:10, Quentin Perret wrote: > Hey Viresh, > > On Tuesday 24 Nov 2020 at 11:56:15 (+0530), Viresh Kumar wrote: > > There is nothing schedutil specific in schedutil_cpu_util(), rename it > > to effective_cpu_util(). Also create and expose another wrapper > > sched_cpu_util() which can be used by other parts of the kernel, like > > thermal core (that will be done in a later commit). > > > > Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> > > --- > > include/linux/sched.h | 21 +++++++++++++++++++++ > > kernel/sched/core.c | 11 +++++++++-- > > kernel/sched/cpufreq_schedutil.c | 2 +- > > kernel/sched/fair.c | 6 +++--- > > kernel/sched/sched.h | 19 ++----------------- > > 5 files changed, 36 insertions(+), 23 deletions(-) > > > > diff --git a/include/linux/sched.h b/include/linux/sched.h > > index 063cd120b459..926b944dae5e 100644 > > --- a/include/linux/sched.h > > +++ b/include/linux/sched.h > > @@ -1926,6 +1926,27 @@ extern long sched_getaffinity(pid_t pid, struct cpumask *mask); > > #define TASK_SIZE_OF(tsk) TASK_SIZE > > #endif > > > > +#ifdef CONFIG_SMP > > +/** > > + * enum cpu_util_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 sched_cpu_util() to differentiate the types of > > + * utilization expected by the callers, and adjust the aggregation accordingly. > > + */ > > +enum cpu_util_type { > > + FREQUENCY_UTIL, > > + ENERGY_UTIL, > > +}; > > + > > +/* Returns effective CPU utilization, as seen by the scheduler */ > > +unsigned long sched_cpu_util(int cpu, enum cpu_util_type type, > > + unsigned long max); > > Are 'type' and 'max' useful to anybody outside of kernel/sched ? > If not then how about we hide them, keep the cpu_util_type enum in > kernel/sched/sched.h and evaluate arch_scale_cpu_capacity() in > sched_cpu_util() directly? cpufreq_cooling uses 'max' (as can be seen in the next patch). -- viresh
On Tue, Nov 24, 2020 at 7:26 AM Viresh Kumar <viresh.kumar@linaro.org> wrote: > > There is nothing schedutil specific in schedutil_cpu_util(), rename it > to effective_cpu_util(). Also create and expose another wrapper > sched_cpu_util() which can be used by other parts of the kernel, like > thermal core (that will be done in a later commit). > > Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> For the schedutil change: Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > --- > include/linux/sched.h | 21 +++++++++++++++++++++ > kernel/sched/core.c | 11 +++++++++-- > kernel/sched/cpufreq_schedutil.c | 2 +- > kernel/sched/fair.c | 6 +++--- > kernel/sched/sched.h | 19 ++----------------- > 5 files changed, 36 insertions(+), 23 deletions(-) > > diff --git a/include/linux/sched.h b/include/linux/sched.h > index 063cd120b459..926b944dae5e 100644 > --- a/include/linux/sched.h > +++ b/include/linux/sched.h > @@ -1926,6 +1926,27 @@ extern long sched_getaffinity(pid_t pid, struct cpumask *mask); > #define TASK_SIZE_OF(tsk) TASK_SIZE > #endif > > +#ifdef CONFIG_SMP > +/** > + * enum cpu_util_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 sched_cpu_util() to differentiate the types of > + * utilization expected by the callers, and adjust the aggregation accordingly. > + */ > +enum cpu_util_type { > + FREQUENCY_UTIL, > + ENERGY_UTIL, > +}; > + > +/* Returns effective CPU utilization, as seen by the scheduler */ > +unsigned long sched_cpu_util(int cpu, enum cpu_util_type type, > + unsigned long max); > +#endif /* CONFIG_SMP */ > + > #ifdef CONFIG_RSEQ > > /* > diff --git a/kernel/sched/core.c b/kernel/sched/core.c > index b81265aec4a0..845c976ccd53 100644 > --- a/kernel/sched/core.c > +++ b/kernel/sched/core.c > @@ -5138,8 +5138,8 @@ struct task_struct *idle_task(int cpu) > * based on the task model parameters and gives the minimal utilization > * required to meet deadlines. > */ > -unsigned long schedutil_cpu_util(int cpu, unsigned long util_cfs, > - unsigned long max, enum schedutil_type type, > +unsigned long effective_cpu_util(int cpu, unsigned long util_cfs, > + unsigned long max, enum cpu_util_type type, > struct task_struct *p) > { > unsigned long dl_util, util, irq; > @@ -5223,6 +5223,13 @@ unsigned long schedutil_cpu_util(int cpu, unsigned long util_cfs, > > return min(max, util); > } > + > +unsigned long sched_cpu_util(int cpu, enum cpu_util_type type, > + unsigned long max) > +{ > + return effective_cpu_util(cpu, cpu_util_cfs(cpu_rq(cpu)), max, type, > + NULL); > +} > #endif /* CONFIG_SMP */ > > /** > diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c > index 2d44befb322b..e71627a3792b 100644 > --- a/kernel/sched/cpufreq_schedutil.c > +++ b/kernel/sched/cpufreq_schedutil.c > @@ -178,7 +178,7 @@ static unsigned long sugov_get_util(struct sugov_cpu *sg_cpu) > sg_cpu->max = max; > sg_cpu->bw_dl = cpu_bw_dl(rq); > > - return schedutil_cpu_util(sg_cpu->cpu, util, max, FREQUENCY_UTIL, NULL); > + return effective_cpu_util(sg_cpu->cpu, util, max, FREQUENCY_UTIL, NULL); > } > > /** > diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c > index 290f9e38378c..0e1c8eb7ad53 100644 > --- a/kernel/sched/fair.c > +++ b/kernel/sched/fair.c > @@ -6499,7 +6499,7 @@ compute_energy(struct task_struct *p, int dst_cpu, struct perf_domain *pd) > * is already enough to scale the EM reported power > * consumption at the (eventually clamped) cpu_capacity. > */ > - sum_util += schedutil_cpu_util(cpu, util_cfs, cpu_cap, > + sum_util += effective_cpu_util(cpu, util_cfs, cpu_cap, > ENERGY_UTIL, NULL); > > /* > @@ -6509,7 +6509,7 @@ compute_energy(struct task_struct *p, int dst_cpu, struct perf_domain *pd) > * NOTE: in case RT tasks are running, by default the > * FREQUENCY_UTIL's utilization can be max OPP. > */ > - cpu_util = schedutil_cpu_util(cpu, util_cfs, cpu_cap, > + cpu_util = effective_cpu_util(cpu, util_cfs, cpu_cap, > FREQUENCY_UTIL, tsk); > max_util = max(max_util, cpu_util); > } > @@ -6607,7 +6607,7 @@ static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu) > * IOW, placing the task there would make the CPU > * overutilized. Take uclamp into account to see how > * much capacity we can get out of the CPU; this is > - * aligned with schedutil_cpu_util(). > + * aligned with sched_cpu_util(). > */ > util = uclamp_rq_util_with(cpu_rq(cpu), util, p); > if (!fits_capacity(util, cpu_cap)) > diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h > index 0db6bcf0881f..4fab3b930ace 100644 > --- a/kernel/sched/sched.h > +++ b/kernel/sched/sched.h > @@ -2485,23 +2485,8 @@ static inline unsigned long capacity_orig_of(int cpu) > return cpu_rq(cpu)->cpu_capacity_orig; > } > > -/** > - * 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_cpu_util(int cpu, unsigned long util_cfs, > - unsigned long max, enum schedutil_type type, > +unsigned long effective_cpu_util(int cpu, unsigned long util_cfs, > + unsigned long max, enum cpu_util_type type, > struct task_struct *p); > > static inline unsigned long cpu_bw_dl(struct rq *rq) > -- > 2.25.0.rc1.19.g042ed3e048af >
On 24/11/2020 14:22, Viresh Kumar wrote: > On 24-11-20, 09:10, Quentin Perret wrote: >> Hey Viresh, >> >> On Tuesday 24 Nov 2020 at 11:56:15 (+0530), Viresh Kumar wrote: >>> There is nothing schedutil specific in schedutil_cpu_util(), rename it >>> to effective_cpu_util(). Also create and expose another wrapper >>> sched_cpu_util() which can be used by other parts of the kernel, like >>> thermal core (that will be done in a later commit). >>> >>> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> >>> --- >>> include/linux/sched.h | 21 +++++++++++++++++++++ >>> kernel/sched/core.c | 11 +++++++++-- >>> kernel/sched/cpufreq_schedutil.c | 2 +- >>> kernel/sched/fair.c | 6 +++--- >>> kernel/sched/sched.h | 19 ++----------------- >>> 5 files changed, 36 insertions(+), 23 deletions(-) >>> >>> diff --git a/include/linux/sched.h b/include/linux/sched.h >>> index 063cd120b459..926b944dae5e 100644 >>> --- a/include/linux/sched.h >>> +++ b/include/linux/sched.h >>> @@ -1926,6 +1926,27 @@ extern long sched_getaffinity(pid_t pid, struct cpumask *mask); >>> #define TASK_SIZE_OF(tsk) TASK_SIZE >>> #endif >>> >>> +#ifdef CONFIG_SMP >>> +/** >>> + * enum cpu_util_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 sched_cpu_util() to differentiate the types of >>> + * utilization expected by the callers, and adjust the aggregation accordingly. >>> + */ >>> +enum cpu_util_type { >>> + FREQUENCY_UTIL, >>> + ENERGY_UTIL, >>> +}; >>> + >>> +/* Returns effective CPU utilization, as seen by the scheduler */ >>> +unsigned long sched_cpu_util(int cpu, enum cpu_util_type type, >>> + unsigned long max); >> >> Are 'type' and 'max' useful to anybody outside of kernel/sched ? >> If not then how about we hide them, keep the cpu_util_type enum in >> kernel/sched/sched.h and evaluate arch_scale_cpu_capacity() in >> sched_cpu_util() directly? > > cpufreq_cooling uses 'max' (as can be seen in the next patch). But the enum cpu_util_type type doesn't have to be exported outside the task scheduler code? --8<-- diff --git a/drivers/thermal/cpufreq_cooling.c b/drivers/thermal/cpufreq_cooling.c index 5aff2ac4b77f..cd9d717654a8 100644 --- a/drivers/thermal/cpufreq_cooling.c +++ b/drivers/thermal/cpufreq_cooling.c @@ -149,7 +149,7 @@ static u32 get_load(struct cpufreq_cooling_device *cpufreq_cdev, int cpu, unsigned long max = arch_scale_cpu_capacity(cpu); unsigned long util; - util = sched_cpu_util(cpu, ENERGY_UTIL, max); + util = sched_cpu_util(cpu, max); return (util * 100) / max; } diff --git a/include/linux/sched.h b/include/linux/sched.h index fcd70c075349..0511e4fb946f 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1954,24 +1954,8 @@ extern long sched_getaffinity(pid_t pid, struct cpumask *mask); #endif #ifdef CONFIG_SMP -/** - * enum cpu_util_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 sched_cpu_util() to differentiate the types of - * utilization expected by the callers, and adjust the aggregation accordingly. - */ -enum cpu_util_type { - FREQUENCY_UTIL, - ENERGY_UTIL, -}; - /* Returns effective CPU utilization, as seen by the scheduler */ -unsigned long sched_cpu_util(int cpu, enum cpu_util_type type, - unsigned long max); +unsigned long sched_cpu_util(int cpu, unsigned long max); #endif /* CONFIG_SMP */ #ifdef CONFIG_RSEQ diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 7f20dacc2fa7..270f10e01ad2 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -5757,11 +5757,10 @@ unsigned long effective_cpu_util(int cpu, unsigned long util_cfs, return min(max, util); } -unsigned long sched_cpu_util(int cpu, enum cpu_util_type type, - unsigned long max) +unsigned long sched_cpu_util(int cpu, unsigned long max) { - return effective_cpu_util(cpu, cpu_util_cfs(cpu_rq(cpu)), max, type, - NULL); + return effective_cpu_util(cpu, cpu_util_cfs(cpu_rq(cpu)), max, + ENERGY_UTIL, NULL); } #endif /* CONFIG_SMP */ diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index b7611020d5cf..a49d6c3e9147 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -2561,6 +2561,21 @@ static inline unsigned long capacity_orig_of(int cpu) return cpu_rq(cpu)->cpu_capacity_orig; } +/** + * enum cpu_util_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 sched_cpu_util() to differentiate the types of + * utilization expected by the callers, and adjust the aggregation accordingly. + */ +enum cpu_util_type { + FREQUENCY_UTIL, + ENERGY_UTIL, +}; + unsigned long effective_cpu_util(int cpu, unsigned long util_cfs, unsigned long max, enum cpu_util_type type, struct task_struct *p); -- 2.17.1
diff --git a/include/linux/sched.h b/include/linux/sched.h index 063cd120b459..926b944dae5e 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1926,6 +1926,27 @@ extern long sched_getaffinity(pid_t pid, struct cpumask *mask); #define TASK_SIZE_OF(tsk) TASK_SIZE #endif +#ifdef CONFIG_SMP +/** + * enum cpu_util_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 sched_cpu_util() to differentiate the types of + * utilization expected by the callers, and adjust the aggregation accordingly. + */ +enum cpu_util_type { + FREQUENCY_UTIL, + ENERGY_UTIL, +}; + +/* Returns effective CPU utilization, as seen by the scheduler */ +unsigned long sched_cpu_util(int cpu, enum cpu_util_type type, + unsigned long max); +#endif /* CONFIG_SMP */ + #ifdef CONFIG_RSEQ /* diff --git a/kernel/sched/core.c b/kernel/sched/core.c index b81265aec4a0..845c976ccd53 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -5138,8 +5138,8 @@ struct task_struct *idle_task(int cpu) * based on the task model parameters and gives the minimal utilization * required to meet deadlines. */ -unsigned long schedutil_cpu_util(int cpu, unsigned long util_cfs, - unsigned long max, enum schedutil_type type, +unsigned long effective_cpu_util(int cpu, unsigned long util_cfs, + unsigned long max, enum cpu_util_type type, struct task_struct *p) { unsigned long dl_util, util, irq; @@ -5223,6 +5223,13 @@ unsigned long schedutil_cpu_util(int cpu, unsigned long util_cfs, return min(max, util); } + +unsigned long sched_cpu_util(int cpu, enum cpu_util_type type, + unsigned long max) +{ + return effective_cpu_util(cpu, cpu_util_cfs(cpu_rq(cpu)), max, type, + NULL); +} #endif /* CONFIG_SMP */ /** diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c index 2d44befb322b..e71627a3792b 100644 --- a/kernel/sched/cpufreq_schedutil.c +++ b/kernel/sched/cpufreq_schedutil.c @@ -178,7 +178,7 @@ static unsigned long sugov_get_util(struct sugov_cpu *sg_cpu) sg_cpu->max = max; sg_cpu->bw_dl = cpu_bw_dl(rq); - return schedutil_cpu_util(sg_cpu->cpu, util, max, FREQUENCY_UTIL, NULL); + return effective_cpu_util(sg_cpu->cpu, util, max, FREQUENCY_UTIL, NULL); } /** diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 290f9e38378c..0e1c8eb7ad53 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -6499,7 +6499,7 @@ compute_energy(struct task_struct *p, int dst_cpu, struct perf_domain *pd) * is already enough to scale the EM reported power * consumption at the (eventually clamped) cpu_capacity. */ - sum_util += schedutil_cpu_util(cpu, util_cfs, cpu_cap, + sum_util += effective_cpu_util(cpu, util_cfs, cpu_cap, ENERGY_UTIL, NULL); /* @@ -6509,7 +6509,7 @@ compute_energy(struct task_struct *p, int dst_cpu, struct perf_domain *pd) * NOTE: in case RT tasks are running, by default the * FREQUENCY_UTIL's utilization can be max OPP. */ - cpu_util = schedutil_cpu_util(cpu, util_cfs, cpu_cap, + cpu_util = effective_cpu_util(cpu, util_cfs, cpu_cap, FREQUENCY_UTIL, tsk); max_util = max(max_util, cpu_util); } @@ -6607,7 +6607,7 @@ static int find_energy_efficient_cpu(struct task_struct *p, int prev_cpu) * IOW, placing the task there would make the CPU * overutilized. Take uclamp into account to see how * much capacity we can get out of the CPU; this is - * aligned with schedutil_cpu_util(). + * aligned with sched_cpu_util(). */ util = uclamp_rq_util_with(cpu_rq(cpu), util, p); if (!fits_capacity(util, cpu_cap)) diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 0db6bcf0881f..4fab3b930ace 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -2485,23 +2485,8 @@ static inline unsigned long capacity_orig_of(int cpu) return cpu_rq(cpu)->cpu_capacity_orig; } -/** - * 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_cpu_util(int cpu, unsigned long util_cfs, - unsigned long max, enum schedutil_type type, +unsigned long effective_cpu_util(int cpu, unsigned long util_cfs, + unsigned long max, enum cpu_util_type type, struct task_struct *p); static inline unsigned long cpu_bw_dl(struct rq *rq)
There is nothing schedutil specific in schedutil_cpu_util(), rename it to effective_cpu_util(). Also create and expose another wrapper sched_cpu_util() which can be used by other parts of the kernel, like thermal core (that will be done in a later commit). Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- include/linux/sched.h | 21 +++++++++++++++++++++ kernel/sched/core.c | 11 +++++++++-- kernel/sched/cpufreq_schedutil.c | 2 +- kernel/sched/fair.c | 6 +++--- kernel/sched/sched.h | 19 ++----------------- 5 files changed, 36 insertions(+), 23 deletions(-) -- 2.25.0.rc1.19.g042ed3e048af