Skip to content

Commit bc96589

Browse files
committed
KVM: x86/pmu: Simplify intel_hw_event_available()
Walk only the "real", i.e. non-pseudo, architectural events when checking if a hardware event is available, i.e. isn't disabled by guest CPUID. Skipping pseudo-arch events in the loop body is unnecessarily convoluted, especially now that KVM has enums that delineate between real and pseudo events. Link: https://lore.kernel.org/r/20230607010206.1425277-3-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent 0033fa3 commit bc96589

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

arch/x86/kvm/vmx/pmu_intel.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,17 +110,16 @@ static bool intel_hw_event_available(struct kvm_pmc *pmc)
110110

111111
BUILD_BUG_ON(ARRAY_SIZE(intel_arch_events) != NR_INTEL_ARCH_EVENTS);
112112

113-
for (i = 0; i < NR_INTEL_ARCH_EVENTS; i++) {
113+
/*
114+
* Disallow events reported as unavailable in guest CPUID. Note, this
115+
* doesn't apply to pseudo-architectural events.
116+
*/
117+
for (i = 0; i < NR_REAL_INTEL_ARCH_EVENTS; i++) {
114118
if (intel_arch_events[i].eventsel != event_select ||
115119
intel_arch_events[i].unit_mask != unit_mask)
116120
continue;
117121

118-
/* disable event that reported as not present by cpuid */
119-
if ((i < PSEUDO_ARCH_REFERENCE_CYCLES) &&
120-
!(pmu->available_event_types & (1 << i)))
121-
return false;
122-
123-
break;
122+
return pmu->available_event_types & BIT(i);
124123
}
125124

126125
return true;

0 commit comments

Comments
 (0)