perf pmus: Create placholder regardless of scanning core_only
Ian Rogers
reviewerPATCH 1/2 perf pmus: Create placholder regardless of scanning core_only
If scanning all PMUs the placeholder is still necessary if no core PMU is found. This situation occurs in perf test's parse-events test, when uncore events appear before core.
Fixes 628eaa4e877a ("perf pmus: Add placeholder core PMU")
Signed-off-by Ian Rogers <[email protected]>
--- tools/perf/util/pmus.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
tools/perf/util/pmus.c +7 -9
@@ -152,16 +152,14 @@ static void pmu_read_sysfs(bool core_only) }closedir (dir); -if (core_only) { -if (!list_empty (&core_pmus)) - read_sysfs_core_pmus = true; -else { -if (perf_pmu__create_placeholder_core_pmu (&core_pmus)) - read_sysfs_core_pmus = true; - } - }else { +if (list_empty (&core_pmus)) { +if (!perf_pmu__create_placeholder_core_pmu (&core_pmus)) +pr_err ("Failure to set up any core PMUs\n" ); + } +if (!list_empty (&core_pmus)) { read_sysfs_core_pmus = true; - read_sysfs_all_pmus = true; +if (!core_only) + read_sysfs_all_pmus = true; } }
Signature · 1 line
2.41.0.390.g38632f3daf-goog
Ian Rogers
reviewerPATCH 2/2 perf test parse-events: Test complex name has required event format
test__checkevent_complex_name will use an "event" format which if not present, such as with a placeholder PMU, will cause test failures. Skip the test in this case to avoid failures in restricted environments.
Add perf_pmu__has_format utility as a general PMU utility.
Fixes 628eaa4e877a ("perf pmus: Add placeholder core PMU")
Signed-off-by Ian Rogers <[email protected]>
--- tools/perf/tests/parse-events.c | 12 +++++++++++- tools/perf/util/pmu.c | 11 +++++++++++ tools/perf/util/pmu.h | 1 + 3 files changed, 23 insertions(+), 1 deletion(-)
tools/perf/tests/parse-events.c +11 -1
@@ -1631,6 +1631,16 @@ static bool test__pmu_cpu_valid(void)return !!perf_pmus__find ("cpu" ); } +static bool test__pmu_cpu_event_valid (void ) +{ +struct perf_pmu *pmu =perf_pmus__find ("cpu" ); + +if (!pmu) +return false; + +return perf_pmu__has_format (pmu,"event" ); +} +static bool test__intel_pt_valid (void ) {return !!perf_pmus__find ("intel_pt" );
@@ -2179,7 +2189,7 @@ static const struct evlist_test test__events_pmu[] = { }, { .name = "cpu/name='COMPLEX_CYCLES_NAME:orig=cycles,desc=chip-clock-ticks',period=0x1,event=0x2/ukp", - .valid = test__pmu_cpu_valid, + .valid = test__pmu_cpu_event_valid, .check = test__checkevent_complex_name, /* 3 */ },
tools/perf/util/pmu.c +11 -0
@@ -1440,6 +1440,17 @@ void perf_pmu__del_formats(struct list_head *formats) } } +bool perf_pmu__has_format (const struct perf_pmu *pmu,const char *name) +{ +struct perf_pmu_format *format; + +list_for_each_entry (format, &pmu->format, list) { +if (!strcmp (format->name, name)) +return true; + } +return false; +} +bool is_pmu_core (const char *name) {return !strcmp (name,"cpu" ) || !strcmp (name,"cpum_cf" ) ||is_sysfs_pmu_core (name);
tools/perf/util/pmu.h +1 -0
@@ -234,6 +234,7 @@ int perf_pmu__new_format(struct list_head *list, char *name,void perf_pmu__set_format (unsigned long *bits,long from,long to);int perf_pmu__format_parse (int dirfd,struct list_head *head);void perf_pmu__del_formats (struct list_head *formats); +bool perf_pmu__has_format (const struct perf_pmu *pmu,const char *name);bool is_pmu_core (const char *name);bool perf_pmu__supports_legacy_cache (const struct perf_pmu *pmu);
Signature · 1 line
2.41.0.390.g38632f3daf-goog