Skip to content

Commit cda6416

Browse files
committed
x86/microcode: Do not access MSR_IA32_PLATFORM_ID when running as a guest
Patch in Fixes: causes the usual: unchecked MSR access error: RDMSR from 0x17 at ... (intel_get_platform_id) Call Trace: early_init_intel early_cpu_init setup_arch _printk start_kernel x86_64_start_reservations x86_64_start_kernel common_startup_64 because the kernel is booted in a guest. In order to avoid it, this MSR access needs to be prevented when running virtualized. That is usually done by checking X86_FEATURE_HYPERVISOR but for this particular case it is too early yet. The platform ID needs to be read as early as when microcode is loaded on the BSP: load_ucode_bsp ... -> get_microcode_blob ... -> intel_find_matching_signature and by that time, CPUID leafs haven't been parsed yet. The microcode loader already has logic to check early whether the kernel is running virtualized so make that globally available to arch/x86/. The query whether running virtualized is getting more and more prominent in recent times so might as well make it an arch-global var which the rest of the code can use. Fixes: d8630b6 ("x86/cpu: Add platform ID to CPU info structure") Reported-by: Vishal Verma <vishal.l.verma@intel.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Reviewed-by: Binbin Wu <binbin.wu@linux.intel.com> Reviewed-by: Xiaoyao Li <xiaoyao.li@intel.com> Tested-by: Binbin Wu <binbin.wu@linux.intel.com> Link: https://lore.kernel.org/all/20260430020953.1405535-1-binbin.wu@linux.intel.com
1 parent 80501df commit cda6416

5 files changed

Lines changed: 16 additions & 15 deletions

File tree

arch/x86/include/asm/processor.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -733,6 +733,7 @@ bool xen_set_default_idle(void);
733733
#endif
734734

735735
void __noreturn stop_this_cpu(void *dummy);
736+
extern bool x86_hypervisor_present;
736737
void microcode_check(struct cpuinfo_x86 *prev_info);
737738
void store_cpu_caps(struct cpuinfo_x86 *info);
738739

arch/x86/kernel/cpu/microcode/amd.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ static u32 get_patch_level(void)
322322
{
323323
u32 rev, dummy __always_unused;
324324

325-
if (IS_ENABLED(CONFIG_MICROCODE_DBG) && hypervisor_present) {
325+
if (IS_ENABLED(CONFIG_MICROCODE_DBG) && x86_hypervisor_present) {
326326
int cpu = smp_processor_id();
327327

328328
if (!microcode_rev[cpu]) {
@@ -714,7 +714,7 @@ static bool __apply_microcode_amd(struct microcode_amd *mc, u32 *cur_rev,
714714
invlpg(p_addr_end);
715715
}
716716

717-
if (IS_ENABLED(CONFIG_MICROCODE_DBG) && hypervisor_present)
717+
if (IS_ENABLED(CONFIG_MICROCODE_DBG) && x86_hypervisor_present)
718718
microcode_rev[smp_processor_id()] = mc->hdr.patch_id;
719719

720720
/* verify patch application was successful */

arch/x86/kernel/cpu/microcode/core.c

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ bool force_minrev = IS_ENABLED(CONFIG_MICROCODE_LATE_FORCE_MINREV);
5757
u32 base_rev;
5858
u32 microcode_rev[NR_CPUS] = {};
5959

60-
bool hypervisor_present;
60+
bool __ro_after_init x86_hypervisor_present;
6161

6262
/*
6363
* Synchronization.
@@ -118,14 +118,9 @@ bool __init microcode_loader_disabled(void)
118118
/*
119119
* Disable when:
120120
*
121-
* 1) The CPU does not support CPUID.
122-
*/
123-
if (!cpuid_feature()) {
124-
dis_ucode_ldr = true;
125-
return dis_ucode_ldr;
126-
}
127-
128-
/*
121+
* 1) The CPU does not support CPUID, detected below in
122+
* load_ucode_bsp().
123+
*
129124
* 2) Bit 31 in CPUID[1]:ECX is clear
130125
* The bit is reserved for hypervisor use. This is still not
131126
* completely accurate as XEN PV guests don't see that CPUID bit
@@ -135,9 +130,7 @@ bool __init microcode_loader_disabled(void)
135130
* 3) Certain AMD patch levels are not allowed to be
136131
* overwritten.
137132
*/
138-
hypervisor_present = native_cpuid_ecx(1) & BIT(31);
139-
140-
if ((hypervisor_present && !IS_ENABLED(CONFIG_MICROCODE_DBG)) ||
133+
if ((x86_hypervisor_present && !IS_ENABLED(CONFIG_MICROCODE_DBG)) ||
141134
amd_check_current_patch_level())
142135
dis_ucode_ldr = true;
143136

@@ -179,6 +172,11 @@ void __init load_ucode_bsp(void)
179172

180173
early_parse_cmdline();
181174

175+
if (!cpuid_feature())
176+
dis_ucode_ldr = true;
177+
else
178+
x86_hypervisor_present = native_cpuid_ecx(1) & BIT(31);
179+
182180
if (microcode_loader_disabled())
183181
return;
184182

arch/x86/kernel/cpu/microcode/intel.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,9 @@ u32 intel_get_platform_id(void)
138138
{
139139
unsigned int val[2];
140140

141+
if (x86_hypervisor_present)
142+
return 0;
143+
141144
/*
142145
* This can be called early. Use CPUID directly instead of
143146
* relying on cpuinfo_x86 which may not be fully initialized.

arch/x86/kernel/cpu/microcode/internal.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ extern struct early_load_data early_data;
4848
extern struct ucode_cpu_info ucode_cpu_info[];
4949
extern u32 microcode_rev[NR_CPUS];
5050
extern u32 base_rev;
51-
extern bool hypervisor_present;
5251

5352
struct cpio_data find_microcode_in_initrd(const char *path);
5453

0 commit comments

Comments
 (0)