| From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> |
| Date: Mon, 21 May 2018 17:54:49 -0400 |
| Subject: KVM/VMX: Expose SSBD properly to guests |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| commit 0aa48468d00959c8a37cd3ac727284f4f7359151 upstream. |
| |
| The X86_FEATURE_SSBD is an synthetic CPU feature - that is |
| it bit location has no relevance to the real CPUID 0x7.EBX[31] |
| bit position. For that we need the new CPU feature name. |
| |
| Fixes: 52817587e706 ("x86/cpufeatures: Disentangle SSBD enumeration") |
| Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Cc: kvm@vger.kernel.org |
| Cc: "Radim Krčmář" <rkrcmar@redhat.com> |
| Cc: "H. Peter Anvin" <hpa@zytor.com> |
| Cc: Paolo Bonzini <pbonzini@redhat.com> |
| Link: https://lkml.kernel.org/r/20180521215449.26423-2-konrad.wilk@oracle.com |
| [bwh: Backported to 3.16: |
| - Fix guest_cpuid_has_spec_ctrl() as well |
| - Adjust context] |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| --- a/arch/x86/kvm/cpuid.c |
| +++ b/arch/x86/kvm/cpuid.c |
| @@ -318,7 +318,7 @@ static inline int __do_cpuid_ent(struct |
| |
| /* cpuid 7.0.edx*/ |
| const u32 kvm_cpuid_7_0_edx_x86_features = |
| - F(SPEC_CTRL) | F(SSBD) | F(ARCH_CAPABILITIES); |
| + F(SPEC_CTRL) | F(SPEC_CTRL_SSBD) | F(ARCH_CAPABILITIES); |
| |
| /* all calls to cpuid_count() should be made on the same cpu */ |
| get_cpu(); |
| --- a/arch/x86/kvm/cpuid.h |
| +++ b/arch/x86/kvm/cpuid.h |
| @@ -123,7 +123,7 @@ static inline bool guest_cpuid_has_spec_ |
| 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) |
