Revert "KVM: nested VMX: disable perf cpuid reporting" (0b4c208d) · Commits · 戴 / test

This reverts commit . A CPUID instruction executed in VMX non-root mode always causes a VM-exit, regardless of the leaf being queried. Fixes: ("KVM: nested VMX: disable perf cpuid reporting") Signed-off-by:

Jim Mattson <jmattson@google.com> [The issue solved by has been resolved with ("KVM: nVMX: Add nested msr load/restore algorithm").] Signed-off-by:

Radim Krčmář <rkrcmar@redhat.com>

arch/x86/kvm/cpuid.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -861,12 +861,6 @@ void kvm_cpuid(struct kvm_vcpu vcpu, u32 eax, u32 ebx, u32 ecx, u32 *edx)
		if (!best)
		best = check_cpuid_limit(vcpu, function, index);

		/*
		* Perfmon not yet supported for L2 guest.
		*/
		if (is_guest_mode(vcpu) && function == 0xa)
		best = NULL;

		if (best) {
		*eax = best->eax;
		*ebx = best->ebx;

arch/x86/kvm/vmx.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -8203,8 +8203,6 @@ static bool nested_vmx_exit_handled(struct kvm_vcpu *vcpu)
		case EXIT_REASON_TASK_SWITCH:
		return true;
		case EXIT_REASON_CPUID:
		if (kvm_register_read(vcpu, VCPU_REGS_RAX) == 0xa)
		return false;
		return true;
		case EXIT_REASON_HLT:
		return nested_cpu_has(vmcs12, CPU_BASED_HLT_EXITING);

Admin message