Commit 462689b3 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: VMX: Use current CPU's info to perform "disabled by BIOS?" checks 



Use this_cpu_has() instead of boot_cpu_has() to perform the effective
"disabled by BIOS?" checks for VMX.  This will allow consolidating code
between vmx_disabled_by_bios() and vmx_check_processor_compat().

Checking the boot CPU isn't a strict requirement as any divergence in VMX
enabling between the boot CPU and other CPUs will result in KVM refusing
to load thanks to the aforementioned vmx_check_processor_compat().

Furthermore, using the boot CPU was an unintentional change introduced by
commit a4d0b2fd ("KVM: VMX: Use VMX feature flag to query BIOS
enabling").  Prior to using the feature flags, KVM checked the raw MSR
value from the current CPU.

Reported-by: default avatarKai Huang <kai.huang@intel.com>
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Reviewed-by: default avatarKai Huang <kai.huang@intel.com>
Message-Id: <20221130230934.1014142-36-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 8d20bd63

arch/x86/kvm/vmx/vmx.c

+2 −2
Original line number Diff line number Diff line
@@ -2523,8 +2523,8 @@ static __init int cpu_has_kvm_support(void) 


static __init int vmx_disabled_by_bios(void)

{

	return !boot_cpu_has(X86_FEATURE_MSR_IA32_FEAT_CTL) ||

	       !boot_cpu_has(X86_FEATURE_VMX);

	return !this_cpu_has(X86_FEATURE_MSR_IA32_FEAT_CTL) ||

	       !this_cpu_has(X86_FEATURE_VMX);

}



static int kvm_cpu_vmxon(u64 vmxon_pointer)