| Message ID | 20230612093537.833273038@infradead.org (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Delegated to: | Paul Moore |
| Headers | show |
| Series | Scope-based Resource Management | expand |
On Mon, Jun 12, 2023 at 11:07:19AM +0200, Peter Zijlstra wrote: > @@ -1810,7 +1811,7 @@ static int sysctl_sched_uclamp_handler(s > if (result) > goto undo; > if (!write) > - goto done; > + return result; This would be nicer as a "return 0;" > > if (sysctl_sched_uclamp_util_min > sysctl_sched_uclamp_util_max || > sysctl_sched_uclamp_util_max > SCHED_CAPACITY_SCALE || > @@ -1846,16 +1847,12 @@ static int sysctl_sched_uclamp_handler(s > * Otherwise, keep it simple and do just a lazy update at each next > * task enqueue time. > */ > - > - goto done; > + return result; This is a return 0 as well. regards, dan carpenter > > undo: > sysctl_sched_uclamp_util_min = old_min; > sysctl_sched_uclamp_util_max = old_max; > sysctl_sched_uclamp_util_min_rt_default = old_min_rt; > -done: > - mutex_unlock(&uclamp_mutex); > - > return result; > }
--- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -1801,7 +1801,8 @@ static int sysctl_sched_uclamp_handler(s int old_min, old_max, old_min_rt; int result; - mutex_lock(&uclamp_mutex); + guard(mutex)(&uclamp_mutex); + old_min = sysctl_sched_uclamp_util_min; old_max = sysctl_sched_uclamp_util_max; old_min_rt = sysctl_sched_uclamp_util_min_rt_default; @@ -1810,7 +1811,7 @@ static int sysctl_sched_uclamp_handler(s if (result) goto undo; if (!write) - goto done; + return result; if (sysctl_sched_uclamp_util_min > sysctl_sched_uclamp_util_max || sysctl_sched_uclamp_util_max > SCHED_CAPACITY_SCALE || @@ -1846,16 +1847,12 @@ static int sysctl_sched_uclamp_handler(s * Otherwise, keep it simple and do just a lazy update at each next * task enqueue time. */ - - goto done; + return result; undo: sysctl_sched_uclamp_util_min = old_min; sysctl_sched_uclamp_util_max = old_max; sysctl_sched_uclamp_util_min_rt_default = old_min_rt; -done: - mutex_unlock(&uclamp_mutex); - return result; } #endif
Use guards to reduce gotos and simplify control flow. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> --- kernel/sched/core.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)