Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02136f32 authored by Ben Hutchings's avatar Ben Hutchings Committed by Greg Kroah-Hartman
Browse files

KVM: VMX: Expose SSBD properly to guests, 4.9 supplement 



Fix an additional misuse of X86_FEATURE_SSBD in
guest_cpuid_has_spec_ctrl().  This function was introduced in the
backport of SSBD support to 4.9 and is not present upstream, so it was
not fixed by commit 43462d90 "KVM: VMX: Expose SSBD properly to
guests."

Fixes: 52817587e706 ("x86/cpufeatures: Disentangle SSBD enumeration")
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: David Woodhouse <dwmw@amazon.co.uk>
Cc: kvm@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5300a1c7

arch/x86/kvm/cpuid.h

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static inline bool guest_cpuid_has_spec_ctrl(struct kvm_vcpu *vcpu) 
	if (best && (best->ebx & bit(X86_FEATURE_AMD_IBRS)))

		return true;

	best = kvm_find_cpuid_entry(vcpu, 7, 0);

	return best && (best->edx & (bit(X86_FEATURE_SPEC_CTRL) | bit(X86_FEATURE_SSBD)));

	return best && (best->edx & (bit(X86_FEATURE_SPEC_CTRL) | bit(X86_FEATURE_SPEC_CTRL_SSBD)));

}



static inline bool guest_cpuid_has_arch_capabilities(struct kvm_vcpu *vcpu)