Commit c28fa560 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Paolo Bonzini
Browse files

KVM: x86/vPMU: Forbid reading from MSR_F15H_PERF MSRs when guest doesn't have... 


KVM: x86/vPMU: Forbid reading from MSR_F15H_PERF MSRs when guest doesn't have X86_FEATURE_PERFCTR_CORE

MSR_F15H_PERF_CTL0-5, MSR_F15H_PERF_CTR0-5 MSRs have a CPUID bit assigned
to them (X86_FEATURE_PERFCTR_CORE) and when it wasn't exposed to the guest
the correct behavior is to inject #GP an not just return zero.

Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Message-Id: <20210329124804.170173-1-vkuznets@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 9a7de6ec

arch/x86/kvm/x86.c

+6 −0
Original line number Diff line number Diff line
@@ -3407,6 +3407,12 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) 
		msr_info->data = 0;

		break;

	case MSR_F15H_PERF_CTL0 ... MSR_F15H_PERF_CTR5:

		if (kvm_pmu_is_valid_msr(vcpu, msr_info->index))

			return kvm_pmu_get_msr(vcpu, msr_info);

		if (!msr_info->host_initiated)

			return 1;

		msr_info->data = 0;

		break;

	case MSR_K7_EVNTSEL0 ... MSR_K7_EVNTSEL3:

	case MSR_K7_PERFCTR0 ... MSR_K7_PERFCTR3:

	case MSR_P6_PERFCTR0 ... MSR_P6_PERFCTR1: