Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1444151

[RFCv2 3/4] perf: util: only open events on CPUs an evsel permits

Show all headers | View raw

In systems with heterogeneous CPU PMUs, it's possible for each evsel to
cover a distinct set of CPUs, and hence the cpu_map associated with each
evsel may have a distinct idx<->id mapping. Any of these may be distinct from
the evlist's cpu map.

Events can be tied to the same fd so long as they use the same per-cpu
ringbuffer (i.e. so long as they are on the same CPU). To acquire the
correct FDs, we must compare the Linux logical IDs rather than the evsel
or evlist indices.

This path adds logic to perf_evlist__mmap_per_evsel to handle this,
translating IDs as required. As PMUs may cover a subset of CPUs from the
evlist, we skip the CPUs a PMU cannot handle.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: He Kuang <hekuang@huawei.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Wang Nan <wangnan0@huawei.com>
Cc: linux-kernel@vger.kernel.org
---
 tools/perf/util/evlist.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index e82ba90..ef56b7f 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -984,17 +984,23 @@ static int __perf_evlist__mmap(struct perf_evlist *evlist, int idx,
 }
 
 static int perf_evlist__mmap_per_evsel(struct perf_evlist *evlist, int idx,
-				       struct mmap_params *mp, int cpu,
+				       struct mmap_params *mp, int cpu_idx,
 				       int thread, int *output)
 {
 	struct perf_evsel *evsel;
+	int evlist_cpu = cpu_map__cpu(evlist->cpus, cpu_idx);
 
 	evlist__for_each(evlist, evsel) {
 		int fd;
+		int cpu;
 
 		if (evsel->system_wide && thread)
 			continue;
 
+		cpu = cpu_map__idx(evsel->cpus, evlist_cpu);
+		if (cpu == -1)
+			continue;
+
 		fd = FD(evsel, cpu, thread);
 
 		if (*output == -1) {
-- 
1.9.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[RFCv2 0/4] perf tools: play nicely with CPU PMU cpumasks Mark Rutland <mark.rutland@arm.com> - 2016-07-15 12:10 +0200
  [RFCv2 1/4] perf stat: balance opening and reading events Mark Rutland <mark.rutland@arm.com> - 2016-07-15 12:10 +0200
    Re: [RFCv2 1/4] perf stat: balance opening and reading events Jiri Olsa <jolsa@redhat.com> - 2016-07-18 16:40 +0200
    [tip:perf/core] perf stat: Balance opening and reading events tip-bot for Mark Rutland <tipbot@zytor.com> - 2016-07-19 09:00 +0200
  [RFCv2 3/4] perf: util: only open events on CPUs an evsel permits Mark Rutland <mark.rutland@arm.com> - 2016-07-15 12:20 +0200
    Re: [RFCv2 3/4] perf: util: only open events on CPUs an evsel permits Jiri Olsa <jolsa@redhat.com> - 2016-07-18 16:40 +0200
      Re: [RFCv2 3/4] perf: util: only open events on CPUs an evsel permits Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-07-19 00:50 +0200
        Re: [RFCv2 3/4] perf: util: only open events on CPUs an evsel permits Jiri Olsa <jolsa@redhat.com> - 2016-07-19 08:30 +0200

csiph-web