perf mem: Check mem_events for all eligible PMUs
JIRA: https://issues.redhat.com/browse/RHEL-29796 upstream ======== commit 6e05d28ff232cf445cc6ae59336b7f2081ef9b96 Author: Kan Liang <kan.liang@linux.intel.com> Date: Thu Sep 5 10:07:35 2024 -0700 description =========== The current perf_pmu__mem_events_init() only checks the availability of the mem_events for the first eligible PMU. It works for non-hybrid machines and hybrid machines that have the same mem_events. However, it may bring issues if a hybrid machine has a different mem_events on different PMU, e.g., Alder Lake and Raptor Lake. A mem-loads-aux event is only required for the p-core. The mem_events on both e-core and p-core should be checked and marked. The issue was not found, because it's hidden by another bug, which only records the mem-events for the e-core. The wrong check for the p-core events didn't yell. Fixes: abbdd79b786e036e ("perf mem: Clean up perf_mem_events__name()") Signed-off-by: Kan Liang <kan.liang@linux.intel.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Ian Rogers <irogers@google.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Link: https://lore.kernel.org/r/20240905170737.4070743-1-kan.liang@linux.intel.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Michael Petlan <mpetlan@redhat.com>
This commit is contained in:
parent
68b6f15e74
commit
a3e4a656ce
|
@ -3261,7 +3261,7 @@ static int perf_c2c__record(int argc, const char **argv)
|
|||
return -1;
|
||||
}
|
||||
|
||||
if (perf_pmu__mem_events_init(pmu)) {
|
||||
if (perf_pmu__mem_events_init()) {
|
||||
pr_err("failed: memory events not supported\n");
|
||||
return -1;
|
||||
}
|
||||
|
|
|
@ -88,7 +88,7 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem,
|
|||
return -1;
|
||||
}
|
||||
|
||||
if (perf_pmu__mem_events_init(pmu)) {
|
||||
if (perf_pmu__mem_events_init()) {
|
||||
pr_err("failed: memory events not supported\n");
|
||||
return -1;
|
||||
}
|
||||
|
|
|
@ -192,7 +192,7 @@ static bool perf_pmu__mem_events_supported(const char *mnt, struct perf_pmu *pmu
|
|||
return !stat(path, &st);
|
||||
}
|
||||
|
||||
int perf_pmu__mem_events_init(struct perf_pmu *pmu)
|
||||
static int __perf_pmu__mem_events_init(struct perf_pmu *pmu)
|
||||
{
|
||||
const char *mnt = sysfs__mount();
|
||||
bool found = false;
|
||||
|
@ -219,6 +219,18 @@ int perf_pmu__mem_events_init(struct perf_pmu *pmu)
|
|||
return found ? 0 : -ENOENT;
|
||||
}
|
||||
|
||||
int perf_pmu__mem_events_init(void)
|
||||
{
|
||||
struct perf_pmu *pmu = NULL;
|
||||
|
||||
while ((pmu = perf_pmus__scan_mem(pmu)) != NULL) {
|
||||
if (__perf_pmu__mem_events_init(pmu))
|
||||
return -ENOENT;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void perf_pmu__mem_events_list(struct perf_pmu *pmu)
|
||||
{
|
||||
int j;
|
||||
|
|
|
@ -30,7 +30,7 @@ extern unsigned int perf_mem_events__loads_ldlat;
|
|||
extern struct perf_mem_event perf_mem_events[PERF_MEM_EVENTS__MAX];
|
||||
|
||||
int perf_pmu__mem_events_parse(struct perf_pmu *pmu, const char *str);
|
||||
int perf_pmu__mem_events_init(struct perf_pmu *pmu);
|
||||
int perf_pmu__mem_events_init(void);
|
||||
|
||||
struct perf_mem_event *perf_pmu__mem_events_ptr(struct perf_pmu *pmu, int i);
|
||||
struct perf_pmu *perf_mem_events_find_pmu(void);
|
||||
|
|
Loading…
Reference in New Issue