Commit 0abcc8f6 authored by Maxim Levitsky's avatar Maxim Levitsky Committed by Paolo Bonzini
Browse files

KVM: VMX: enable X86_FEATURE_WAITPKG in KVM capabilities 



Even though we might not allow the guest to use WAITPKG's new
instructions, we should tell KVM that the feature is supported by the
host CPU.

Note that vmx_waitpkg_supported checks that WAITPKG _can_ be set in
secondary execution controls as specified by VMX capability MSR, rather
that we actually enable it for a guest.

Cc: stable@vger.kernel.org
Fixes: e69e72fa ("KVM: x86: Add support for user wait instructions")
Suggested-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Message-Id: <20200523161455.3940-2-mlevitsk@redhat.com>
Reviewed-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 6129ed87

arch/x86/kvm/vmx/vmx.c

+3 −0
Original line number Diff line number Diff line
@@ -7138,6 +7138,9 @@ static __init void vmx_set_cpu_caps(void) 
	/* CPUID 0x80000001 */

	if (!cpu_has_vmx_rdtscp())

		kvm_cpu_cap_clear(X86_FEATURE_RDTSCP);



	if (vmx_waitpkg_supported())

		kvm_cpu_cap_check_and_set(X86_FEATURE_WAITPKG);

}



static void vmx_request_immediate_exit(struct kvm_vcpu *vcpu)