Skip to contentSkip to conversation

perf evlist: Ensure grouped events with same cpu map

PATCH Superseded Jin Yao 2 participants 3 messages May 21, 2020 – May 25, 2020 perf events

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Jin Yao

author
#0 lore raw

PATCH 1/1 perf evlist: Ensure grouped events with same cpu map

A metric may consist of core event and uncore event (or other per-socket event)

For example, the metric "C2_Pkg_Residency" consists of "cstate_pkg/c2-residency" and "msr/tsc". The former is per-socket event and the latter is per-cpu event.

"C2_Pkg_Residency" hits assertion failure on cascadelakex.

 # perf stat -M "C2_Pkg_Residency" -a -- sleep 1
 perf: util/evsel.c:1464: get_group_fd: Assertion `!(fd == -1)' failed.
 Aborted

The root cause is one issue in get_group_fd(), access violation!

For a group mixed with per-socket event and per-cpu event and the group leader is per-socket event, access violation will happen.

perf_evsel__alloc_fd allocates one FD member for per-socket event. Only FD(evsel, 0, 0) is valid (suppose one-socket system).

But for per-cpu event, perf_evsel__alloc_fd allocates N FD members (N = ncpus). For example, if ncpus is 8, FD(evsel, 0, 0) to FD(evsel, 7, 0) are valid.

get_group_fd(struct evsel *evsel, int cpu, int thread) {
struct evsel *leader = evsel->leader;

fd = FD(leader, cpu, thread); /* access violation */
}

If leader is per-socket event, only FD(leader, 0, 0) is valid. So when get_group_fd tries to access FD(leader, 1, 0), access violation will happen.

This patch ensures that the grouped events with same cpu maps before we go to get_group_fd.

If the cpu maps are not matched, we force to disable the group.

Fixes 6a4bb04caacc8 ("perf tools: Enable grouping logic for parsed events")
---
 tools/perf/builtin-stat.c |  3 +++
 tools/perf/util/evlist.c  | 32 ++++++++++++++++++++++++++++++++
 tools/perf/util/evlist.h  |  5 +++++
 3 files changed, 40 insertions(+)
tools/perf/builtin-stat.c +3 -0
index 377e575f9645..0e4fc6b3323c 100644
@@ -584,6 +584,9 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)
 	if (affinity__setup(&affinity) < 0)
 		return -1;
 
+	if (!evlist__cpus_matched(evsel_list))
+		evlist__force_disable_group(evsel_list);
+
 	evlist__for_each_cpu (evsel_list, i, cpu) {
 		affinity__set(&affinity, cpu);
 
tools/perf/util/evlist.c +32 -0
index 2a9de6491700..fc6e410ca63b 100644
@@ -1704,3 +1704,35 @@ struct evsel *perf_evlist__reset_weak_group(struct evlist *evsel_list,
 	}
 	return leader;
 }
+
+bool evlist__cpus_matched(struct evlist *evlist)
+{
+	struct evsel *prev = evlist__first(evlist), *evsel = prev;
+
+	if (prev->core.nr_members <= 1)
+		return true;
+
+	evlist__for_each_entry_continue(evlist, evsel) {
+		if (evsel->core.cpus->nr != prev->core.cpus->nr)
+			return false;
+
+		for (int i = 0; i < evsel->core.cpus->nr; i++) {
+			if (evsel->core.cpus->map[i] != prev->core.cpus->map[i])
+				return false;
+		}
+
+		prev = evsel;
+	}
+
+	return true;
+}
+
+void evlist__force_disable_group(struct evlist *evlist)
+{
+	struct evsel *evsel;
+
+	evlist__for_each_entry(evlist, evsel) {
+		evsel->leader = evsel;
+		evsel->core.nr_members = 0;
+	}
+}
tools/perf/util/evlist.h +5 -0
index b6f325dfb4d2..ea7a53166cbd 100644
@@ -355,4 +355,9 @@ void perf_evlist__force_leader(struct evlist *evlist);
 struct evsel *perf_evlist__reset_weak_group(struct evlist *evlist,
 						 struct evsel *evsel,
 						bool close);
+
+bool evlist__cpus_matched(struct evlist *evlist);
+
+void evlist__force_disable_group(struct evlist *evlist);
+
 #endif /* __PERF_EVLIST_H */
Signature · 1 line
2.17.1
#1 lore raw

On Thu, May 21, 2020 at 02:22:40PM +0800, Jin Yao wrote:

SNIP

Quoted 25 lines
---
 tools/perf/builtin-stat.c |  3 +++
 tools/perf/util/evlist.c  | 32 ++++++++++++++++++++++++++++++++
 tools/perf/util/evlist.h  |  5 +++++
 3 files changed, 40 insertions(+)
tools/perf/builtin-stat.c +3 -0
index 377e575f9645..0e4fc6b3323c 100644
@@ -584,6 +584,9 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)
 	if (affinity__setup(&affinity) < 0)
 		return -1;
 
+	if (!evlist__cpus_matched(evsel_list))
+		evlist__force_disable_group(evsel_list);
+
 	evlist__for_each_cpu (evsel_list, i, cpu) {
 		affinity__set(&affinity, cpu);
 
tools/perf/util/evlist.c +0 -0
index 2a9de6491700..fc6e410ca63b 100644

tools/perf/util/evlist.c struct evsel *perf_evlist__reset_weak_group(struct evlist *evsel_list, · line 1713

Quoted 10 lines
tools/perf/util/evlist.c +7 -0
@@ -1704,3 +1704,35 @@ struct evsel *perf_evlist__reset_weak_group(struct evlist *evsel_list,
 	}
 	return leader;
 }
+
+bool evlist__cpus_matched(struct evlist *evlist)
+{
+	struct evsel *prev = evlist__first(evlist), *evsel = prev;
+
+	if (prev->core.nr_members <= 1)
+		return true;

hum, this assumes there's only one group in evlist?

how about case like A,{B,C},D,{E,F}

also please add automated tests for this

Quoted 9 lines
tools/perf/util/evlist.c +9 -0
+
+	evlist__for_each_entry_continue(evlist, evsel) {
+		if (evsel->core.cpus->nr != prev->core.cpus->nr)
+			return false;
+
+		for (int i = 0; i < evsel->core.cpus->nr; i++) {
+			if (evsel->core.cpus->map[i] != prev->core.cpus->map[i])
+				return false;
+		}

tools/perf/util/evlist.c struct evsel *perf_evlist__reset_weak_group(struct evlist *evsel_list, · line 1732

Quoted 10 lines
tools/perf/util/evlist.c +10 -0
+
+		prev = evsel;
+	}
+
+	return true;
+}
+
+void evlist__force_disable_group(struct evlist *evlist)
+{
+	struct evsel *evsel;

we need to put some warning for user in here

thanks,
jirka

Quoted 23 lines
tools/perf/util/evlist.c +6 -0
+
+	evlist__for_each_entry(evlist, evsel) {
+		evsel->leader = evsel;
+		evsel->core.nr_members = 0;
+	}
+}
tools/perf/util/evlist.h +5 -0
index b6f325dfb4d2..ea7a53166cbd 100644
@@ -355,4 +355,9 @@ void perf_evlist__force_leader(struct evlist *evlist);
 struct evsel *perf_evlist__reset_weak_group(struct evlist *evlist,
 						 struct evsel *evsel,
 						bool close);
+
+bool evlist__cpus_matched(struct evlist *evlist);
+
+void evlist__force_disable_group(struct evlist *evlist);
+
 #endif /* __PERF_EVLIST_H */
Signature · 1 line
2.17.1
author
#2 lore raw

Hi Jiri,

Quoted 42 lines · Jiri Olsa

On Thu, May 21, 2020 at 02:22:40PM +0800, Jin Yao wrote:

SNIP

Quoted 25 lines
---
  tools/perf/builtin-stat.c |  3 +++
  tools/perf/util/evlist.c  | 32 ++++++++++++++++++++++++++++++++
  tools/perf/util/evlist.h  |  5 +++++
  3 files changed, 40 insertions(+)
tools/perf/builtin-stat.c +3 -0
index 377e575f9645..0e4fc6b3323c 100644
@@ -584,6 +584,9 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx)
  	if (affinity__setup(&affinity) < 0)
  		return -1;
 
+	if (!evlist__cpus_matched(evsel_list))
+		evlist__force_disable_group(evsel_list);
+
  	evlist__for_each_cpu (evsel_list, i, cpu) {
  		affinity__set(&affinity, cpu);
 
tools/perf/util/evlist.c +0 -0
index 2a9de6491700..fc6e410ca63b 100644

tools/perf/util/evlist.c struct evsel *perf_evlist__reset_weak_group(struct evlist *evsel_list, · line 1713

Quoted 10 lines
tools/perf/util/evlist.c +7 -0
@@ -1704,3 +1704,35 @@ struct evsel *perf_evlist__reset_weak_group(struct evlist *evsel_list,
  	}
  	return leader;
  }
+
+bool evlist__cpus_matched(struct evlist *evlist)
+{
+	struct evsel *prev = evlist__first(evlist), *evsel = prev;
+
+	if (prev->core.nr_members <= 1)
+		return true;

hum, this assumes there's only one group in evlist?

Quoted 2 lines

how about case like A,{B,C},D,{E,F}

Yes, you are right, I need to consider the case such as A,{B,C},D,{E,F}. I will post v2.

Quoted 2 lines

also please add automated tests for this

I will add case for testing the group members.

Quoted 13 lines
Quoted 13 lines
tools/perf/util/evlist.c +13 -0
+
+	evlist__for_each_entry_continue(evlist, evsel) {
+		if (evsel->core.cpus->nr != prev->core.cpus->nr)
+			return false;
+
+		for (int i = 0; i < evsel->core.cpus->nr; i++) {
+			if (evsel->core.cpus->map[i] != prev->core.cpus->map[i])
+				return false;
+		}
+
+		prev = evsel;
+	}
+
Quoted 9 lines

tools/perf/util/evlist.c struct evsel *perf_evlist__reset_weak_group(struct evlist *evsel_list, · line 1732

Quoted 6 lines
tools/perf/util/evlist.c +6 -0
+	return true;
+}
+
+void evlist__force_disable_group(struct evlist *evlist)
+{
+	struct evsel *evsel;

we need to put some warning for user in here

Yes, agree. I will add warning in v2.

Thanks
Jin Yao

Quoted 27 lines

thanks,
jirka

Quoted 23 lines
tools/perf/util/evlist.c +6 -0
+
+	evlist__for_each_entry(evlist, evsel) {
+		evsel->leader = evsel;
+		evsel->core.nr_members = 0;
+	}
+}
tools/perf/util/evlist.h +5 -0
index b6f325dfb4d2..ea7a53166cbd 100644
@@ -355,4 +355,9 @@ void perf_evlist__force_leader(struct evlist *evlist);
  struct evsel *perf_evlist__reset_weak_group(struct evlist *evlist,
  						 struct evsel *evsel,
  						bool close);
+
+bool evlist__cpus_matched(struct evlist *evlist);
+
+void evlist__force_disable_group(struct evlist *evlist);
+
  #endif /* __PERF_EVLIST_H */
Signature · 1 line
2.17.1