From: Borislav Petkov <bp@alien8.de>
To: "Williams, Dan J" <dan.j.williams@intel.com>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-tip-commits@vger.kernel.org"
<linux-tip-commits@vger.kernel.org>,
"nathan@kernel.org" <nathan@kernel.org>,
"Gross, Jurgen" <jgross@suse.com>,
"stable@vger.kernel.org" <stable@vger.kernel.org>,
"marmarek@invisiblethingslab.com"
<marmarek@invisiblethingslab.com>,
"Chagam, Anjaneya" <anjaneya.chagam@intel.com>,
"bp@suse.de" <bp@suse.de>, "x86@kernel.org" <x86@kernel.org>,
Mike Rapoport <rppt@kernel.org>
Subject: Re: [tip: x86/urgent] x86/setup: Call early_reserve_memory() earlier
Date: Thu, 4 Nov 2021 12:40:33 +0100 [thread overview]
Message-ID: <YYPGsUNm0UXcYKOA@zn.tnic> (raw)
In-Reply-To: <e8dd8993c38702ee6dd73b3c11f158617e665607.camel@intel.com>
+ Mike.
On Thu, Nov 04, 2021 at 05:38:54AM +0000, Williams, Dan J wrote:
> By inspection, this commit looks like the source of the problem because
> early_reserve_memory() now runs before parse_early_param().
Yah, I see it too:
early_reserve_memory
|-> efi_memblock_x86_reserve_range
|-> efi_fake_memmap_early
which does
if (!efi_soft_reserve_enabled())
return;
and that would have set EFI_MEM_NO_SOFT_RESERVE after having parsed
"nosoftreserve".
And parse_early_param() happens later.
Uuuf, that early memory reservation dance is not going to be over,
ever...
Well, I guess we can do something like this below. The intent being to
carve out the command line preparation into a separate function which
does the early param parsing too. So that it all goes together.
And then call that function before early_reserve_memory() so that the
params have been parsed by then.
Looking at the changed flow, I think we should be ok but I've said that
a bunch of times already regarding this memory reservation early and
something in our house of cards called early boot order always broke.
Damn.
---
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 40ed44ead063..05f69e7d84dc 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -742,6 +742,28 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)
return 0;
}
+static char *prepare_command_line(void)
+{
+#ifdef CONFIG_CMDLINE_BOOL
+#ifdef CONFIG_CMDLINE_OVERRIDE
+ strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);
+#else
+ if (builtin_cmdline[0]) {
+ /* append boot loader cmdline to builtin */
+ strlcat(builtin_cmdline, " ", COMMAND_LINE_SIZE);
+ strlcat(builtin_cmdline, boot_command_line, COMMAND_LINE_SIZE);
+ strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);
+ }
+#endif
+#endif
+
+ strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
+
+ parse_early_param();
+
+ return command_line;
+}
+
/*
* Determine if we were loaded by an EFI loader. If so, then we have also been
* passed the efi memmap, systab, etc., so we should use these data structures
@@ -830,6 +852,23 @@ void __init setup_arch(char **cmdline_p)
x86_init.oem.arch_setup();
+ /*
+ * x86_configure_nx() is called before parse_early_param() (called by
+ * prepare_command_line()) to detect whether hardware doesn't support
+ * NX (so that the early EHCI debug console setup can safely call
+ * set_fixmap()). It may then be called again from within noexec_setup()
+ * during parsing early parameters to honor the respective command line
+ * option.
+ */
+ x86_configure_nx();
+
+ /*
+ * This parses early params and it needs to run before
+ * early_reserve_memory() because latter relies on such settings
+ * supplies as early params.
+ */
+ *cmdline_p = prepare_command_line();
+
/*
* Do some memory reservations *before* memory is added to memblock, so
* memblock allocations won't overwrite it.
@@ -863,33 +902,6 @@ void __init setup_arch(char **cmdline_p)
bss_resource.start = __pa_symbol(__bss_start);
bss_resource.end = __pa_symbol(__bss_stop)-1;
-#ifdef CONFIG_CMDLINE_BOOL
-#ifdef CONFIG_CMDLINE_OVERRIDE
- strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);
-#else
- if (builtin_cmdline[0]) {
- /* append boot loader cmdline to builtin */
- strlcat(builtin_cmdline, " ", COMMAND_LINE_SIZE);
- strlcat(builtin_cmdline, boot_command_line, COMMAND_LINE_SIZE);
- strlcpy(boot_command_line, builtin_cmdline, COMMAND_LINE_SIZE);
- }
-#endif
-#endif
-
- strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
- *cmdline_p = command_line;
-
- /*
- * x86_configure_nx() is called before parse_early_param() to detect
- * whether hardware doesn't support NX (so that the early EHCI debug
- * console setup can safely call set_fixmap()). It may then be called
- * again from within noexec_setup() during parsing early parameters
- * to honor the respective command line option.
- */
- x86_configure_nx();
-
- parse_early_param();
-
#ifdef CONFIG_MEMORY_HOTPLUG
/*
* Memory used by the kernel cannot be hot-removed because Linux
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
next prev parent reply other threads:[~2021-11-04 11:40 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-20 12:04 [PATCH v2] x86/setup: call early_reserve_memory() earlier Juergen Gross
2021-09-21 0:01 ` Marek Marczykowski-Górecki
2021-09-21 3:59 ` Nathan Chancellor
2021-09-22 17:18 ` [tip: x86/urgent] x86/setup: Call " tip-bot2 for Juergen Gross
2021-11-04 5:38 ` Williams, Dan J
2021-11-04 11:40 ` Borislav Petkov [this message]
2021-11-04 17:36 ` Dan Williams
2021-11-15 11:36 ` [tip: x86/urgent] x86/boot: Pull up cmdline preparation and early param parsing tip-bot2 for Borislav Petkov
2021-12-09 14:38 ` John Dorminy
2021-12-09 15:19 ` Borislav Petkov
2021-12-09 15:26 ` Juergen Gross
2021-12-09 15:28 ` Borislav Petkov
2021-12-09 16:29 ` Mike Rapoport
2021-12-09 16:37 ` Borislav Petkov
2021-12-10 11:28 ` Borislav Petkov
2021-12-10 20:11 ` Hugh Dickins
2021-12-11 10:14 ` Borislav Petkov
2021-12-10 20:32 ` Patrick J. Volkerding
2021-12-11 10:29 ` Borislav Petkov
2021-12-11 5:24 ` John Dorminy
2021-12-11 10:30 ` Borislav Petkov
2021-12-13 8:20 ` Mike Rapoport
2021-12-13 9:33 ` Borislav Petkov
2021-12-13 11:27 ` [PATCH 0/3] x86: Fix boot ordering issues yet again Borislav Petkov
2021-12-13 11:27 ` [PATCH 1/3] Revert "x86/boot: Mark prepare_command_line() __init" Borislav Petkov
2021-12-15 13:05 ` [tip: x86/urgent] " tip-bot2 for Borislav Petkov
2021-12-13 11:27 ` [PATCH 2/3] Revert "x86/boot: Pull up cmdline preparation and early param parsing" Borislav Petkov
2021-12-15 13:05 ` [tip: x86/urgent] " tip-bot2 for Borislav Petkov
2021-12-13 11:27 ` [PATCH 3/3] x86/boot: Move EFI range reservation after cmdline parsing Borislav Petkov
2021-12-15 13:12 ` [tip: x86/urgent] " tip-bot2 for Mike Rapoport
[not found] ` <CANGBn69pGb-nscv8tXN1UKDEQGEMWRKuPVPLgg+q2m7V_sBvHw@mail.gmail.com>
2021-12-20 18:49 ` [tip: x86/urgent] x86/boot: Pull up cmdline preparation and early param parsing Patrick J. Volkerding
2021-12-20 18:59 ` Borislav Petkov
2021-12-20 19:08 ` Borislav Petkov
2021-12-09 15:49 ` John Dorminy
2021-12-09 16:07 ` Borislav Petkov
2021-12-15 13:05 ` [tip: x86/urgent] x86/boot: Move EFI range reservation after cmdline parsing tip-bot2 for Mike Rapoport
-- strict thread matches above, loose matches on Subject: below --
2021-09-14 9:41 [PATCH] x86/setup: call early_reserve_memory() earlier Juergen Gross
2021-09-16 10:50 ` [tip: x86/urgent] x86/setup: Call " tip-bot2 for Juergen Gross
2021-09-19 16:55 ` Mike Galbraith
2021-09-19 17:04 ` Mike Rapoport
2021-09-20 0:56 ` Mike Galbraith
2021-09-20 9:26 ` Mike Rapoport
2021-09-20 9:38 ` Borislav Petkov
2021-09-20 11:25 ` Mike Galbraith
2021-09-20 11:33 ` Juergen Gross
2021-09-19 17:15 ` Borislav Petkov
2021-09-20 6:00 ` Juergen Gross
2021-09-20 9:46 ` Mike Rapoport
2021-09-20 22:48 ` Nathan Chancellor
2021-09-21 3:38 ` Borislav Petkov
2021-09-21 3:59 ` Nathan Chancellor
2021-09-21 7:36 ` Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YYPGsUNm0UXcYKOA@zn.tnic \
--to=bp@alien8.de \
--cc=anjaneya.chagam@intel.com \
--cc=bp@suse.de \
--cc=dan.j.williams@intel.com \
--cc=jgross@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=marmarek@invisiblethingslab.com \
--cc=nathan@kernel.org \
--cc=rppt@kernel.org \
--cc=stable@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).