Commit 2c985527 authored by Like Xu's avatar Like Xu Committed by Paolo Bonzini
Browse files

KVM: x86/pmu: Introduce the ctrl_mask value for fixed counter 



The mask value of fixed counter control register should be dynamic
adjusted with the number of fixed counters. This patch introduces a
variable that includes the reserved bits of fixed counter control
registers. This is a generic code refactoring.

Co-developed-by: default avatarLuwei Kang <luwei.kang@intel.com>
Signed-off-by: default avatarLuwei Kang <luwei.kang@intel.com>
Signed-off-by: default avatarLike Xu <like.xu@linux.intel.com>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Message-Id: <20220411101946.20262-6-likexu@tencent.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent bef6ecca

arch/x86/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -505,6 +505,7 @@ struct kvm_pmu { 
	unsigned nr_arch_fixed_counters;

	unsigned available_event_types;

	u64 fixed_ctr_ctrl;

	u64 fixed_ctr_ctrl_mask;

	u64 global_ctrl;

	u64 global_status;

	u64 counter_bitmask[2];

arch/x86/kvm/vmx/pmu_intel.c

+5 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) 
	case MSR_CORE_PERF_FIXED_CTR_CTRL:

		if (pmu->fixed_ctr_ctrl == data)

			return 0;

		if (!(data & 0xfffffffffffff444ull)) {

		if (!(data & pmu->fixed_ctr_ctrl_mask)) {

			reprogram_fixed_counters(pmu, data);

			return 0;

		}
@@ -479,6 +479,7 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) 
	struct kvm_cpuid_entry2 *entry;

	union cpuid10_eax eax;

	union cpuid10_edx edx;

	int i;



	pmu->nr_arch_gp_counters = 0;

	pmu->nr_arch_fixed_counters = 0;
@@ -487,6 +488,7 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) 
	pmu->version = 0;

	pmu->reserved_bits = 0xffffffff00200000ull;

	pmu->raw_event_mask = X86_RAW_EVENT_MASK;

	pmu->fixed_ctr_ctrl_mask = ~0ull;



	entry = kvm_find_cpuid_entry(vcpu, 0xa, 0);

	if (!entry || !vcpu->kvm->arch.enable_pmu)
@@ -523,6 +525,8 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) 
		setup_fixed_pmc_eventsel(pmu);

	}



	for (i = 0; i < pmu->nr_arch_fixed_counters; i++)

		pmu->fixed_ctr_ctrl_mask &= ~(0xbull << (i * 4));

	pmu->global_ctrl = ((1ull << pmu->nr_arch_gp_counters) - 1) |

		(((1ull << pmu->nr_arch_fixed_counters) - 1) << INTEL_PMC_IDX_FIXED);

	pmu->global_ctrl_mask = ~pmu->global_ctrl;