Commit 7a0fc734 authored by Sean Christopherson's avatar Sean Christopherson
Browse files

KVM: x86/pmu: Treat "fixed" PMU type in RDPMC as index as a value, not flag 



Refactor KVM's handling of ECX for RDPMC to treat the FIXED modifier as an
explicit value, not a flag (minus one wart).  While non-architectural PMUs
do use bit 31 as a flag (for "fast" reads), architectural PMUs use the
upper half of ECX to encode the type.  From the SDM:

  ECX[31:16] specifies type of PMC while ECX[15:0] specifies the index of
  the PMC to be read within that type

Note, that the known supported types are 4000H and 2000H, i.e. look a lot
like flags, doesn't contradict the above statement that ECX[31:16] holds
the type, at least not by any sane reading of the SDM.

Keep the explicitly clearing of the FIXED "flag", as KVM subtly relies on
that behavior to disallow unsupported types while allowing the correct
indices for fixed counters.  This wart will be cleaned up in short order.

Opportunistically grab the per-type bitmask in the if-else blocks to
eliminate the one-off usage of the local "fixed" bool.

Reported-by: default avatarJim Mattson <jmattson@google.com>
Tested-by: default avatarDapeng Mi <dapeng1.mi@linux.intel.com>
Link: https://lore.kernel.org/r/20240109230250.424295-11-seanjc@google.com


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

arch/x86/kvm/vmx/pmu_intel.c

+11 −3
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ 
 */

#define INTEL_RDPMC_FIXED	INTEL_PMC_FIXED_RDPMC_BASE



#define INTEL_RDPMC_TYPE_MASK	GENMASK(31, 16)

#define INTEL_RDPMC_INDEX_MASK	GENMASK(15, 0)



#define MSR_PMC_FULL_WIDTH_BIT      (MSR_IA32_PMC0 - MSR_IA32_PERFCTR0)



static void reprogram_fixed_counters(struct kvm_pmu *pmu, u64 data)
@@ -66,10 +69,11 @@ static struct kvm_pmc *intel_pmc_idx_to_pmc(struct kvm_pmu *pmu, int pmc_idx) 
static struct kvm_pmc *intel_rdpmc_ecx_to_pmc(struct kvm_vcpu *vcpu,

					    unsigned int idx, u64 *mask)

{

	unsigned int type = idx & INTEL_RDPMC_TYPE_MASK;

	struct kvm_pmu *pmu = vcpu_to_pmu(vcpu);

	bool fixed = idx & INTEL_RDPMC_FIXED;

	struct kvm_pmc *counters;

	unsigned int num_counters;

	u64 bitmask;



	/*

	 * The encoding of ECX for RDPMC is different for architectural versus
@@ -90,16 +94,20 @@ static struct kvm_pmc *intel_rdpmc_ecx_to_pmc(struct kvm_vcpu *vcpu, 
	 * i.e. let RDPMC fail due to accessing a non-existent counter.

	 */

	idx &= ~INTEL_RDPMC_FIXED;

	if (fixed) {

	if (type == INTEL_RDPMC_FIXED) {

		counters = pmu->fixed_counters;

		num_counters = pmu->nr_arch_fixed_counters;

		bitmask = pmu->counter_bitmask[KVM_PMC_FIXED];

	} else {

		counters = pmu->gp_counters;

		num_counters = pmu->nr_arch_gp_counters;

		bitmask = pmu->counter_bitmask[KVM_PMC_GP];

	}



	if (idx >= num_counters)

		return NULL;

	*mask &= pmu->counter_bitmask[fixed ? KVM_PMC_FIXED : KVM_PMC_GP];



	*mask &= bitmask;

	return &counters[array_index_nospec(idx, num_counters)];

}