2023-05-22 15:07:14

by Lukasz Luba

Subject: [RESEND][PATCH v2 2/3] cpufreq: schedutil: Refactor sugov_update_shared() internals

Remove the if section block. Use the simple check to bail out
and jump to the unlock at the end. That makes the code more readable
and ready for some future tracing.

Signed-off-by: Lukasz Luba <[email protected]>
---
kernel/sched/cpufreq_schedutil.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c
index e3211455b203..f462496e5c07 100644
--- a/kernel/sched/cpufreq_schedutil.c
+++ b/kernel/sched/cpufreq_schedutil.c
@@ -446,17 +446,19 @@ sugov_update_shared(struct update_util_data *hook, u64 time, unsigned int flags)

ignore_dl_rate_limit(sg_cpu);

- if (sugov_should_update_freq(sg_policy, time)) {
- next_f = sugov_next_freq_shared(sg_cpu, time);
+ if (!sugov_should_update_freq(sg_policy, time))
+ goto unlock;

- if (!sugov_update_next_freq(sg_policy, time, next_f))
- goto unlock;
+ next_f = sugov_next_freq_shared(sg_cpu, time);
+
+ if (!sugov_update_next_freq(sg_policy, time, next_f))
+ goto unlock;
+
+ if (sg_policy->policy->fast_switch_enabled)
+ cpufreq_driver_fast_switch(sg_policy->policy, next_f);
+ else
+ sugov_deferred_update(sg_policy);

- if (sg_policy->policy->fast_switch_enabled)
- cpufreq_driver_fast_switch(sg_policy->policy, next_f);
- else
- sugov_deferred_update(sg_policy);
- }
unlock:
raw_spin_unlock(&sg_policy->update_lock);
}
--
2.25.1

2023-06-20 18:33:31

by Rafael J. Wysocki

Subject: Re: [RESEND][PATCH v2 2/3] cpufreq: schedutil: Refactor sugov_update_shared() internals

On Mon, May 22, 2023 at 4:57 PM Lukasz Luba <[email protected]> wrote:
>
> Remove the if section block. Use the simple check to bail out
> and jump to the unlock at the end. That makes the code more readable
> and ready for some future tracing.
>
> Signed-off-by: Lukasz Luba <[email protected]>
> ---
> kernel/sched/cpufreq_schedutil.c | 20 +++++++++++---------
> 1 file changed, 11 insertions(+), 9 deletions(-)
>
> diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c
> index e3211455b203..f462496e5c07 100644
> --- a/kernel/sched/cpufreq_schedutil.c
> +++ b/kernel/sched/cpufreq_schedutil.c
> @@ -446,17 +446,19 @@ sugov_update_shared(struct update_util_data *hook, u64 time, unsigned int flags)
>
> ignore_dl_rate_limit(sg_cpu);
>
> - if (sugov_should_update_freq(sg_policy, time)) {
> - next_f = sugov_next_freq_shared(sg_cpu, time);
> + if (!sugov_should_update_freq(sg_policy, time))
> + goto unlock;
>
> - if (!sugov_update_next_freq(sg_policy, time, next_f))
> - goto unlock;
> + next_f = sugov_next_freq_shared(sg_cpu, time);
> +
> + if (!sugov_update_next_freq(sg_policy, time, next_f))
> + goto unlock;
> +
> + if (sg_policy->policy->fast_switch_enabled)
> + cpufreq_driver_fast_switch(sg_policy->policy, next_f);
> + else
> + sugov_deferred_update(sg_policy);
>
> - if (sg_policy->policy->fast_switch_enabled)
> - cpufreq_driver_fast_switch(sg_policy->policy, next_f);
> - else
> - sugov_deferred_update(sg_policy);
> - }
> unlock:
> raw_spin_unlock(&sg_policy->update_lock);
> }
> --

The first patch in the series needs some feedback from the scheduler
people, but I can apply this one right away if you want me to.