Skip to content

Commit e630bb5

Browse files
committed
KVM: x86/pmu: Open code pmc_event_is_allowed() in its callers
Open code pmc_event_is_allowed() in its callers, as kvm_pmu_trigger_event() only needs to check the event filter (both global and local enables are consulted outside of the loop). No functional change intended. Reviewed-by: Dapeng Mi <dapeng1.mi@linux.intel.com> Link: https://lore.kernel.org/r/20250805190526.1453366-14-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 6b6f1ad commit e630bb5

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

arch/x86/kvm/pmu.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -491,12 +491,6 @@ static bool check_pmu_event_filter(struct kvm_pmc *pmc)
491491
return is_fixed_event_allowed(filter, pmc->idx);
492492
}
493493

494-
static bool pmc_event_is_allowed(struct kvm_pmc *pmc)
495-
{
496-
return pmc_is_globally_enabled(pmc) && pmc_is_locally_enabled(pmc) &&
497-
check_pmu_event_filter(pmc);
498-
}
499-
500494
static int reprogram_counter(struct kvm_pmc *pmc)
501495
{
502496
struct kvm_pmu *pmu = pmc_to_pmu(pmc);
@@ -507,7 +501,8 @@ static int reprogram_counter(struct kvm_pmc *pmc)
507501

508502
emulate_overflow = pmc_pause_counter(pmc);
509503

510-
if (!pmc_event_is_allowed(pmc))
504+
if (!pmc_is_globally_enabled(pmc) || !pmc_is_locally_enabled(pmc) ||
505+
!check_pmu_event_filter(pmc))
511506
return 0;
512507

513508
if (emulate_overflow)
@@ -979,7 +974,8 @@ static void kvm_pmu_trigger_event(struct kvm_vcpu *vcpu,
979974
return;
980975

981976
kvm_for_each_pmc(pmu, pmc, i, bitmap) {
982-
if (!pmc_event_is_allowed(pmc) || !cpl_is_matched(pmc))
977+
if (!pmc_is_globally_enabled(pmc) || !pmc_is_locally_enabled(pmc) ||
978+
!check_pmu_event_filter(pmc) || !cpl_is_matched(pmc))
983979
continue;
984980

985981
kvm_pmu_incr_counter(pmc);

0 commit comments

Comments
 (0)