Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'sched-urgent-2025-02-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar:
"Fix a cfs_rq->h_nr_runnable accounting bug that trips up a defensive
SCHED_WARN_ON() on certain workloads. The bug is believed to be
(accidentally) self-correcting, hence no behavioral side effects are
expected.
Also print se.slice in debug output, since this value can now be set
via the syscall ABI and can be useful to track"
* tag 'sched-urgent-2025-02-08' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/debug: Provide slice length for fair tasks
sched/fair: Fix inaccurate h_nr_runnable accounting with delayed dequeue
+21
+2
kernel/sched/debug.c
+2
kernel/sched/debug.c
+19
kernel/sched/fair.c
+19
kernel/sched/fair.c
···
5385
5385
static void set_delayed(struct sched_entity *se)
5386
5386
{
5387
5387
se->sched_delayed = 1;
5388
+
5389
+
/*
5390
+
* Delayed se of cfs_rq have no tasks queued on them.
5391
+
* Do not adjust h_nr_runnable since dequeue_entities()
5392
+
* will account it for blocked tasks.
5393
+
*/
5394
+
if (!entity_is_task(se))
5395
+
return;
5396
+
5388
5397
for_each_sched_entity(se) {
5389
5398
struct cfs_rq *cfs_rq = cfs_rq_of(se);
5390
5399
···
5406
5397
static void clear_delayed(struct sched_entity *se)
5407
5398
{
5408
5399
se->sched_delayed = 0;
5400
+
5401
+
/*
5402
+
* Delayed se of cfs_rq have no tasks queued on them.
5403
+
* Do not adjust h_nr_runnable since a dequeue has
5404
+
* already accounted for it or an enqueue of a task
5405
+
* below it will account for it in enqueue_task_fair().
5406
+
*/
5407
+
if (!entity_is_task(se))
5408
+
return;
5409
+
5409
5410
for_each_sched_entity(se) {
5410
5411
struct cfs_rq *cfs_rq = cfs_rq_of(se);
5411
5412