init: Invoke arch_cpu_finalize_init() earlier

commit 9df9d2f0471b4c4702670380b8d8a45b40b23a7d upstream

X86 is reworking the boot process so that initializations which are not
required during early boot can be moved into the late boot process and out
of the fragile and restricted initial boot phase.

arch_cpu_finalize_init() is the obvious place to do such initializations,
but arch_cpu_finalize_init() is invoked too late in start_kernel() e.g. for
initializing the FPU completely. fork_init() requires that the FPU is
initialized as the size of task_struct on X86 depends on the size of the
required FPU register buffer.

Fortunately none of the init calls between calibrate_delay() and
arch_cpu_finalize_init() is relevant for the functionality of
arch_cpu_finalize_init().

Invoke it right after calibrate_delay() where everything which is relevant
for arch_cpu_finalize_init() has been set up already.

No functional change intended.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Rick Edgecombe <rick.p.edgecombe@intel.com>
Link: https://lore.kernel.org/r/20230613224545.612182854@linutronix.de
Signed-off-by: Daniel Sneddon <daniel.sneddon@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/init/main.c b/init/main.c
index 3aa1281859dc33952f86b2a8c9013bd1a2c45477..7bf23050a9a422e070f8a8c8b738848bd4f5fca5 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -744,6 +744,9 @@ asmlinkage __visible void __init start_kernel(void)
                late_time_init();
        sched_clock_init();
        calibrate_delay();
+
+       arch_cpu_finalize_init();
+
        pid_idr_init();
        anon_vma_init();
 #ifdef CONFIG_X86
@@ -772,8 +775,6 @@ asmlinkage __visible void __init start_kernel(void)
 
        poking_init();
 
-       arch_cpu_finalize_init();
-
        acpi_subsystem_init();
        arch_post_acpi_subsys_init();
        sfi_init_late();