mirror of
https://github.com/freebsd/freebsd-src.git
synced 2026-10-28 19:34:43 +01:00
hwpmc: fix event allocation on pre-Zen AMD CPUs
amd_allocate_pmc() chose the pmu-events code path whenever pmc_cpuid was non-empty, and rejected any allocation lacking PMC_F_EV_PMU. But pmc_cpuid is set for every AMD CPU, while the pmu-events tables only cover Zen and later. On older families (K8, Bobcat, Jaguar/16h, Bulldozer) libpmc finds no pmu-events entry and falls back to the legacy path, which never sets PMC_F_EV_PMU. Reviewed by: mhorne Approved by: mhorne MFC after: 1 week MFC to: stable/14, stable/15 Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D58468
This commit is contained in:
1 parent
f884e820d8
commit
6c4d9b9af1
1 file changed
+2
-4
@@ -403,9 +403,6 @@ amd_allocate_pmc(int cpu __unused, int ri, struct pmc *pm,
|
||||
if (pd->pd_class != a->pm_class)
|
||||
return (EINVAL);
|
||||
|
||||
if ((a->pm_flags & PMC_F_EV_PMU) == 0)
|
||||
return (EINVAL);
|
||||
|
||||
caps = pm->pm_caps;
|
||||
|
||||
PMCDBG2(MDP, ALL, 1,"amd-allocate ri=%d caps=0x%x", ri, caps);
|
||||
@@ -418,7 +415,8 @@ amd_allocate_pmc(int cpu __unused, int ri, struct pmc *pm,
|
||||
((pd->pd_caps & PMC_CAP_PRECISE) == 0))
|
||||
return (EINVAL);
|
||||
|
||||
if (strlen(pmc_cpuid) != 0) {
|
||||
/* PMC_F_EV_PMU: config comes from pmu-events tables. */
|
||||
if ((a->pm_flags & PMC_F_EV_PMU) != 0) {
|
||||
config = a->pm_md.pm_amd.pm_amd_config;
|
||||
if ((config & ~amd_config_mask(amd_pmcdesc[ri].pm_subclass,
|
||||
caps)) != 0)
|
||||
|
||||
Reference in new issue
Block a user