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

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

KVM: VMX: unify SECONDARY_VM_EXEC_CONTROL update 



Unify the update in vmx_cpuid_update()

Signed-off-by: default avatarXiao Guangrong <guangrong.xiao@linux.intel.com>
[Rewrite to use vmcs_set_secondary_exec_control. - Paolo]
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 8b97265a

arch/x86/kvm/vmx.c

+25 −10
Original line number Original line Diff line number Diff line
@@ -8668,23 +8668,38 @@ static int vmx_get_lpage_level(void) 
		return PT_PDPE_LEVEL;

		return PT_PDPE_LEVEL;

}

}





static void vmcs_set_secondary_exec_control(u32 new_ctl)

{

	/*

	 * These bits in the secondary execution controls field

	 * are dynamic, the others are mostly based on the hypervisor

	 * architecture and the guest's CPUID.  Do not touch the

	 * dynamic bits.

	 */

	u32 mask =

		SECONDARY_EXEC_SHADOW_VMCS |

		SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE |

		SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES;



	u32 cur_ctl = vmcs_read32(SECONDARY_VM_EXEC_CONTROL);



	vmcs_write32(SECONDARY_VM_EXEC_CONTROL,

		     (new_ctl & ~mask) | (cur_ctl & mask));

}



static void vmx_cpuid_update(struct kvm_vcpu *vcpu)

static void vmx_cpuid_update(struct kvm_vcpu *vcpu)

{

{

	struct kvm_cpuid_entry2 *best;

	struct kvm_cpuid_entry2 *best;

	struct vcpu_vmx *vmx = to_vmx(vcpu);

	struct vcpu_vmx *vmx = to_vmx(vcpu);

	u32 exec_control;

	u32 secondary_exec_ctl = vmx_secondary_exec_control(vmx);





	vmx->rdtscp_enabled = false;

	vmx->rdtscp_enabled = false;

	if (vmx_rdtscp_supported()) {

	if (vmx_rdtscp_supported()) {

		exec_control = vmcs_read32(SECONDARY_VM_EXEC_CONTROL);

		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;

		else {

		else

			exec_control &= ~SECONDARY_EXEC_RDTSCP;

			secondary_exec_ctl &= ~SECONDARY_EXEC_RDTSCP;

			vmcs_write32(SECONDARY_VM_EXEC_CONTROL,

					exec_control);

		}





		if (nested) {

		if (nested) {

			if (vmx->rdtscp_enabled)

			if (vmx->rdtscp_enabled)
@@ -8701,14 +8716,14 @@ static void vmx_cpuid_update(struct kvm_vcpu *vcpu) 
	if (vmx_invpcid_supported() &&

	if (vmx_invpcid_supported() &&

	    (!best || !(best->ebx & bit(X86_FEATURE_INVPCID)) ||

	    (!best || !(best->ebx & bit(X86_FEATURE_INVPCID)) ||

	    !guest_cpuid_has_pcid(vcpu))) {

	    !guest_cpuid_has_pcid(vcpu))) {

		exec_control = vmcs_read32(SECONDARY_VM_EXEC_CONTROL);

		secondary_exec_ctl &= ~SECONDARY_EXEC_ENABLE_INVPCID;

		exec_control &= ~SECONDARY_EXEC_ENABLE_INVPCID;

		vmcs_write32(SECONDARY_VM_EXEC_CONTROL, exec_control);





		if (best)

		if (best)

			best->ebx &= ~bit(X86_FEATURE_INVPCID);

			best->ebx &= ~bit(X86_FEATURE_INVPCID);

	}

	}





	vmcs_set_secondary_exec_control(secondary_exec_ctl);



	if (static_cpu_has(X86_FEATURE_PCOMMIT) && nested) {

	if (static_cpu_has(X86_FEATURE_PCOMMIT) && nested) {

		if (guest_cpuid_has_pcommit(vcpu))

		if (guest_cpuid_has_pcommit(vcpu))

			vmx->nested.nested_vmx_secondary_ctls_high |=

			vmx->nested.nested_vmx_secondary_ctls_high |=