aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolai Stange <nstange@suse.de>2018-07-21 22:16:56 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-08-15 17:37:31 +0200
commitd3cc70af8e59ebacaf030f3e0d0293211f170494 (patch)
treeb52b9e552d2b974a51abd3769319b1bb003aa59e
parent89f5f7582732de8845e98c23bccae46a6252a601 (diff)
downloadlinux-yocto-d3cc70af8e59ebacaf030f3e0d0293211f170494.tar.gz
linux-yocto-d3cc70af8e59ebacaf030f3e0d0293211f170494.tar.bz2
linux-yocto-d3cc70af8e59ebacaf030f3e0d0293211f170494.zip
x86/KVM/VMX: Don't set l1tf_flush_l1d to true from vmx_l1d_flush()
commit 379fd0c7e6a391e5565336a646f19f218fb98c6c upstream. vmx_l1d_flush() gets invoked only if l1tf_flush_l1d is true. There's no point in setting l1tf_flush_l1d to true from there again. Signed-off-by: Nicolai Stange <nstange@suse.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/x86/kvm/vmx.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index b2f595afc1f4..b5dbd45b5733 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -9727,15 +9727,15 @@ static void vmx_l1d_flush(struct kvm_vcpu *vcpu)
/*
* This code is only executed when the the flush mode is 'cond' or
* 'always'
- *
- * If 'flush always', keep the flush bit set, otherwise clear
- * it. The flush bit gets set again either from vcpu_run() or from
- * one of the unsafe VMEXIT handlers.
*/
- if (static_branch_unlikely(&vmx_l1d_flush_always))
- vcpu->arch.l1tf_flush_l1d = true;
- else
+ if (!static_branch_unlikely(&vmx_l1d_flush_always)) {
+ /*
+ * Clear the flush bit, it gets set again either from
+ * vcpu_run() or from one of the unsafe VMEXIT
+ * handlers.
+ */
vcpu->arch.l1tf_flush_l1d = false;
+ }
vcpu->stat.l1d_flush++;