[lkml]   [2021]   [Dec]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[tip: x86/urgent] x86/boot: Move EFI range reservation after cmdline parsing
The following commit has been merged into the x86/urgent branch of tip:

Commit-ID: 83757bbb9fe029b704fb28e80c3f2b92f23a1994
Author: Mike Rapoport <>
AuthorDate: Mon, 13 Dec 2021 12:27:57 +01:00
Committer: Borislav Petkov <>
CommitterDate: Wed, 15 Dec 2021 12:36:47 +01:00

x86/boot: Move EFI range reservation after cmdline parsing

The memory reservation in arch/x86/platform/efi/efi.c depends on at
least two command line parameters. Put it back later in the boot process
and move efi_memblock_x86_reserve_range() out of early_memory_reserve().

An attempt to fix this was done in

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

but that caused other troubles so it got reverted.

The bug this is addressing is:

Dan reports that Anjaneya Chagam can no longer use the efi=nosoftreserve
kernel command line parameter to suppress "soft reservation" behavior.

This is due to the fact that the following call-chain happens at boot:

|-> efi_memblock_x86_reserve_range
|-> efi_fake_memmap_early

which does

if (!efi_soft_reserve_enabled())

and that would have set EFI_MEM_NO_SOFT_RESERVE after having parsed

However, parse_early_param() gets called *after* it, leading to the boot
cmdline not being taken into account.

[ bp: Produce into a proper patch. ]

Signed-off-by: Borislav Petkov <>
Signed-off-by: Mike Rapoport <>
Signed-off-by: Borislav Petkov <>
arch/x86/kernel/setup.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 49b596d..e04f5e6 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -713,9 +713,6 @@ static void __init early_reserve_memory(void)


- if (efi_enabled(EFI_BOOT))
- efi_memblock_x86_reserve_range();

@@ -890,6 +887,9 @@ void __init setup_arch(char **cmdline_p)


+ if (efi_enabled(EFI_BOOT))
+ efi_memblock_x86_reserve_range();
* Memory used by the kernel cannot be hot-removed because Linux

 \ /
  Last update: 2021-12-15 14:06    [W:0.168 / U:0.112 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site