From: Mike Hommey <mh@glandium.org>
To: x86@kernel.org
Cc: linux-kernel@vger.kernel.org, Mike Hommey <mh@glandium.org>
Subject: [PATCH] x86/boot: Delay BSP init until after FPU initialization
Date: Sun, 20 Sep 2020 10:03:10 +0900 [thread overview]
Message-ID: <20200920010310.10961-1-mh@glandium.org> (raw)
FPU initialization handles the clearcpuid command line argument. If it
comes after BSP init, clearcpuid cannot be used to disable features that
trigger some parts of the BSP init code.
Signed-off-by: Mike Hommey <mh@glandium.org>
---
arch/x86/kernel/cpu/common.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
I was trying to use clearcpuid=440 to disable X86_FEATURES_AMD_SSBD to
reproduce the behavior that happens on Zen/Zen+ on a Zen2 machine, but
that didn't work because the command line is handled after the setup for
X86_FEATURE_LS_CFG_SSBD.
I tought about either moving the command line handling earlier, but it
seems there wasn't a specific reason for BSP init being earlier than FPU
initialization so I went with reordering those instead.
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index c5d6f17d9b9d..c3bbca91a14b 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1261,9 +1261,6 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
c->cpu_index = 0;
filter_cpuid_features(c, false);
-
- if (this_cpu->c_bsp_init)
- this_cpu->c_bsp_init(c);
} else {
setup_clear_cpu_cap(X86_FEATURE_CPUID);
}
@@ -1276,6 +1273,10 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
fpu__init_system(c);
+ if (have_cpuid_p()) {
+ if (this_cpu->c_bsp_init)
+ this_cpu->c_bsp_init(c);
+ }
#ifdef CONFIG_X86_32
/*
* Regardless of whether PCID is enumerated, the SDM says
--
2.28.0
next reply other threads:[~2020-09-20 1:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-20 1:03 Mike Hommey [this message]
2020-09-20 8:36 ` [PATCH] x86/boot: Delay BSP init until after FPU initialization Borislav Petkov
2020-09-20 22:00 ` [PATCH v2] x86/boot: Handle fpu-related and clearcpuid command line arguments earlier Mike Hommey
2020-09-21 13:10 ` Borislav Petkov
2020-09-21 21:56 ` [PATCH v3] " Mike Hommey
2020-09-22 9:25 ` [tip: x86/fpu] x86/fpu: Handle FPU-related " tip-bot2 for Mike Hommey
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=20200920010310.10961-1-mh@glandium.org \
--to=mh@glandium.org \
--cc=linux-kernel@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).