From: Mike Rapoport <rppt@kernel.org>
To: Borislav Petkov <bp@alien8.de>
Cc: Juergen Gross <jgross@suse.com>,
John Dorminy <jdorminy@redhat.com>,
tip-bot2@linutronix.de, anjaneya.chagam@intel.com,
dan.j.williams@intel.com, linux-kernel@vger.kernel.org,
linux-tip-commits@vger.kernel.org, stable@vger.kernel.org,
x86@kernel.org, Hugh Dickins <hughd@google.com>,
"Patrick J. Volkerding" <volkerdi@gmail.com>
Subject: Re: [tip: x86/urgent] x86/boot: Pull up cmdline preparation and early param parsing
Date: Thu, 9 Dec 2021 18:29:27 +0200 [thread overview]
Message-ID: <YbIu55LZKoK3IVaF@kernel.org> (raw)
In-Reply-To: <YbIgsO/7oQW9h6wv@zn.tnic>
On Thu, Dec 09, 2021 at 04:28:48PM +0100, Borislav Petkov wrote:
> On Thu, Dec 09, 2021 at 04:26:55PM +0100, Juergen Gross wrote:
> > Sigh. This will break Xen PV. Again. The comment above the call of
> > early_reserve_memory() tells you why.
>
> I know. I was just looking at how to fix that particular thing and was
> going to find you on IRC to talk to you about it...
The memory reservation in arch/x86/platform/efi/efi.c depends on at least
two command line parameters, I think it's better put it back later in the
boot process and move efi_memblock_x86_reserve_range() out of
early_memory_reserve().
I.e. revert c0f2077baa41 ("x86/boot: Mark prepare_command_line() __init")
and 8d48bf8206f7 ("x86/boot: Pull up cmdline preparation and early param
parsing") and add the patch below on top.
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 49b596db5631..da36b8f8430b 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -713,9 +713,6 @@ static void __init early_reserve_memory(void)
early_reserve_initrd();
- if (efi_enabled(EFI_BOOT))
- efi_memblock_x86_reserve_range();
-
memblock_x86_reserve_range_setup_data();
reserve_ibft_region();
@@ -890,6 +887,9 @@ void __init setup_arch(char **cmdline_p)
parse_early_param();
+ if (efi_enabled(EFI_BOOT)) {
+ efi_memblock_x86_reserve_range();
+
#ifdef CONFIG_MEMORY_HOTPLUG
/*
* Memory used by the kernel cannot be hot-removed because Linux
--
Sincerely yours,
Mike.
next prev parent reply other threads:[~2021-12-09 16:29 UTC|newest]
Thread overview: 36+ 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
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 [this message]
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
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=YbIu55LZKoK3IVaF@kernel.org \
--to=rppt@kernel.org \
--cc=anjaneya.chagam@intel.com \
--cc=bp@alien8.de \
--cc=dan.j.williams@intel.com \
--cc=hughd@google.com \
--cc=jdorminy@redhat.com \
--cc=jgross@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=tip-bot2@linutronix.de \
--cc=volkerdi@gmail.com \
--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
Powered by JetHome