KVM: x86/pmu: Process only enabled PMCs when emulating events in software

[linux-2.6-microblaze.git] / arch / x86 / kvm / pmu.c

diff --git a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c
index 7b5563f..c04c3f3 100644 (file)
--- a/arch/x86/kvm/pmu.c
+++ b/arch/x86/kvm/pmu.c
@@ -847,11 +847,20 @@ static inline bool cpl_is_matched(struct kvm_pmc *pmc)
 
 void kvm_pmu_trigger_event(struct kvm_vcpu *vcpu, u64 perf_hw_id)
 {
+       DECLARE_BITMAP(bitmap, X86_PMC_IDX_MAX);
        struct kvm_pmu *pmu = vcpu_to_pmu(vcpu);
        struct kvm_pmc *pmc;
        int i;
 
-       kvm_for_each_pmc(pmu, pmc, i, pmu->all_valid_pmc_idx) {
+       BUILD_BUG_ON(sizeof(pmu->global_ctrl) * BITS_PER_BYTE != X86_PMC_IDX_MAX);
+
+       if (!kvm_pmu_has_perf_global_ctrl(pmu))
+               bitmap_copy(bitmap, pmu->all_valid_pmc_idx, X86_PMC_IDX_MAX);
+       else if (!bitmap_and(bitmap, pmu->all_valid_pmc_idx,
+                            (unsigned long *)&pmu->global_ctrl, X86_PMC_IDX_MAX))
+               return;
+
+       kvm_for_each_pmc(pmu, pmc, i, bitmap) {
                if (!pmc_event_is_allowed(pmc))
                        continue;