mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-06 16:40:47 +00:00
libpmc: Handle PMCALLOCATE log with PMC code on PMU event system
On an arm64 system that reports as a Cortex A72 r0p3, running pmcstat -P CPU_CYCLES command works, but pmcstat -P cpu-cycles command does not. This is because the former uses the PMU event from the JSON source, resulting in pl_event in the log event being a small index (here, 5) into the generated events table, whilst the latter does not match any of the JSON events and falls back on PMC's own tables, mapping it to the PMC event 0x14111, i.e. PMC_EV_ARMV8_EVENT_11H. Then, when libpmc gets the PMCALLOCATE event, it tries to use the event as an index into the JSON-derived table, but doing so only makes sense for the former, whilst for the latter it will go way out of bounds and either read junk (which may trigger the != NULL assertion) or segfault. As far as I can tell we don't have anything lying around to tell us which of the two cases we're in, but we can exploit the fact that the first 0x1000 PMC event codes are reserved, and that none of our PMU events tables reach that number of entries yet. PR: 268857 Reviewed by: mhorne MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D39592
This commit is contained in:
parent
296a0987be
commit
21f7397a61
|
@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
|
|||
#include <sys/pmc.h>
|
||||
#include <sys/syscall.h>
|
||||
|
||||
#include <assert.h>
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
#include <err.h>
|
||||
|
@ -1084,8 +1085,14 @@ pmc_allocate(const char *ctrspec, enum pmc_mode mode,
|
|||
r = spec_copy = strdup(ctrspec);
|
||||
ctrname = strsep(&r, ",");
|
||||
if (pmc_pmu_enabled()) {
|
||||
if (pmc_pmu_pmcallocate(ctrname, &pmc_config) == 0)
|
||||
if (pmc_pmu_pmcallocate(ctrname, &pmc_config) == 0) {
|
||||
/*
|
||||
* XXX: pmclog_get_event exploits this to disambiguate
|
||||
* PMU from PMC event codes in PMCALLOCATE events.
|
||||
*/
|
||||
assert(pmc_config.pm_ev < PMC_EVENT_FIRST);
|
||||
goto found;
|
||||
}
|
||||
|
||||
/* Otherwise, reset any changes */
|
||||
pmc_config.pm_ev = 0;
|
||||
|
|
|
@ -356,12 +356,27 @@ pmclog_get_event(void *cookie, char **data, ssize_t *len,
|
|||
PMCLOG_READ32(le,ev->pl_u.pl_a.pl_flags);
|
||||
PMCLOG_READ32(le,noop);
|
||||
PMCLOG_READ64(le,ev->pl_u.pl_a.pl_rate);
|
||||
ev->pl_u.pl_a.pl_evname = pmc_pmu_event_get_by_idx(ps->ps_cpuid, ev->pl_u.pl_a.pl_event);
|
||||
if (ev->pl_u.pl_a.pl_evname != NULL)
|
||||
break;
|
||||
else if ((ev->pl_u.pl_a.pl_evname =
|
||||
_pmc_name_of_event(ev->pl_u.pl_a.pl_event, ps->ps_arch))
|
||||
== NULL) {
|
||||
|
||||
/*
|
||||
* Could be either a PMC event code or a PMU event index;
|
||||
* assume that their encodings don't overlap (i.e. no PMU event
|
||||
* table is more than 0x1000 entries) to distinguish them here.
|
||||
* Otherwise pmc_pmu_event_get_by_idx will go out of bounds if
|
||||
* given a PMC event code when it knows about that CPU.
|
||||
*
|
||||
* XXX: Ideally we'd have user flags to give us that context.
|
||||
*/
|
||||
if (ev->pl_u.pl_a.pl_event < PMC_EVENT_FIRST)
|
||||
ev->pl_u.pl_a.pl_evname =
|
||||
pmc_pmu_event_get_by_idx(ps->ps_cpuid,
|
||||
ev->pl_u.pl_a.pl_event);
|
||||
else if (ev->pl_u.pl_a.pl_event <= PMC_EVENT_LAST)
|
||||
ev->pl_u.pl_a.pl_evname =
|
||||
_pmc_name_of_event(ev->pl_u.pl_a.pl_event,
|
||||
ps->ps_arch);
|
||||
else
|
||||
ev->pl_u.pl_a.pl_evname = NULL;
|
||||
if (ev->pl_u.pl_a.pl_evname == NULL) {
|
||||
printf("unknown event\n");
|
||||
goto error;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue