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

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

KVM: VMX: simplify invpcid handling in vmx_cpuid_update() 



If vmx_invpcid_supported() is true, second execution control
filed must be supported and SECONDARY_EXEC_ENABLE_INVPCID
must have already been set in current vmcs by
vmx_secondary_exec_control()

If vmx_invpcid_supported() is false, no need to clear
SECONDARY_EXEC_ENABLE_INVPCID

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

arch/x86/kvm/vmx.c

+5 −12
Original line number Original line Diff line number Diff line
@@ -8694,19 +8694,12 @@ static void vmx_cpuid_update(struct kvm_vcpu *vcpu) 
	/* Exposing INVPCID only when PCID is exposed */

	/* Exposing INVPCID only when PCID is exposed */

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

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

	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);

		exec_control |= SECONDARY_EXEC_ENABLE_INVPCID;

		vmcs_write32(SECONDARY_VM_EXEC_CONTROL,

			     exec_control);

	} else {

		if (cpu_has_secondary_exec_ctrls()) {

		exec_control = vmcs_read32(SECONDARY_VM_EXEC_CONTROL);

		exec_control = vmcs_read32(SECONDARY_VM_EXEC_CONTROL);

		exec_control &= ~SECONDARY_EXEC_ENABLE_INVPCID;

		exec_control &= ~SECONDARY_EXEC_ENABLE_INVPCID;

			vmcs_write32(SECONDARY_VM_EXEC_CONTROL,

		vmcs_write32(SECONDARY_VM_EXEC_CONTROL, exec_control);

				     exec_control);



		}

		if (best)

		if (best)

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

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

	}

	}