[PATCH 1/2] sched/fair: Convert rq_lock_irqsave() to guard()/scoped_guard()

From: Li kunyu

Date: Wed Nov 18 2026 - 01:17:38 EST


Convert three straightforward rq_lock_irqsave()/rq_unlock_irqrestore()
pairs in fair.c to the modern guard()/scoped_guard() helpers. This
removes the now-unnecessary struct rq_flags variables and makes the
locking scope explicit in the code structure.

sched_balance_rq() is deliberately left unchanged: it releases the rq
lock before restoring IRQs so that attach_tasks() runs without the
busiest rq lock held but with interrupts disabled. A scoped guard
would fold both steps into a single unlock_irqrestore() and change
that semantics.

Signed-off-by: Li kunyu <likunyu@xxxxxxxxxxxxxx>
---
kernel/sched/fair.c | 49 +++++++++++++++++++--------------------------
1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 0c8af1cac2d5..1e128214f2e9 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c
@@ -14747,11 +14747,9 @@ static void _nohz_idle_balance(struct rq *this_rq, unsigned int flags)
* do the balance.
*/
if (time_after_eq(jiffies, rq->next_balance)) {
- struct rq_flags rf;
-
- rq_lock_irqsave(rq, &rf);
- update_rq_clock(rq);
- rq_unlock_irqrestore(rq, &rf);
+ scoped_guard (rq_lock_irqsave, rq) {
+ update_rq_clock(rq);
+ }

if (flags & NOHZ_BALANCE_KICK)
sched_balance_domains(rq, CPU_IDLE);
@@ -15764,16 +15762,14 @@ static int __sched_group_set_shares(struct task_group *tg, unsigned long shares)
for_each_possible_cpu(i) {
struct rq *rq = cpu_rq(i);
struct sched_entity *se = tg_se(tg, i);
- struct rq_flags rf;

/* Propagate contribution to hierarchy */
- rq_lock_irqsave(rq, &rf);
+ guard(rq_lock_irqsave)(rq);
update_rq_clock(rq);
for_each_sched_entity(se) {
update_load_avg(cfs_rq_of(se), se, UPDATE_TG);
update_cfs_group(se);
}
- rq_unlock_irqrestore(rq, &rf);
}

return 0;
@@ -15818,34 +15814,31 @@ 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);
+ scoped_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;
+ grp_cfs_rq->idle = idle;
+ if (WARN_ON_ONCE(was_idle == cfs_rq_is_idle(grp_cfs_rq)))
+ continue;

- idle_task_delta = grp_cfs_rq->h_nr_queued -
- grp_cfs_rq->h_nr_idle;
- if (!cfs_rq_is_idle(grp_cfs_rq))
- idle_task_delta *= -1;
+ idle_task_delta = grp_cfs_rq->h_nr_queued -
+ grp_cfs_rq->h_nr_idle;
+ if (!cfs_rq_is_idle(grp_cfs_rq))
+ idle_task_delta *= -1;

- for_each_sched_entity(se) {
- struct cfs_rq *cfs_rq = cfs_rq_of(se);
+ for_each_sched_entity(se) {
+ struct cfs_rq *cfs_rq = cfs_rq_of(se);

- if (!se->on_rq)
- break;
+ if (!se->on_rq)
+ break;

- cfs_rq->h_nr_idle += idle_task_delta;
+ cfs_rq->h_nr_idle += idle_task_delta;

- /* Already accounted at parent level and above. */
- if (cfs_rq_is_idle(cfs_rq))
- break;
+ /* Already accounted at parent level and above. */
+ if (cfs_rq_is_idle(cfs_rq))
+ break;
+ }
}
-
-next_cpu:
- rq_unlock_irqrestore(rq, &rf);
}

/* Idle groups have minimum weight. */
--
2.47.3