Skip to content

Commit b23decf

Browse files
KAGA-KOKOPeter Zijlstra
authored andcommitted
sched: Initialize idle tasks only once
Idle tasks are initialized via __sched_fork() twice: fork_idle() copy_process() sched_fork() __sched_fork() init_idle() __sched_fork() Instead of cleaning this up, sched_ext hacked around it. Even when analyis and solution were provided in a discussion, nobody cared to clean this up. init_idle() is also invoked from sched_init() to initialize the boot CPU's idle task, which requires the __sched_fork() invocation. But this can be trivially solved by invoking __sched_fork() before init_idle() in sched_init() and removing the __sched_fork() invocation from init_idle(). Do so and clean up the comments explaining this historical leftover. Signed-off-by: Thomas Gleixner <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 1a61510 commit b23decf

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

kernel/sched/core.c

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4423,7 +4423,8 @@ int wake_up_state(struct task_struct *p, unsigned int state)
44234423
* Perform scheduler related setup for a newly forked process p.
44244424
* p is forked by current.
44254425
*
4426-
* __sched_fork() is basic setup used by init_idle() too:
4426+
* __sched_fork() is basic setup which is also used by sched_init() to
4427+
* initialize the boot CPU's idle task.
44274428
*/
44284429
static void __sched_fork(unsigned long clone_flags, struct task_struct *p)
44294430
{
@@ -7697,8 +7698,6 @@ void __init init_idle(struct task_struct *idle, int cpu)
76977698
struct rq *rq = cpu_rq(cpu);
76987699
unsigned long flags;
76997700

7700-
__sched_fork(0, idle);
7701-
77027701
raw_spin_lock_irqsave(&idle->pi_lock, flags);
77037702
raw_spin_rq_lock(rq);
77047703

@@ -7713,10 +7712,8 @@ void __init init_idle(struct task_struct *idle, int cpu)
77137712

77147713
#ifdef CONFIG_SMP
77157714
/*
7716-
* It's possible that init_idle() gets called multiple times on a task,
7717-
* in that case do_set_cpus_allowed() will not do the right thing.
7718-
*
7719-
* And since this is boot we can forgo the serialization.
7715+
* No validation and serialization required at boot time and for
7716+
* setting up the idle tasks of not yet online CPUs.
77207717
*/
77217718
set_cpus_allowed_common(idle, &ac);
77227719
#endif
@@ -8561,6 +8558,7 @@ void __init sched_init(void)
85618558
* but because we are the idle thread, we just pick up running again
85628559
* when this runqueue becomes "idle".
85638560
*/
8561+
__sched_fork(0, current);
85648562
init_idle(current, smp_processor_id());
85658563

85668564
calc_load_update = jiffies + LOAD_FREQ;

0 commit comments

Comments
 (0)