[PATCH v4 1/4] KVM: arm64: PMU: Add kvm_pmu_enabled_counter_mask()

[Akihiko Odaki]

This function will be useful to enumerate enabled counters.

Signed-off-by: Akihiko Odaki <od...@rsg.ci.i.u-tokyo.ac.jp>
---
 arch/arm64/kvm/pmu-emul.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/arch/arm64/kvm/pmu-emul.c b/arch/arm64/kvm/pmu-emul.c
index b03dbda7f1ab..59ec96e09321 100644
--- a/arch/arm64/kvm/pmu-emul.c
+++ b/arch/arm64/kvm/pmu-emul.c
@@ -619,18 +619,24 @@ void kvm_pmu_handle_pmcr(struct kvm_vcpu *vcpu, u64 val)
        }
 }
 
-static bool kvm_pmu_counter_is_enabled(struct kvm_pmc *pmc)
+static u64 kvm_pmu_enabled_counter_mask(struct kvm_vcpu *vcpu)
 {
-       struct kvm_vcpu *vcpu = kvm_pmc_to_vcpu(pmc);
-       unsigned int mdcr = __vcpu_sys_reg(vcpu, MDCR_EL2);
+       u64 mask = 0;
 
-       if (!(__vcpu_sys_reg(vcpu, PMCNTENSET_EL0) & BIT(pmc->idx)))
-               return false;
+       if (__vcpu_sys_reg(vcpu, MDCR_EL2) & MDCR_EL2_HPME)
+               mask |= kvm_pmu_hyp_counter_mask(vcpu);
 
-       if (kvm_pmu_counter_is_hyp(vcpu, pmc->idx))
-               return mdcr & MDCR_EL2_HPME;
+       if (kvm_vcpu_read_pmcr(vcpu) & ARMV8_PMU_PMCR_E)
+               mask |= ~kvm_pmu_hyp_counter_mask(vcpu);
+
+       return __vcpu_sys_reg(vcpu, PMCNTENSET_EL0) & mask;
+}
+
+static bool kvm_pmu_counter_is_enabled(struct kvm_pmc *pmc)
+{
+       struct kvm_vcpu *vcpu = kvm_pmc_to_vcpu(pmc);
 
-       return kvm_vcpu_read_pmcr(vcpu) & ARMV8_PMU_PMCR_E;
+       return kvm_pmu_enabled_counter_mask(vcpu) & BIT(pmc->idx);
 }
 
 static bool kvm_pmc_counts_at_el0(struct kvm_pmc *pmc)

-- 
2.53.0