Skip to content

Commit

Permalink
KVM: x86/vPMU: introduce kvm_pmu_msr_idx_to_pmc
Browse files Browse the repository at this point in the history
This function will be part of the kvm_pmu_ops interface.  Introduce
it already.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
Wei Huang authored and Paolo Bonzini committed Jun 23, 2015
1 parent e5af058 commit 41aac14
Showing 1 changed file with 18 additions and 6 deletions.
24 changes: 18 additions & 6 deletions arch/x86/kvm/pmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -348,22 +348,34 @@ int kvm_pmu_is_valid_msr_idx(struct kvm_vcpu *vcpu, unsigned idx)
(fixed && idx >= pmu->nr_arch_fixed_counters);
}

int kvm_pmu_rdpmc(struct kvm_vcpu *vcpu, unsigned idx, u64 *data)
static struct kvm_pmc *kvm_pmu_msr_idx_to_pmc(struct kvm_vcpu *vcpu,
unsigned idx)
{
struct kvm_pmu *pmu = vcpu_to_pmu(vcpu);
bool fast_mode = idx & (1u << 31);
bool fixed = idx & (1u << 30);
struct kvm_pmc *counters;
u64 ctr_val;

idx &= ~(3u << 30);
if (!fixed && idx >= pmu->nr_arch_gp_counters)
return 1;
return NULL;
if (fixed && idx >= pmu->nr_arch_fixed_counters)
return 1;
return NULL;
counters = fixed ? pmu->fixed_counters : pmu->gp_counters;

ctr_val = pmc_read_counter(&counters[idx]);
return &counters[idx];
}

int kvm_pmu_rdpmc(struct kvm_vcpu *vcpu, unsigned idx, u64 *data)
{
bool fast_mode = idx & (1u << 31);
struct kvm_pmc *pmc;
u64 ctr_val;

pmc = kvm_pmu_msr_idx_to_pmc(vcpu, idx);
if (!pmc)
return 1;

ctr_val = pmc_read_counter(pmc);
if (fast_mode)
ctr_val = (u32)ctr_val;

Expand Down

0 comments on commit 41aac14

Please sign in to comment.