Commit b7fb8488 authored Mar 04, 2020 by Jan Kiszka Committed by Paolo Bonzini Mar 16, 2020

KVM: x86: Trace the original requested CPUID function in kvm_cpuid()



Trace the requested CPUID function instead of the effective function,
e.g. if the requested function is out-of-range and KVM is emulating an
Intel CPU, as the intent of the tracepoint is to show if the output came
from the actual leaf as opposed to the max basic leaf via redirection.

Similarly, leave "found" as is, i.e. report that an entry was found if
and only if the requested entry was found.

Fixes: 43561123 ("kvm: x86: Improve emulation of CPUID leaves 0BH and 1FH")
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
[Sean: Drop "found" semantic change, reword changelong accordingly ]
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 408e9a31

arch/x86/kvm/cpuid.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -933,7 +933,7 @@ static bool cpuid_function_in_range(struct kvm_vcpu *vcpu, u32 function)
		bool kvm_cpuid(struct kvm_vcpu vcpu, u32 eax, u32 *ebx,
		u32 ecx, u32 edx, bool check_limit)
		{
		u32 function = eax, index = ecx;
		u32 orig_function = eax, function = eax, index = *ecx;
		struct kvm_cpuid_entry2 *entry;
		struct kvm_cpuid_entry2 *max;
		bool found;
		@@ -982,7 +982,7 @@ bool kvm_cpuid(struct kvm_vcpu vcpu, u32 eax, u32 *ebx,
		}
		}
		}
		trace_kvm_cpuid(function, eax, ebx, ecx, edx, found);
		trace_kvm_cpuid(orig_function, eax, ebx, ecx, edx, found);
		return found;
		}
		EXPORT_SYMBOL_GPL(kvm_cpuid);

Admin message