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

Commit f36201e5 authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Paolo Bonzini
Browse files

KVM: VMX: simplify rdtscp handling in vmx_cpuid_update() 



if vmx_rdtscp_supported() is true SECONDARY_EXEC_RDTSCP must
have already been set in current vmcs by
vmx_secondary_exec_control()

Signed-off-by: default avatarXiao Guangrong <guangrong.xiao@linux.intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent e2821620

arch/x86/kvm/vmx.c

+8 −9
Original line number Original line Diff line number Diff line
@@ -8677,7 +8677,6 @@ static void vmx_cpuid_update(struct kvm_vcpu *vcpu) 
	vmx->rdtscp_enabled = false;

	vmx->rdtscp_enabled = false;

	if (vmx_rdtscp_supported()) {

	if (vmx_rdtscp_supported()) {

		exec_control = vmcs_read32(SECONDARY_VM_EXEC_CONTROL);

		exec_control = vmcs_read32(SECONDARY_VM_EXEC_CONTROL);

		if (exec_control & SECONDARY_EXEC_RDTSCP) {

		best = kvm_find_cpuid_entry(vcpu, 0x80000001, 0);

		best = kvm_find_cpuid_entry(vcpu, 0x80000001, 0);

		if (best && (best->edx & bit(X86_FEATURE_RDTSCP)))

		if (best && (best->edx & bit(X86_FEATURE_RDTSCP)))

			vmx->rdtscp_enabled = true;

			vmx->rdtscp_enabled = true;
@@ -8686,7 +8685,7 @@ static void vmx_cpuid_update(struct kvm_vcpu *vcpu) 
			vmcs_write32(SECONDARY_VM_EXEC_CONTROL,

			vmcs_write32(SECONDARY_VM_EXEC_CONTROL,

					exec_control);

					exec_control);

		}

		}

		}



		if (nested && !vmx->rdtscp_enabled)

		if (nested && !vmx->rdtscp_enabled)

			vmx->nested.nested_vmx_secondary_ctls_high &=

			vmx->nested.nested_vmx_secondary_ctls_high &=

				~SECONDARY_EXEC_RDTSCP;

				~SECONDARY_EXEC_RDTSCP;