[tip: sched/urgent] sched/fair: Use guard in sched_group_set_idle()
From: tip-bot2 for Peter Zijlstra
Date: Wed Nov 18 2026 - 08:40:24 EST
The following commit has been merged into the sched/urgent branch of tip:
Commit-ID: 9a92f776dfa6a88fc16fe0512c725734190bf9d0
Gitweb: https://git.kernel.org/tip/9a92f776dfa6a88fc16fe0512c725734190bf9d0
Author: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
AuthorDate: Thu, 05 Nov 2026 17:55:26 +01:00
Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
CommitterDate: Wed, 18 Nov 2026 14:32:16 +01:00
sched/fair: Use guard in sched_group_set_idle()
Cleanup the code by using guards; prepares for further changes in this function.
Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx>
Reviewed-by: Kayra Cizmeci <kayracizmeci@xxxxxxxxx>
Reviewed-by: Vincent Guittot <vincent.guittot@xxxxxxxxxx>
Reviewed-by: Josh Don <joshdon@xxxxxxxxxx>
Link: https://patch.msgid.link/20261105170157.453569788@xxxxxxxxxxxxx
---
kernel/sched/fair.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 0c8af1c..95fd756 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -15803,12 +15803,9 @@ int sched_group_set_idle(struct task_group *tg, long idle)
if (idle < 0 || idle > 1)
return -EINVAL;
- mutex_lock(&shares_mutex);
-
- if (tg->idle == idle) {
- mutex_unlock(&shares_mutex);
+ guard(mutex)(&shares_mutex);
+ if (tg->idle == idle)
return 0;
- }
tg->idle = idle;
@@ -15818,13 +15815,12 @@ int sched_group_set_idle(struct task_group *tg, long idle)
struct cfs_rq *grp_cfs_rq = tg_cfs_rq(tg, i);
bool was_idle = cfs_rq_is_idle(grp_cfs_rq);
long idle_task_delta;
- struct rq_flags rf;
- rq_lock_irqsave(rq, &rf);
+ guard(rq_lock_irqsave)(rq);
grp_cfs_rq->idle = idle;
if (WARN_ON_ONCE(was_idle == cfs_rq_is_idle(grp_cfs_rq)))
- goto next_cpu;
+ continue;
idle_task_delta = grp_cfs_rq->h_nr_queued -
grp_cfs_rq->h_nr_idle;
@@ -15843,9 +15839,6 @@ int sched_group_set_idle(struct task_group *tg, long idle)
if (cfs_rq_is_idle(cfs_rq))
break;
}
-
-next_cpu:
- rq_unlock_irqrestore(rq, &rf);
}
/* Idle groups have minimum weight. */
@@ -15854,7 +15847,6 @@ next_cpu:
else
__sched_group_set_shares(tg, NICE_0_LOAD);
- mutex_unlock(&shares_mutex);
return 0;
}