* Re: [PATCH] sched/fair: rename variable cpu_util eff_util
2023-06-11 12:25 [PATCH] sched/fair: rename variable cpu_util eff_util Tom Rix
@ 2023-06-12 15:44 ` Valentin Schneider
2023-06-12 15:58 ` Dietmar Eggemann
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Valentin Schneider @ 2023-06-12 15:44 UTC (permalink / raw)
To: Tom Rix, mingo, peterz, juri.lelli, vincent.guittot,
dietmar.eggemann, rostedt, bsegall, mgorman, bristot
Cc: linux-kernel, Tom Rix
On 11/06/23 08:25, Tom Rix wrote:
> cppcheck reports
> kernel/sched/fair.c:7436:17: style: Local variable 'cpu_util' shadows outer function [shadowFunction]
> unsigned long cpu_util;
> ^
>
> Clean this up by renaming the variable to eff_util
>
> Signed-off-by: Tom Rix <trix@redhat.com>
Reviewed-by: Valentin Schneider <vschneid@redhat.com>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] sched/fair: rename variable cpu_util eff_util
2023-06-11 12:25 [PATCH] sched/fair: rename variable cpu_util eff_util Tom Rix
2023-06-12 15:44 ` Valentin Schneider
@ 2023-06-12 15:58 ` Dietmar Eggemann
2023-06-15 11:38 ` [tip: sched/core] sched/fair: Rename " tip-bot2 for Tom Rix
2023-06-16 15:16 ` tip-bot2 for Tom Rix
3 siblings, 0 replies; 5+ messages in thread
From: Dietmar Eggemann @ 2023-06-12 15:58 UTC (permalink / raw)
To: Tom Rix, mingo, peterz, juri.lelli, vincent.guittot, rostedt,
bsegall, mgorman, bristot, vschneid
Cc: linux-kernel
On 11/06/2023 14:25, Tom Rix wrote:
> cppcheck reports
> kernel/sched/fair.c:7436:17: style: Local variable 'cpu_util' shadows outer function [shadowFunction]
> unsigned long cpu_util;
> ^
>
> Clean this up by renaming the variable to eff_util
>
> Signed-off-by: Tom Rix <trix@redhat.com>
> ---
> kernel/sched/fair.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
> index 6189d1a45635..7666dbc2b788 100644
> --- a/kernel/sched/fair.c
> +++ b/kernel/sched/fair.c
> @@ -7433,7 +7433,7 @@ eenv_pd_max_util(struct energy_env *eenv, struct cpumask *pd_cpus,
> for_each_cpu(cpu, pd_cpus) {
> struct task_struct *tsk = (cpu == dst_cpu) ? p : NULL;
> unsigned long util = cpu_util(cpu, p, dst_cpu, 1);
> - unsigned long cpu_util;
> + unsigned long eff_util;
>
> /*
> * Performance domain frequency: utilization clamping
> @@ -7442,8 +7442,8 @@ eenv_pd_max_util(struct energy_env *eenv, struct cpumask *pd_cpus,
> * NOTE: in case RT tasks are running, by default the
> * FREQUENCY_UTIL's utilization can be max OPP.
> */
> - cpu_util = effective_cpu_util(cpu, util, FREQUENCY_UTIL, tsk);
> - max_util = max(max_util, cpu_util);
> + eff_util = effective_cpu_util(cpu, util, FREQUENCY_UTIL, tsk);
> + max_util = max(max_util, eff_util);
> }
>
> return min(max_util, eenv->cpu_cap);
I forgot to check this in patch 'sched/fair: Refactor CPU utilization
functions' when I replaced cpu_util_next() with cpu_util().
Reviewed-by: Dietmar Eggemann <dietmar.eggemann@arm.com>
^ permalink raw reply [flat|nested] 5+ messages in thread* [tip: sched/core] sched/fair: Rename variable cpu_util eff_util
2023-06-11 12:25 [PATCH] sched/fair: rename variable cpu_util eff_util Tom Rix
2023-06-12 15:44 ` Valentin Schneider
2023-06-12 15:58 ` Dietmar Eggemann
@ 2023-06-15 11:38 ` tip-bot2 for Tom Rix
2023-06-16 15:16 ` tip-bot2 for Tom Rix
3 siblings, 0 replies; 5+ messages in thread
From: tip-bot2 for Tom Rix @ 2023-06-15 11:38 UTC (permalink / raw)
To: linux-tip-commits
Cc: Tom Rix, Peter Zijlstra (Intel),
Valentin Schneider, Dietmar Eggemann, x86, linux-kernel
The following commit has been merged into the sched/core branch of tip:
Commit-ID: 24cce6bc14759bbddd8d2252d733212e1911b977
Gitweb: https://git.kernel.org/tip/24cce6bc14759bbddd8d2252d733212e1911b977
Author: Tom Rix <trix@redhat.com>
AuthorDate: Sun, 11 Jun 2023 08:25:35 -04:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Thu, 15 Jun 2023 13:28:20 +02:00
sched/fair: Rename variable cpu_util eff_util
cppcheck reports
kernel/sched/fair.c:7436:17: style: Local variable 'cpu_util' shadows outer function [shadowFunction]
unsigned long cpu_util;
^
Clean this up by renaming the variable to eff_util
Signed-off-by: Tom Rix <trix@redhat.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Valentin Schneider <vschneid@redhat.com>
Reviewed-by: Dietmar Eggemann <dietmar.eggemann@arm.com>
Link: https://lore.kernel.org/r/20230611122535.183654-1-trix@redhat.com
---
kernel/sched/fair.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 819efad..0219cf8 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -7463,7 +7463,7 @@ eenv_pd_max_util(struct energy_env *eenv, struct cpumask *pd_cpus,
for_each_cpu(cpu, pd_cpus) {
struct task_struct *tsk = (cpu == dst_cpu) ? p : NULL;
unsigned long util = cpu_util(cpu, p, dst_cpu, 1);
- unsigned long cpu_util;
+ unsigned long eff_util;
/*
* Performance domain frequency: utilization clamping
@@ -7472,8 +7472,8 @@ eenv_pd_max_util(struct energy_env *eenv, struct cpumask *pd_cpus,
* NOTE: in case RT tasks are running, by default the
* FREQUENCY_UTIL's utilization can be max OPP.
*/
- cpu_util = effective_cpu_util(cpu, util, FREQUENCY_UTIL, tsk);
- max_util = max(max_util, cpu_util);
+ eff_util = effective_cpu_util(cpu, util, FREQUENCY_UTIL, tsk);
+ max_util = max(max_util, eff_util);
}
return min(max_util, eenv->cpu_cap);
^ permalink raw reply [flat|nested] 5+ messages in thread* [tip: sched/core] sched/fair: Rename variable cpu_util eff_util
2023-06-11 12:25 [PATCH] sched/fair: rename variable cpu_util eff_util Tom Rix
` (2 preceding siblings ...)
2023-06-15 11:38 ` [tip: sched/core] sched/fair: Rename " tip-bot2 for Tom Rix
@ 2023-06-16 15:16 ` tip-bot2 for Tom Rix
3 siblings, 0 replies; 5+ messages in thread
From: tip-bot2 for Tom Rix @ 2023-06-16 15:16 UTC (permalink / raw)
To: linux-tip-commits
Cc: Tom Rix, Peter Zijlstra (Intel),
Valentin Schneider, Dietmar Eggemann, x86, linux-kernel
The following commit has been merged into the sched/core branch of tip:
Commit-ID: a707df30c9438a9d4d0a43ae7f22b59b078f94c4
Gitweb: https://git.kernel.org/tip/a707df30c9438a9d4d0a43ae7f22b59b078f94c4
Author: Tom Rix <trix@redhat.com>
AuthorDate: Sun, 11 Jun 2023 08:25:35 -04:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Fri, 16 Jun 2023 17:08:01 +02:00
sched/fair: Rename variable cpu_util eff_util
cppcheck reports
kernel/sched/fair.c:7436:17: style: Local variable 'cpu_util' shadows outer function [shadowFunction]
unsigned long cpu_util;
^
Clean this up by renaming the variable to eff_util
Signed-off-by: Tom Rix <trix@redhat.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Valentin Schneider <vschneid@redhat.com>
Reviewed-by: Dietmar Eggemann <dietmar.eggemann@arm.com>
Link: https://lore.kernel.org/r/20230611122535.183654-1-trix@redhat.com
---
kernel/sched/fair.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 6189d1a..7666dbc 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -7433,7 +7433,7 @@ eenv_pd_max_util(struct energy_env *eenv, struct cpumask *pd_cpus,
for_each_cpu(cpu, pd_cpus) {
struct task_struct *tsk = (cpu == dst_cpu) ? p : NULL;
unsigned long util = cpu_util(cpu, p, dst_cpu, 1);
- unsigned long cpu_util;
+ unsigned long eff_util;
/*
* Performance domain frequency: utilization clamping
@@ -7442,8 +7442,8 @@ eenv_pd_max_util(struct energy_env *eenv, struct cpumask *pd_cpus,
* NOTE: in case RT tasks are running, by default the
* FREQUENCY_UTIL's utilization can be max OPP.
*/
- cpu_util = effective_cpu_util(cpu, util, FREQUENCY_UTIL, tsk);
- max_util = max(max_util, cpu_util);
+ eff_util = effective_cpu_util(cpu, util, FREQUENCY_UTIL, tsk);
+ max_util = max(max_util, eff_util);
}
return min(max_util, eenv->cpu_cap);
^ permalink raw reply [flat|nested] 5+ messages in thread