Commit 6593039d authored by Like Xu's avatar Like Xu Committed by Sean Christopherson
Browse files

KVM: x86: Explicitly zero cpuid "0xa" leaf when PMU is disabled 



Add an explicit !enable_pmu check as relying on kvm_pmu_cap to be
zeroed isn't obvious. Although when !enable_pmu, KVM will have
zero-padded kvm_pmu_cap to do subsequent CPUID leaf assignments.

Suggested-by: default avatarSean Christopherson <seanjc@google.com>
Signed-off-by: default avatarLike Xu <likexu@tencent.com>
Link: https://lore.kernel.org/r/20230603011058.1038821-7-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 13afa29a

arch/x86/kvm/cpuid.c

+1 −1
Original line number Diff line number Diff line
@@ -948,7 +948,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_array *array, u32 function) 
		union cpuid10_eax eax;

		union cpuid10_edx edx;



		if (!static_cpu_has(X86_FEATURE_ARCH_PERFMON)) {

		if (!enable_pmu || !static_cpu_has(X86_FEATURE_ARCH_PERFMON)) {

			entry->eax = entry->ebx = entry->ecx = entry->edx = 0;

			break;

		}