Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fff7d27 authored by Gleb Natapov's avatar Gleb Natapov Committed by Avi Kivity
Browse files

KVM: VMX: Fix cr8 exiting control clobbering by EPT 



Don't call adjust_vmx_controls() two times for the same control.
It restores options that were dropped earlier.  This loses us the cr8
exit control, which causes a massive performance regression Windows x64.

Cc: stable@kernel.org
Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 60f24784

arch/x86/kvm/vmx.c

+3 −6
Original line number Diff line number Diff line
@@ -1262,12 +1262,9 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf) 
	if (_cpu_based_2nd_exec_control & SECONDARY_EXEC_ENABLE_EPT) {

		/* CR3 accesses and invlpg don't need to cause VM Exits when EPT

		   enabled */

		min &= ~(CPU_BASED_CR3_LOAD_EXITING |

		_cpu_based_exec_control &= ~(CPU_BASED_CR3_LOAD_EXITING |

					     CPU_BASED_CR3_STORE_EXITING |

					     CPU_BASED_INVLPG_EXITING);

		if (adjust_vmx_controls(min, opt, MSR_IA32_VMX_PROCBASED_CTLS,

					&_cpu_based_exec_control) < 0)

			return -EIO;

		rdmsr(MSR_IA32_VMX_EPT_VPID_CAP,

		      vmx_capability.ept, vmx_capability.vpid);

	}