From: Thomas Gleixner <tglx@linutronix.de>

Date: Wed, 27 Feb 2019 12:48:14 +0100

Subject: x86/kvm/vmx: Add MDS protection when L1D Flush is not active

Git-commit: 650b68a0622f933444a6d66936abb3103029413b

Patch-mainline: v5.1-rc1

References: bsc#1111331, CVE-2018-12126, CVE-2018-12127, CVE-2018-12130, CVE-2019-11091

CPUs which are affected by L1TF and MDS mitigate MDS with the L1D Flush on

VMENTER when updated microcode is installed.

If a CPU is not affected by L1TF or if the L1D Flush is not in use, then

MDS mitigation needs to be invoked explicitly.

For these cases, follow the host mitigation state and invoke the MDS

mitigation before VMENTER.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Reviewed-by: Frederic Weisbecker <frederic@kernel.org>

Reviewed-by: Borislav Petkov <bp@suse.de>

Reviewed-by: Jon Masters <jcm@redhat.com>

Tested-by: Jon Masters <jcm@redhat.com>

Acked-by: Borislav Petkov <bp@suse.de>

---

 arch/x86/kernel/cpu/bugs.c |    1 +

 arch/x86/kvm/vmx.c         |    3 +++

 2 files changed, 4 insertions(+)

--- a/arch/x86/kernel/cpu/bugs.c

+++ b/arch/x86/kernel/cpu/bugs.c

@@ -62,6 +62,7 @@ DEFINE_STATIC_KEY_FALSE(switch_mm_always

 /* Control MDS CPU buffer clear before returning to user space */

 DEFINE_STATIC_KEY_FALSE(mds_user_clear);

+EXPORT_SYMBOL_GPL(mds_user_clear);

 void __init check_bugs(void)

 {

--- a/arch/x86/kvm/vmx.c

+++ b/arch/x86/kvm/vmx.c

@@ -9684,8 +9684,11 @@ static void __noclone vmx_vcpu_run(struc

 	vmx->__launched = vmx->loaded_vmcs->launched;

+	/* L1D Flush includes CPU buffer clear to mitigate MDS */

 	if (static_branch_unlikely(&vmx_l1d_should_flush))

 		vmx_l1d_flush(vcpu);

+	else if (static_branch_unlikely(&mds_user_clear))

+		mds_clear_cpu_buffers();

 	asm(

 		/* Store host registers */