x86/KVM/VMX: Move the l1tf_flush_l1d test to vmx_l1d_flush()

commit 5b6ccc6c3b1a477fbac9ec97a0b4c1c48e765209 upstream

Currently, vmx_vcpu_run() checks if l1tf_flush_l1d is set and invokes
vmx_l1d_flush() if so.

This test is unncessary for the "always flush L1D" mode.

Move the check to vmx_l1d_flush()'s conditional mode code path.

Notes:
- vmx_l1d_flush() is likely to get inlined anyway and thus, there's no
  extra function call.

- This inverts the (static) branch prediction, but there hadn't been any
  explicit likely()/unlikely() annotations before and so it stays as is.

Signed-off-by: Nicolai Stange <nstange@suse.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 796c4eb2cd8f9b25198eb0bd99da0c0609fd971a..df1a72b59ad224473ee184a7bf0717a51ae2efda 100644 (file)
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -8667,12 +8667,16 @@ static void vmx_l1d_flush(struct kvm_vcpu *vcpu)
         * 'always'
         */
        if (static_branch_likely(&vmx_l1d_flush_cond)) {
+               bool flush_l1d = vcpu->arch.l1tf_flush_l1d;
+
                /*
                 * 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;
+               if (!flush_l1d)
+                       return;
        }
 
        vcpu->stat.l1d_flush++;
@@ -9162,10 +9166,8 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
 
        vmx->__launched = vmx->loaded_vmcs->launched;
 
-       if (static_branch_unlikely(&vmx_l1d_should_flush)) {
-               if (vcpu->arch.l1tf_flush_l1d)
-                       vmx_l1d_flush(vcpu);
-       }
+       if (static_branch_unlikely(&vmx_l1d_should_flush))
+               vmx_l1d_flush(vcpu);
 
        asm(
                /* Store host registers */