LF-10210 perf pmu: add loaded_json_aliases for non-core pmu when get total events number

After pmu_read_sysfs(), event aliases in json may be loaded for non-core
pmu. And pmu->event_table is NULL for non-core pmu.
If perf_pmu__num_events() didn't add loaded_json_aliases to the total
number, perf list will show below error:

Unexpected event imx8_ddr0/imx8_ddr0/write-command//
...

This is because perf_pmu__num_events() didn't count correct events number.
This will allow perf_pmu__num_events() to get corrent events number.

Signed-off-by: Xu Yang <xu.yang_2@nxp.com>
This commit is contained in:
Xu Yang 2023-10-10 14:42:25 +08:00
parent ace8cabc03
commit 2912914ad7

View File

@ -1610,8 +1610,8 @@ size_t perf_pmu__num_events(struct perf_pmu *pmu)
nr = pmu->sysfs_aliases;
if (pmu->cpu_aliases_added)
nr += pmu->loaded_json_aliases;
if (pmu->cpu_aliases_added || pmu->is_uncore)
nr += pmu->loaded_json_aliases;
else if (pmu->events_table)
nr += pmu_events_table__num_events(pmu->events_table, pmu) - pmu->loaded_json_aliases;