From: "Jason A. Donenfeld" <Jason@zx2c4.com>
To: linux@armlinux.org.uk, rmk+kernel@armlinux.org.uk,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, catalin.marinas@arm.com
Cc: "Jason A. Donenfeld" <Jason@zx2c4.com>,
Stephen Boyd <swboyd@chromium.org>,
Ard Biesheuvel <ardb@kernel.org>,
stable@vger.kernel.org
Subject: [PATCH] ARM: initialize jump labels before setup_machine_fdt()
Date: Thu, 2 Jun 2022 23:22:34 +0200 [thread overview]
Message-ID: <20220602212234.344394-1-Jason@zx2c4.com> (raw)
Stephen reported that a static key warning splat appears during early
boot on arm64 systems that credit randomness from device trees that
contain an "rng-seed" property, because setup_machine_fdt() is called
before jump_label_init() during setup_arch(), which was fixed by
73e2d827a501 ("arm64: Initialize jump labels before
setup_machine_fdt()").
Upon cursory inspection, the same basic issue appears to apply to arm32
as well. In this case, we reorder setup_arch() to do things in the same
order as is now the case on arm64.
Reported-by: Stephen Boyd <swboyd@chromium.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: stable@vger.kernel.org
Fixes: f5bda35fba61 ("random: use static branch for crng_ready()")
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
arch/arm/kernel/setup.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 1e8a50a97edf..ef40d9f5d5a7 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -1097,10 +1097,15 @@ void __init setup_arch(char **cmdline_p)
const struct machine_desc *mdesc = NULL;
void *atags_vaddr = NULL;
+ setup_initial_init_mm(_text, _etext, _edata, _end);
+ setup_processor();
+ early_fixmap_init();
+ early_ioremap_init();
+ jump_label_init();
+
if (__atags_pointer)
atags_vaddr = FDT_VIRT_BASE(__atags_pointer);
- setup_processor();
if (atags_vaddr) {
mdesc = setup_machine_fdt(atags_vaddr);
if (mdesc)
@@ -1125,15 +1130,10 @@ void __init setup_arch(char **cmdline_p)
if (mdesc->reboot_mode != REBOOT_HARD)
reboot_mode = mdesc->reboot_mode;
- setup_initial_init_mm(_text, _etext, _edata, _end);
-
/* populate cmd_line too for later use, preserving boot_command_line */
strlcpy(cmd_line, boot_command_line, COMMAND_LINE_SIZE);
*cmdline_p = cmd_line;
- early_fixmap_init();
- early_ioremap_init();
-
parse_early_param();
#ifdef CONFIG_MMU
--
2.35.1
next reply other threads:[~2022-06-02 21:22 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-02 21:22 Jason A. Donenfeld [this message]
2022-06-03 6:53 ` [PATCH] ARM: initialize jump labels before setup_machine_fdt() Ard Biesheuvel
2022-06-03 7:37 ` Jason A. Donenfeld
2022-06-03 7:51 ` Ard Biesheuvel
2022-06-03 8:06 ` Ard Biesheuvel
2022-06-03 8:14 ` Jason A. Donenfeld
2022-06-03 8:12 ` Jason A. Donenfeld
2022-06-03 8:17 ` Ard Biesheuvel
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=20220602212234.344394-1-Jason@zx2c4.com \
--to=jason@zx2c4.com \
--cc=ardb@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=rmk+kernel@armlinux.org.uk \
--cc=stable@vger.kernel.org \
--cc=swboyd@chromium.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).