Revert "x86/kvm: Set IBPB when switching VM"

CVE-2017-5753 (revert embargoed)
CVE-2017-5715 (revert embargoed)

This reverts commit 665076ad780e8620505c742cfcb4b0f3fb99324a.

Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 497770311762651e0ec03985b0cf51540276e401..a81079461b2fa663edacdcadbc9bf9826fadabc6 100644 (file)
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -1484,7 +1484,6 @@ static void vmcs_load(struct vmcs *vmcs)
        if (error)
                printk(KERN_ERR "kvm: vmptrld %p/%llx failed\n",
                       vmcs, phys_addr);
-
 }
 
 #ifdef CONFIG_KEXEC_CORE
@@ -2265,8 +2264,6 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
        if (per_cpu(current_vmcs, cpu) != vmx->loaded_vmcs->vmcs) {
                per_cpu(current_vmcs, cpu) = vmx->loaded_vmcs->vmcs;
                vmcs_load(vmx->loaded_vmcs->vmcs);
-               if (boot_cpu_has(X86_FEATURE_SPEC_CTRL))
-                       native_wrmsrl(MSR_IA32_PRED_CMD, FEATURE_SET_IBPB);
        }
 
        if (!already_loaded) {