iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/KVM/VMX: Don't set l1tf_flush_l1d to true from vmx_l1d_flush()

Browse Source 
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>
This commit is contained in:
Nicolai Stange 2018-07-21 22:16:56 +02:00 committed by Greg Kroah-Hartman
parent c6613521ab
commit c6a43c0423
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/x86/kvm/vmx.c
View File

@ -9166,15 +9166,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++;