Commit 6de2ccc1 authored by Sean Christopherson's avatar Sean Christopherson
Browse files

KVM: x86/pmu: Move .hw_event_available() check out of PMC filter helper 

Move the call to kvm_x86_pmu.hw_event_available(), which has nothing to
with the userspace PMU filter, out of check_pmu_event_filter() and into
its sole caller pmc_event_is_allowed().  pmc_event_is_allowed() didn't
exist when commit 7aadaa98 ("KVM: x86/pmu: Drop amd_event_mapping[]
in the KVM context"), so presumably the motivation for invoking
.hw_event_available() from check_pmu_event_filter() was to avoid having
to add multiple call sites.

Link: https://lore.kernel.org/r/20230607010206.1425277-5-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 6d88d0ee

arch/x86/kvm/pmu.c

+1 −3
Original line number Diff line number Diff line
@@ -382,9 +382,6 @@ static bool check_pmu_event_filter(struct kvm_pmc *pmc) 
	struct kvm_x86_pmu_event_filter *filter;

	struct kvm *kvm = pmc->vcpu->kvm;



	if (!static_call(kvm_x86_pmu_hw_event_available)(pmc))

		return false;



	filter = srcu_dereference(kvm->arch.pmu_event_filter, &kvm->srcu);

	if (!filter)

		return true;
@@ -398,6 +395,7 @@ static bool check_pmu_event_filter(struct kvm_pmc *pmc) 
static bool pmc_event_is_allowed(struct kvm_pmc *pmc)

{

	return pmc_is_globally_enabled(pmc) && pmc_speculative_in_use(pmc) &&

	       static_call(kvm_x86_pmu_hw_event_available)(pmc) &&

	       check_pmu_event_filter(pmc);

}