perf evlist: Allow setting arbitrary leader

The leader of a group is the first, but allow it to be an arbitrary list
member so that for Intel topdown events slots may always be the group
leader.

Reviewed-by: Kajol Jain <kjain@linux.ibm.com>
Signed-off-by: Ian Rogers <irogers@google.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Clarke <pc@us.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Riccardo Mancini <rickyman7@gmail.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Vineet Singh <vineet.singh@intel.com>
Link: http://lore.kernel.org/lkml/20211130174945.247604-1-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/lib/perf/evlist.c b/tools/lib/perf/evlist.c
index e37dfad31383fe509a1387d7002f022355971cd1..245acbc53bd324660a061a79e07881788c8a6b64 100644 (file)
--- a/tools/lib/perf/evlist.c
+++ b/tools/lib/perf/evlist.c
@@ -643,14 +643,14 @@ perf_evlist__next_mmap(struct perf_evlist *evlist, struct perf_mmap *map,
        return overwrite ? evlist->mmap_ovw_first : evlist->mmap_first;
 }
 
-void __perf_evlist__set_leader(struct list_head *list)
+void __perf_evlist__set_leader(struct list_head *list, struct perf_evsel *leader)
 {
-       struct perf_evsel *evsel, *leader;
+       struct perf_evsel *first, *last, *evsel;
 
-       leader = list_entry(list->next, struct perf_evsel, node);
-       evsel = list_entry(list->prev, struct perf_evsel, node);
+       first = list_first_entry(list, struct perf_evsel, node);
+       last = list_last_entry(list, struct perf_evsel, node);
 
-       leader->nr_members = evsel->idx - leader->idx + 1;
+       leader->nr_members = last->idx - first->idx + 1;
 
        __perf_evlist__for_each_entry(list, evsel)
                evsel->leader = leader;
@@ -659,7 +659,10 @@ void __perf_evlist__set_leader(struct list_head *list)
 void perf_evlist__set_leader(struct perf_evlist *evlist)
 {
        if (evlist->nr_entries) {
+               struct perf_evsel *first = list_entry(evlist->entries.next,
+                                               struct perf_evsel, node);
+
                evlist->nr_groups = evlist->nr_entries > 1 ? 1 : 0;
-               __perf_evlist__set_leader(&evlist->entries);
+               __perf_evlist__set_leader(&evlist->entries, first);
        }
 }

diff --git a/tools/lib/perf/include/internal/evlist.h b/tools/lib/perf/include/internal/evlist.h
index f366dbad6a88ca92221980e084360854ae665c18..6f74269a3ad441da34fd8472d24804838bd73e12 100644 (file)
--- a/tools/lib/perf/include/internal/evlist.h
+++ b/tools/lib/perf/include/internal/evlist.h
@@ -127,5 +127,5 @@ int perf_evlist__id_add_fd(struct perf_evlist *evlist,
 
 void perf_evlist__reset_id_hash(struct perf_evlist *evlist);
 
-void __perf_evlist__set_leader(struct list_head *list);
+void __perf_evlist__set_leader(struct list_head *list, struct perf_evsel *leader);
 #endif /* __LIBPERF_INTERNAL_EVLIST_H */

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index ba74fdf74af91f983d9fcb09c650c1c1d281c8e4..1d68167ab611758c7825e7554541758fa8546071 100644 (file)
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -1837,8 +1837,8 @@ void parse_events__set_leader(char *name, struct list_head *list,
        if (parse_events__set_leader_for_uncore_aliase(name, list, parse_state))
                return;
 
-       __perf_evlist__set_leader(list);
-       leader = list_entry(list->next, struct evsel, core.node);
+       leader = list_first_entry(list, struct evsel, core.node);
+       __perf_evlist__set_leader(list, &leader->core);
        leader->group_name = name ? strdup(name) : NULL;
 }