From: Mark Rutland <mark.rutland@arm.com>
To: linux-kernel@vger.kernel.org
Cc: acme@kernel.org, adrian.hunter@intel.com,
alexander.shishkin@linux.intel.com, hekuang@huawei.com,
jolsa@kernel.org, kan.liang@intel.com, mark.rutland@arm.com,
mingo@redhat.com, peterz@infradead.org, wangnan0@huawei.com
Subject: [RFC PATCH 3/3] perf: util: only open events on CPUs an evsel permits
Date: Thu, 7 Jul 2016 17:04:34 +0100 [thread overview]
Message-ID: <1467907474-3290-4-git-send-email-mark.rutland@arm.com> (raw)
In-Reply-To: <1467907474-3290-1-git-send-email-mark.rutland@arm.com>
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 | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index e82ba90..0b5b1be 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -984,17 +984,24 @@ 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;
+ if (!cpu_map__has(evsel->cpus, evlist_cpu))
+ continue;
+
+ cpu = cpu_map__idx(evsel->cpus, evlist_cpu);
+
fd = FD(evsel, cpu, thread);
if (*output == -1) {
--
1.9.1
next prev parent reply other threads:[~2016-07-07 16:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-07 16:04 [RFC PATCH 0/3] perf tools: play nicely with CPU PMU cpumasks Mark Rutland
2016-07-07 16:04 ` [RFC PATCH 1/3] perf stat: balance opening and reading events Mark Rutland
2016-07-07 16:04 ` [RFC PATCH 2/3] perf: util: Add more cpu_map helpers Mark Rutland
2016-07-07 16:04 ` Mark Rutland [this message]
2016-07-08 7:55 ` [RFC PATCH 3/3] perf: util: only open events on CPUs an evsel permits Jiri Olsa
2016-07-11 10:50 ` Mark Rutland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1467907474-3290-4-git-send-email-mark.rutland@arm.com \
--to=mark.rutland@arm.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=hekuang@huawei.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=wangnan0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).