From 779f24169f16aa587028d534136374c26a2ee07f Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Tue, 7 Nov 2017 16:47:53 +0800 Subject: [PATCH 117/131] UBUNTU: SAUCE: x86/kvm: add MSR_IA32_SPEC_CTRL and MSR_IA32_PRED_CMD to kvm CVE-2017-5715 (Spectre v2 Intel) Add field to access guest MSR_IA332_SPEC_CTRL and MSR_IA32_PRED_CMD state. Signed-off-by: Wei Wang Signed-off-by: Tim Chen (backported (context)) Signed-off-by: Stefan Bader Signed-off-by: Andy Whitcroft --- arch/x86/include/asm/kvm_host.h | 2 ++ arch/x86/kvm/vmx.c | 9 +++++++++ arch/x86/kvm/x86.c | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 70427d1182b2..329edca60a27 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -477,6 +477,8 @@ struct kvm_vcpu_arch { u64 mcg_ctl; u64 *mce_banks; + u64 spec_ctrl; + /* Cache MMIO info */ u64 mmio_gva; unsigned access; diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index b8901a627f34..6d40f506edbc 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -44,6 +44,7 @@ #include #include #include +#include #include "trace.h" @@ -2468,6 +2469,9 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata) case MSR_IA32_TSC: data = guest_read_tsc(); break; + case MSR_IA32_SPEC_CTRL: + data = vcpu->arch.spec_ctrl; + break; case MSR_IA32_SYSENTER_CS: data = vmcs_read32(GUEST_SYSENTER_CS); break; @@ -2539,6 +2543,9 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) case MSR_IA32_TSC: kvm_write_tsc(vcpu, msr_info); break; + case MSR_IA32_SPEC_CTRL: + vcpu->arch.spec_ctrl = data; + break; case MSR_IA32_CR_PAT: if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT) { vmcs_write64(GUEST_IA32_PAT, data); @@ -8732,6 +8739,8 @@ static int __init vmx_init(void) vmx_disable_intercept_for_msr(MSR_IA32_SYSENTER_CS, false); vmx_disable_intercept_for_msr(MSR_IA32_SYSENTER_ESP, false); vmx_disable_intercept_for_msr(MSR_IA32_SYSENTER_EIP, false); + vmx_disable_intercept_for_msr(MSR_IA32_SPEC_CTRL, false); + vmx_disable_intercept_for_msr(MSR_IA32_PRED_CMD, false); memcpy(vmx_msr_bitmap_legacy_x2apic, vmx_msr_bitmap_legacy, PAGE_SIZE); memcpy(vmx_msr_bitmap_longmode_x2apic, diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 5eb469084082..770ace4e1379 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -859,7 +859,7 @@ static u32 msrs_to_save[] = { MSR_CSTAR, MSR_KERNEL_GS_BASE, MSR_SYSCALL_MASK, MSR_LSTAR, #endif MSR_IA32_TSC, MSR_IA32_CR_PAT, MSR_VM_HSAVE_PA, - MSR_IA32_FEATURE_CONTROL + MSR_IA32_FEATURE_CONTROL, MSR_IA32_SPEC_CTRL }; static unsigned num_msrs_to_save; -- 2.15.1