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

Commit 51844b0f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull KVM fix from Marcelo Tosatti:
 "A correction for oops on module init with older Intel hosts."

* git://git.kernel.org/pub/scm/virt/kvm/kvm:
  KVM: x86: Fix invalid secondary exec controls in vmx_cpuid_update()
parents 0cad3ff4 29282fde

arch/x86/kvm/vmx.c

+7 −4
Original line number Original line Diff line number Diff line
@@ -6549,19 +6549,22 @@ static void vmx_cpuid_update(struct kvm_vcpu *vcpu) 
		}

		}

	}

	}





	exec_control = vmcs_read32(SECONDARY_VM_EXEC_CONTROL);

	/* 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;

		exec_control |= SECONDARY_EXEC_ENABLE_INVPCID;

		vmcs_write32(SECONDARY_VM_EXEC_CONTROL,

		vmcs_write32(SECONDARY_VM_EXEC_CONTROL,

			     exec_control);

			     exec_control);

	} else {

	} else {

		if (cpu_has_secondary_exec_ctrls()) {

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

	}

	}