[RHEL7,COMMIT] ms/KVM: x86: reinstate vendor-agnostic check on SPEC_CTRL cpuid bits #PSBM-120787 #PSBM-123538 #PSBM-121767

Submitted by Vasily Averin on Dec. 15, 2020, 9:31 a.m.

Details

Message ID 202012150931.0BF9VbLC006778@vz7build.vvs.sw.ru
State New
Series "ms/KVM: x86: reinstate vendor-agnostic check on SPEC_CTRL cpuid bits #PSBM-120787 #PSBM-123538 #PSBM-121767"
Headers show

Commit Message

Vasily Averin Dec. 15, 2020, 9:31 a.m.
The commit is pushed to "branch-rh7-3.10.0-1160.6.1.vz7.171.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-1160.6.1.vz7.171.4
------>
commit b1ecfc303d3e53654c7d440c4214844ee6e69d78
Author: Paolo Bonzini <pbonzini@redhat.com>
Date:   Tue Dec 15 12:31:37 2020 +0300

    ms/KVM: x86: reinstate vendor-agnostic check on SPEC_CTRL cpuid bits #PSBM-120787 #PSBM-123538 #PSBM-121767
    
    Until commit e7c587da1252 ("x86/speculation: Use synthetic bits for IBRS/IBPB/STIBP",
    2018-05-17), KVM was testing both Intel and AMD CPUID bits before allowing the
    guest to write MSR_IA32_SPEC_CTRL and MSR_IA32_PRED_CMD.  Testing only Intel bits
    on VMX processors, or only AMD bits on SVM processors, fails if the guests are
    created with the "opposite" vendor as the host.
    
    While at it, also tweak the host CPU check to use the vendor-agnostic feature bit
    X86_FEATURE_IBPB, since we only care about the availability of the MSR on the host
    here and not about specific CPUID bits.
    
    mFixes: e7c587da1252 ("x86/speculation: Use synthetic bits for IBRS/IBPB/STIBP")
    Cc: stable@vger.kernel.org
    Reported-by: Denis V. Lunev <den@openvz.org>
    Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
    
    https://jira.sw.ru/browse/PSBM-123538
    
    ========================================
    The patch is a replacement for below vz patch,
    which has been reverted due to
    https://jira.sw.ru/browse/PSBM-121767
    
     commit 39d637ddbcf876f897e01c737bbb351461921df0
     Author: Denis V. Lunev <den@openvz.org>
     Date:   Wed Oct 28 19:25:57 2020 +0300
    
        kvm: fix AMD IBRS/IBPB/STIBP/SSBD reporting #PSBM-120787
    
        We should report these bits in 80000008 EBX on AMD only, i.e. when AMD
        specific feature bits are enabled.
    
        https://jira.sw.ru/browse/PSBM-120787
    
        Signed-off-by: Denis V. Lunev <den@openvz.org>
        CC: Vasily Averin <vvs@virtuozzo.com>
        CC: Konstantin Khorenko <khorenko@virtuozzo.com>
    ========================================
    
    Port to vz7 note:
    
    in vz7 both functions svm_set_msr() and vmx_set_msr() did not have
    checks for
      !boot_cpu_has(X86_FEATURE_AMD_IBPB)
    and
      !boot_cpu_has(X86_FEATURE_SPEC_CTRL)
    
    Signed-off-by: Konstantin Khorenko <khorenko@virtuozzo.com>
---
 arch/x86/kvm/svm.c |  3 +++
 arch/x86/kvm/vmx.c | 10 ++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 5715da2..3a04bd0 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -3881,11 +3881,14 @@  static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr)
 		break;
 	case MSR_IA32_PRED_CMD:
 		if (!msr->host_initiated &&
+		    !guest_cpuid_has(vcpu, X86_FEATURE_SPEC_CTRL) &&
 		    !guest_cpuid_has(vcpu, X86_FEATURE_AMD_IBPB))
 			return 1;
 
 		if (data & ~PRED_CMD_IBPB)
 			return 1;
+		if (!boot_cpu_has(X86_FEATURE_IBPB))
+			return 1;
 
 		if (!data)
 			break;
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index f43b2db..a120208 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -3350,7 +3350,10 @@  static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
 		break;
 	case MSR_IA32_SPEC_CTRL:
 		if (!msr_info->host_initiated &&
-		    !guest_cpuid_has(vcpu, X86_FEATURE_SPEC_CTRL))
+		    !guest_cpuid_has(vcpu, X86_FEATURE_SPEC_CTRL) &&
+		    !guest_cpuid_has(vcpu, X86_FEATURE_AMD_STIBP) &&
+		    !guest_cpuid_has(vcpu, X86_FEATURE_AMD_IBRS) &&
+		    !guest_cpuid_has(vcpu, X86_FEATURE_AMD_SSBD))
 			return 1;
 
 		/* The STIBP bit doesn't fault even if it's not advertised */
@@ -3387,11 +3390,14 @@  static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
 		goto find_shared_msr;
 	case MSR_IA32_PRED_CMD:
 		if (!msr_info->host_initiated &&
-		    !guest_cpuid_has(vcpu, X86_FEATURE_SPEC_CTRL))
+		    !guest_cpuid_has(vcpu, X86_FEATURE_SPEC_CTRL) &&
+		    !guest_cpuid_has(vcpu, X86_FEATURE_AMD_IBPB))
 			return 1;
 
 		if (data & ~PRED_CMD_IBPB)
 			return 1;
+		if (!boot_cpu_has(X86_FEATURE_IBPB))
+			return 1;
 
 		if (!data)
 			break;