From: Ashok Raj <ashok.raj@intel.com>
To: Borislav Petkov <bp@alien8.de>, Thomas Gleixner <tglx@linutronix.de>
Cc: X86-kernel <x86@kernel.org>,
LKML Mailing List <linux-kernel@vger.kernel.org>,
Ashok Raj <ashok.raj@intel.com>,
Dave Hansen <dave.hansen@intel.com>,
Tony Luck <tony.luck@intel.com>,
Alison Schofield <alison.schofield@intel.com>,
Reinette Chatre <reinette.chatre@intel.com>,
Tom Lendacky <thomas.lendacky@amd.com>
Subject: [PATCH v3 1/6] x86/microcode: Add a parameter to microcode_check() to store CPU capabilities
Date: Tue, 3 Jan 2023 10:02:07 -0800 [thread overview]
Message-ID: <20230103180212.333496-2-ashok.raj@intel.com> (raw)
In-Reply-To: <20230103180212.333496-1-ashok.raj@intel.com>
This is a preparation before the next patch uses this to compare CPU
capabilities after performing an update.
Add a parameter to store CPU capabilities before performing a microcode
update.
Signed-off-by: Ashok Raj <ashok.raj@intel.com>
Cc: LKML <linux-kernel@vger.kernel.org>
Cc: x86 <x86@kernel.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Alison Schofield <alison.schofield@intel.com>
Cc: Reinette Chatre <reinette.chatre@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
---
arch/x86/include/asm/processor.h | 2 +-
arch/x86/kernel/cpu/common.c | 12 +++++-------
arch/x86/kernel/cpu/microcode/core.c | 3 ++-
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 4e35c66edeb7..387578049de0 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -697,7 +697,7 @@ bool xen_set_default_idle(void);
#endif
void __noreturn stop_this_cpu(void *dummy);
-void microcode_check(void);
+void microcode_check(struct cpuinfo_x86 *info);
enum l1tf_mitigations {
L1TF_MITIGATION_OFF,
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 9cfca3d7d0e2..b9c7529c920e 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -2302,25 +2302,23 @@ void cpu_init_secondary(void)
* only when microcode has been updated. Caller holds microcode_mutex and CPU
* hotplug lock.
*/
-void microcode_check(void)
+void microcode_check(struct cpuinfo_x86 *info)
{
- struct cpuinfo_x86 info;
-
perf_check_microcode();
/* Reload CPUID max function as it might've changed. */
- info.cpuid_level = cpuid_eax(0);
+ info->cpuid_level = cpuid_eax(0);
/*
* Copy all capability leafs to pick up the synthetic ones so that
* memcmp() below doesn't fail on that. The ones coming from CPUID will
* get overwritten in get_cpu_cap().
*/
- memcpy(&info.x86_capability, &boot_cpu_data.x86_capability, sizeof(info.x86_capability));
+ memcpy(&info->x86_capability, &boot_cpu_data.x86_capability, sizeof(info->x86_capability));
- get_cpu_cap(&info);
+ get_cpu_cap(info);
- if (!memcmp(&info.x86_capability, &boot_cpu_data.x86_capability, sizeof(info.x86_capability)))
+ if (!memcmp(&info->x86_capability, &boot_cpu_data.x86_capability, sizeof(info->x86_capability)))
return;
pr_warn("x86/CPU: CPU features have changed after loading microcode, but might not take effect.\n");
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
index c4cd7328177b..d86a4f910a6b 100644
--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
@@ -439,6 +439,7 @@ static int __reload_late(void *info)
static int microcode_reload_late(void)
{
int old = boot_cpu_data.microcode, ret;
+ struct cpuinfo_x86 info;
pr_err("Attempting late microcode loading - it is dangerous and taints the kernel.\n");
pr_err("You should switch to early loading, if possible.\n");
@@ -448,7 +449,7 @@ static int microcode_reload_late(void)
ret = stop_machine_cpuslocked(__reload_late, NULL, cpu_online_mask);
if (ret == 0)
- microcode_check();
+ microcode_check(&info);
pr_info("Reload completed, microcode revision: 0x%x -> 0x%x\n",
old, boot_cpu_data.microcode);
--
2.34.1
next prev parent reply other threads:[~2023-01-03 18:02 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-03 18:02 [PATCH v3 0/6] Some fixes and cleanups for microcode Ashok Raj
2023-01-03 18:02 ` Ashok Raj [this message]
2023-01-04 18:21 ` [PATCH v3 1/6] x86/microcode: Add a parameter to microcode_check() to store CPU capabilities Borislav Petkov
2023-01-03 18:02 ` [PATCH v3 2/6] x86/microcode/core: Take a snapshot before and after applying microcode Ashok Raj
2023-01-03 18:46 ` Dave Hansen
2023-01-03 19:37 ` Ashok Raj
2023-01-04 18:56 ` Borislav Petkov
2023-01-06 20:41 ` Ashok Raj
2023-01-03 18:02 ` [PATCH v3 3/6] x86/microcode: Display revisions only when update is successful Ashok Raj
2023-01-04 19:00 ` Borislav Petkov
2023-01-06 19:42 ` Ashok Raj
2023-01-06 19:54 ` Borislav Petkov
2023-01-06 20:29 ` Ashok Raj
2023-01-06 20:45 ` Borislav Petkov
2023-01-06 21:20 ` Ashok Raj
2023-01-07 9:36 ` Ingo Molnar
2023-01-06 21:35 ` Luck, Tony
2023-01-06 21:52 ` Borislav Petkov
2023-01-03 18:02 ` [PATCH v3 4/6] x86/microcode/intel: Use a plain revision argument for print_ucode_rev() Ashok Raj
2023-01-03 18:02 ` [PATCH v3 5/6] x86/microcode/intel: Print old and new rev during early boot Ashok Raj
2023-01-03 18:02 ` [PATCH v3 6/6] x86/microcode/intel: Print when early microcode loading fails Ashok Raj
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=20230103180212.333496-2-ashok.raj@intel.com \
--to=ashok.raj@intel.com \
--cc=alison.schofield@intel.com \
--cc=bp@alien8.de \
--cc=dave.hansen@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=reinette.chatre@intel.com \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.com \
--cc=tony.luck@intel.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;
as well as URLs for NNTP newsgroup(s).