Commit 4126bad6 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

sched/core: Add missing update_rq_clock() in post_init_entity_util_avg() 



Address this rq-clock update bug:

  WARNING: CPU: 0 PID: 0 at ../kernel/sched/sched.h:797 post_init_entity_util_avg()
  rq->clock_update_flags < RQCF_ACT_SKIP

  Call Trace:
    __warn()
    post_init_entity_util_avg()
    wake_up_new_task()
    _do_fork()
    kernel_thread()
    rest_init()
    start_kernel()

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 46f69fa3

kernel/sched/core.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -2578,6 +2578,7 @@ void wake_up_new_task(struct task_struct *p) 
	__set_task_cpu(p, select_task_rq(p, task_cpu(p), SD_BALANCE_FORK, 0));

	__set_task_cpu(p, select_task_rq(p, task_cpu(p), SD_BALANCE_FORK, 0));

#endif

#endif

	rq = __task_rq_lock(p, &rf);

	rq = __task_rq_lock(p, &rf);

	update_rq_clock(rq);

	post_init_entity_util_avg(&p->se);

	post_init_entity_util_avg(&p->se);





	activate_task(rq, p, 0);

	activate_task(rq, p, 0);

kernel/sched/fair.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -9267,6 +9267,7 @@ void online_fair_sched_group(struct task_group *tg) 
		se = tg->se[i];

		se = tg->se[i];





		raw_spin_lock_irq(&rq->lock);

		raw_spin_lock_irq(&rq->lock);

		update_rq_clock(rq);

		attach_entity_cfs_rq(se);

		attach_entity_cfs_rq(se);

		sync_throttle(tg, i);

		sync_throttle(tg, i);

		raw_spin_unlock_irq(&rq->lock);

		raw_spin_unlock_irq(&rq->lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE