github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-26 08:02:27 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

x86/virt: Force-clear X86_FEATURE_VMX if configuring root VMCS fails

Browse Source 
If allocating and configuring a root VMCS fails, clear X86_FEATURE_VMX in
all CPUs so that KVM doesn't need to manually check root_vmcs.  As added
bonuses, clearing VMX will reflect that VMX is unusable in /proc/cpuinfo,
and will avoid a futile auto-probe of kvm-intel.ko.

WARN if allocating a root VMCS page fails, e.g. to help users figure out
why VMX is broken in the unlikely scenario something goes sideways during
boot (and because the allocation should succeed unless there's a kernel
bug).  Tweak KVM's error message to suggest checking kernel logs if VMX is
unsupported (in addition to checking BIOS).

Tested-by: Chao Gao <chao.gao@intel.com>
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Tested-by: Sagi Shahar <sagis@google.com>
Link: https://patch.msgid.link/20260214012702.2368778-6-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
This commit is contained in:
Sean Christopherson 2026-02-13 17:26:51 -08:00
parent 405b7c2793
commit 95e4adb24f
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/x86/kvm/vmx/vmx.c
View File

@ -2927,14 +2927,15 @@ static bool __kvm_is_vmx_supported(void)
return false;
}
if (!this_cpu_has(X86_FEATURE_MSR_IA32_FEAT_CTL) ||
!this_cpu_has(X86_FEATURE_VMX)) {
if (!this_cpu_has(X86_FEATURE_MSR_IA32_FEAT_CTL)) {
pr_err("VMX not enabled (by BIOS) in MSR_IA32_FEAT_CTL on CPU %d\n", cpu);
return false;
}
if (!per_cpu(root_vmcs, cpu))
if (!this_cpu_has(X86_FEATURE_VMX)) {
pr_err("VMX not fully enabled on CPU %d. Check kernel logs and/or BIOS\n", cpu);
return false;
}
return true;
}

14
arch/x86/virt/hw.c
View File

@ -28,7 +28,7 @@ static __init void x86_vmx_exit(void)
}
}
static __init int x86_vmx_init(void)
static __init int __x86_vmx_init(void)
{
u64 basic_msr;
u32 rev_id;
@ -56,7 +56,7 @@ static __init int x86_vmx_init(void)
struct vmcs *vmcs;
page = __alloc_pages_node(node, GFP_KERNEL | __GFP_ZERO, 0);
if (!page) {
if (WARN_ON_ONCE(!page)) {
x86_vmx_exit();
return -ENOMEM;
}
@ -68,6 +68,16 @@ static __init int x86_vmx_init(void)
return 0;
}
static __init int x86_vmx_init(void)
{
int r;
r = __x86_vmx_init();
if (r)
setup_clear_cpu_cap(X86_FEATURE_VMX);
return r;
}
#else
static __init int x86_vmx_init(void) { return -EOPNOTSUPP; }
#endif