Skip to contentSkip to conversation

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

PATCH New Ben Hutchings 1 participant 1 message Jun 12, 2018

Subsystems (2)
Stable branch KVM
lore
Share & tools
lore

Ben Hutchings

author
#0 lore raw

PATCH 1/1 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 43462d908821 "KVM: VMX: Expose SSBD properly to guests."

Fixes 52817587e706 ("x86/cpufeatures: Disentangle SSBD enumeration")
Signed-off-by Ben Hutchings <[email protected]>
Cc Konrad Rzeszutek Wilk <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc David Woodhouse <[email protected]>
Cc [email protected]
---
 arch/x86/kvm/cpuid.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/cpuid.h +1 -1
index c38369781239..8a841b9d8f84 100644
@@ -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)