]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
x86/boot: Move kernel cmdline setup earlier in the boot process (again)
authorJulian Stecklina <julian.stecklina@cyberus-technology.de>
Thu, 28 Mar 2024 15:42:12 +0000 (16:42 +0100)
committerIngo Molnar <mingo@kernel.org>
Fri, 29 Mar 2024 07:19:12 +0000 (08:19 +0100)
commit4faa0e5d6d79fc4c6e1943e8b62a65744d8439a0
treeed66ed65ff6fbf0833560bf706b204e88a157b72
parent17608373cf907afe97654998663cc2ab8070e90b
x86/boot: Move kernel cmdline setup earlier in the boot process (again)

When split_lock_detect=off (or similar) is specified in
CONFIG_CMDLINE, its effect is lost. The flow is currently this:

setup_arch():
  -> early_cpu_init()
    -> early_identify_cpu()
      -> sld_setup()
-> sld_state_setup()
  -> Looks for split_lock_detect in boot_command_line

  -> e820__memory_setup()

  -> Assemble final command line:
     boot_command_line = builtin_cmdline + boot_cmdline

  -> parse_early_param()

There were earlier attempts at fixing this in:

  8d48bf8206f7 ("x86/boot: Pull up cmdline preparation and early param parsing")

later reverted in:

  fbe618399854 ("Revert "x86/boot: Pull up cmdline preparation and early param parsing"")

... because parse_early_param() can't be called before
e820__memory_setup().

In this patch, we just move the command line concatenation to the
beginning of early_cpu_init(). This should fix sld_state_setup(), while
not running in the same issues as the earlier attempt.

The order is now:

setup_arch():
  -> Assemble final command line:
     boot_command_line = builtin_cmdline + boot_cmdline

  -> early_cpu_init()
    -> early_identify_cpu()
      -> sld_setup()
-> sld_state_setup()
  -> Looks for split_lock_detect in boot_command_line

  -> e820__memory_setup()

  -> parse_early_param()

Signed-off-by: Julian Stecklina <julian.stecklina@cyberus-technology.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: linux-kernel@vger.kernel.org
arch/x86/kernel/setup.c