mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
KVM: x86/pmu: Replace pmc_perf_hw_id() with perf_get_hw_event_config()
With the help of perf_get_hw_event_config(), KVM could query the correct EVENTSEL_{EVENT, UMASK} pair of a kernel-generic hw event directly from the different *_perfmon_event_map[] by the kernel's pre-defined perf_hw_id. Also extend the bit range of the comparison field to AMD64_RAW_EVENT_MASK_NB to prevent AMD from defining EventSelect[11:8] into perfmon_event_map[] one day. Signed-off-by: Like Xu <likexu@tencent.com> Message-Id: <20220518132512.37864-11-likexu@tencent.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
dc852ff5bb
commit
08dca7a8e7
1 changed files with 2 additions and 7 deletions
|
@ -525,13 +525,8 @@ static void kvm_pmu_incr_counter(struct kvm_pmc *pmc)
|
||||||
static inline bool eventsel_match_perf_hw_id(struct kvm_pmc *pmc,
|
static inline bool eventsel_match_perf_hw_id(struct kvm_pmc *pmc,
|
||||||
unsigned int perf_hw_id)
|
unsigned int perf_hw_id)
|
||||||
{
|
{
|
||||||
u64 old_eventsel = pmc->eventsel;
|
return !((pmc->eventsel ^ perf_get_hw_event_config(perf_hw_id)) &
|
||||||
unsigned int config;
|
AMD64_RAW_EVENT_MASK_NB);
|
||||||
|
|
||||||
pmc->eventsel &= (ARCH_PERFMON_EVENTSEL_EVENT | ARCH_PERFMON_EVENTSEL_UMASK);
|
|
||||||
config = static_call(kvm_x86_pmu_pmc_perf_hw_id)(pmc);
|
|
||||||
pmc->eventsel = old_eventsel;
|
|
||||||
return config == perf_hw_id;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline bool cpl_is_matched(struct kvm_pmc *pmc)
|
static inline bool cpl_is_matched(struct kvm_pmc *pmc)
|
||||||
|
|
Loading…
Reference in a new issue