Skip to content

Commit b5c0946

Browse files
committed
Merge tag 'sched-urgent-2025-11-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fix from Ingo Molnar: "Fix a group-throttling bug in the fair scheduler" * tag 'sched-urgent-2025-11-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: sched/fair: Prevent cfs_rq from being unthrottled with zero runtime_remaining
2 parents 133262c + 956dfda commit b5c0946

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

kernel/sched/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9606,7 +9606,7 @@ static int tg_set_cfs_bandwidth(struct task_group *tg,
96069606

96079607
guard(rq_lock_irq)(rq);
96089608
cfs_rq->runtime_enabled = runtime_enabled;
9609-
cfs_rq->runtime_remaining = 0;
9609+
cfs_rq->runtime_remaining = 1;
96109610

96119611
if (cfs_rq->throttled)
96129612
unthrottle_cfs_rq(cfs_rq);

kernel/sched/fair.c

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6024,20 +6024,17 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq)
60246024
struct sched_entity *se = cfs_rq->tg->se[cpu_of(rq)];
60256025

60266026
/*
6027-
* It's possible we are called with !runtime_remaining due to things
6028-
* like user changed quota setting(see tg_set_cfs_bandwidth()) or async
6029-
* unthrottled us with a positive runtime_remaining but other still
6030-
* running entities consumed those runtime before we reached here.
6027+
* It's possible we are called with runtime_remaining < 0 due to things
6028+
* like async unthrottled us with a positive runtime_remaining but other
6029+
* still running entities consumed those runtime before we reached here.
60316030
*
6032-
* Anyway, we can't unthrottle this cfs_rq without any runtime remaining
6033-
* because any enqueue in tg_unthrottle_up() will immediately trigger a
6034-
* throttle, which is not supposed to happen on unthrottle path.
6031+
* We can't unthrottle this cfs_rq without any runtime remaining because
6032+
* any enqueue in tg_unthrottle_up() will immediately trigger a throttle,
6033+
* which is not supposed to happen on unthrottle path.
60356034
*/
60366035
if (cfs_rq->runtime_enabled && cfs_rq->runtime_remaining <= 0)
60376036
return;
60386037

6039-
se = cfs_rq->tg->se[cpu_of(rq)];
6040-
60416038
cfs_rq->throttled = 0;
60426039

60436040
update_rq_clock(rq);

0 commit comments

Comments
 (0)