[PATCH] perf evsel: Ignore the non-group case for branch counters

From: kan . liang
Date: Thu Nov 09 2023 - 11:52:13 EST


From: Kan Liang <kan.liang@xxxxxxxxxxxxxxx>

The perf test 27: Sample parsing fails with the branch counters support
introduced.

The branch counters feature requires all the events to belong to a
group. There is no problem with the normal perf usage which usually
initializes an evlist even for a single evsel.
But the perf test is special, which may not initialize an evlist. The
Sample parsing test case is one of the examples. The existing code
crashes with the !evsel->evlist.

Non-group means the evsel doesn't have branch counters support.

Reported-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Closes: https://lore.kernel.org/lkml/ZUv+G+w5EvJgQS45@xxxxxxxxxx/
Signed-off-by: Kan Liang <kan.liang@xxxxxxxxxxxxxxx>
---
tools/perf/util/evsel.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 58a9b8c82790..7a6a2d1f96db 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -2355,6 +2355,10 @@ static inline bool evsel__has_branch_counters(const struct evsel *evsel)
{
struct evsel *cur, *leader = evsel__leader(evsel);

+ /* The branch counters feature only supports group */
+ if (!leader || !evsel->evlist)
+ return false;
+
evlist__for_each_entry(evsel->evlist, cur) {
if ((leader == evsel__leader(cur)) &&
(cur->core.attr.branch_sample_type & PERF_SAMPLE_BRANCH_COUNTERS))
--
2.35.1