From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Ingo Molnar <mingo@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Namhyung Kim <namhyung@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Michael Petlan <mpetlan@redhat.com>,
Song Liu <songliubraving@fb.com>, Ian Rogers <irogers@google.com>,
Stephane Eranian <eranian@google.com>,
Alexey Budankov <alexey.budankov@linux.intel.com>,
Andi Kleen <ak@linux.intel.com>,
Adrian Hunter <adrian.hunter@intel.com>
Subject: [PATCH 24/24] perf record: Add --buildid-mmap option to enable mmap's build id
Date: Mon, 9 Nov 2020 22:54:15 +0100 [thread overview]
Message-ID: <20201109215415.400153-25-jolsa@kernel.org> (raw)
In-Reply-To: <20201109215415.400153-1-jolsa@kernel.org>
Adding --buildid-mmap option to enable build id in mmap2 events.
It will only work if there's kernel support for that and it disables
build id cache (implies --no-buildid).
It's also possible to enable it permanently via config option
in ~.perfconfig file:
[record]
build-id=mmap
Also added build_id bit in the verbose output for perf_event_attr:
# perf record --buildid-mmap -vv
...
perf_event_attr:
type 1
size 120
...
build_id 1
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/Documentation/perf-record.txt | 3 +++
tools/perf/builtin-record.c | 20 ++++++++++++++++++++
tools/perf/util/evsel.c | 10 ++++++----
tools/perf/util/perf_api_probe.c | 10 ++++++++++
tools/perf/util/perf_api_probe.h | 1 +
tools/perf/util/perf_event_attr_fprintf.c | 1 +
tools/perf/util/record.h | 1 +
7 files changed, 42 insertions(+), 4 deletions(-)
diff --git a/tools/perf/Documentation/perf-record.txt b/tools/perf/Documentation/perf-record.txt
index 768888b9326a..1bcf51e24979 100644
--- a/tools/perf/Documentation/perf-record.txt
+++ b/tools/perf/Documentation/perf-record.txt
@@ -482,6 +482,9 @@ Specify vmlinux path which has debuginfo.
--buildid-all::
Record build-id of all DSOs regardless whether it's actually hit or not.
+--buildid-mmap::
+Record build ids in mmap2 events, disables build id cache (implies --no-buildid).
+
--aio[=n]::
Use <n> control blocks in asynchronous (Posix AIO) trace writing mode (default: 1, max: 4).
Asynchronous mode is supported only when linking Perf tool with libc library
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index adf311d15d3d..47bae9d82d43 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -102,6 +102,7 @@ struct record {
bool no_buildid_cache;
bool no_buildid_cache_set;
bool buildid_all;
+ bool buildid_mmap;
bool timestamp_filename;
bool timestamp_boundary;
struct switch_output switch_output;
@@ -2139,6 +2140,8 @@ static int perf_record_config(const char *var, const char *value, void *cb)
rec->no_buildid_cache = true;
else if (!strcmp(value, "skip"))
rec->no_buildid = true;
+ else if (!strcmp(value, "mmap"))
+ rec->buildid_mmap = true;
else
return -1;
return 0;
@@ -2554,6 +2557,8 @@ static struct option __record_options[] = {
"file", "vmlinux pathname"),
OPT_BOOLEAN(0, "buildid-all", &record.buildid_all,
"Record build-id of all DSOs regardless of hits"),
+ OPT_BOOLEAN(0, "buildid-mmap", &record.buildid_mmap,
+ "Record build-id in map events"),
OPT_BOOLEAN(0, "timestamp-filename", &record.timestamp_filename,
"append timestamp to output filename"),
OPT_BOOLEAN(0, "timestamp-boundary", &record.timestamp_boundary,
@@ -2657,6 +2662,21 @@ int cmd_record(int argc, const char **argv)
}
+ if (rec->buildid_mmap) {
+ if (!perf_can_record_build_id()) {
+ pr_err("Failed: no support to record build id in mmap events, update your kernel.\n");
+ err = -EINVAL;
+ goto out_opts;
+ }
+ pr_debug("Enabling build id in mmap2 events.\n");
+ /* Enable mmap build id synthesizing. */
+ symbol_conf.buildid_mmap2 = true;
+ /* Enable perf_event_attr::build_id bit. */
+ rec->opts.build_id = true;
+ /* Disable build id cache. */
+ rec->no_buildid = true;
+ }
+
if (rec->opts.kcore)
rec->data.is_dir = true;
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 1cad6051d8b0..749d806ee1d1 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -1170,10 +1170,12 @@ void evsel__config(struct evsel *evsel, struct record_opts *opts,
if (opts->sample_weight)
evsel__set_sample_bit(evsel, WEIGHT);
- attr->task = track;
- attr->mmap = track;
- attr->mmap2 = track && !perf_missing_features.mmap2;
- attr->comm = track;
+ attr->task = track;
+ attr->mmap = track;
+ attr->mmap2 = track && !perf_missing_features.mmap2;
+ attr->comm = track;
+ attr->build_id = track && opts->build_id;
+
/*
* ksymbol is tracked separately with text poke because it needs to be
* system wide and enabled immediately.
diff --git a/tools/perf/util/perf_api_probe.c b/tools/perf/util/perf_api_probe.c
index 3840d02f0f7b..829af17a0867 100644
--- a/tools/perf/util/perf_api_probe.c
+++ b/tools/perf/util/perf_api_probe.c
@@ -98,6 +98,11 @@ static void perf_probe_text_poke(struct evsel *evsel)
evsel->core.attr.text_poke = 1;
}
+static void perf_probe_build_id(struct evsel *evsel)
+{
+ evsel->core.attr.build_id = 1;
+}
+
bool perf_can_sample_identifier(void)
{
return perf_probe_api(perf_probe_sample_identifier);
@@ -172,3 +177,8 @@ bool perf_can_aux_sample(void)
return true;
}
+
+bool perf_can_record_build_id(void)
+{
+ return perf_probe_api(perf_probe_build_id);
+}
diff --git a/tools/perf/util/perf_api_probe.h b/tools/perf/util/perf_api_probe.h
index d5506a983a94..f12ca55f509a 100644
--- a/tools/perf/util/perf_api_probe.h
+++ b/tools/perf/util/perf_api_probe.h
@@ -11,5 +11,6 @@ bool perf_can_record_cpu_wide(void);
bool perf_can_record_switch_events(void);
bool perf_can_record_text_poke_events(void);
bool perf_can_sample_identifier(void);
+bool perf_can_record_build_id(void);
#endif // __PERF_API_PROBE_H
diff --git a/tools/perf/util/perf_event_attr_fprintf.c b/tools/perf/util/perf_event_attr_fprintf.c
index e67a227c0ce7..0f1c62d40a89 100644
--- a/tools/perf/util/perf_event_attr_fprintf.c
+++ b/tools/perf/util/perf_event_attr_fprintf.c
@@ -134,6 +134,7 @@ int perf_event_attr__fprintf(FILE *fp, struct perf_event_attr *attr,
PRINT_ATTRf(bpf_event, p_unsigned);
PRINT_ATTRf(aux_output, p_unsigned);
PRINT_ATTRf(cgroup, p_unsigned);
+ PRINT_ATTRf(build_id, p_unsigned);
PRINT_ATTRn("{ wakeup_events, wakeup_watermark }", wakeup_events, p_unsigned);
PRINT_ATTRf(bp_type, p_unsigned);
diff --git a/tools/perf/util/record.h b/tools/perf/util/record.h
index 266760ac9143..609e706f4282 100644
--- a/tools/perf/util/record.h
+++ b/tools/perf/util/record.h
@@ -49,6 +49,7 @@ struct record_opts {
bool no_bpf_event;
bool kcore;
bool text_poke;
+ bool build_id;
unsigned int freq;
unsigned int mmap_pages;
unsigned int auxtrace_mmap_pages;
--
2.26.2
next prev parent reply other threads:[~2020-11-09 21:56 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-09 21:53 [PATCH 00/24] perf: Add mmap2 build id support Jiri Olsa
2020-11-09 21:53 ` [PATCH 01/24] bpf: Move stack_map_get_build_id into lib Jiri Olsa
2020-11-09 21:53 ` [PATCH 02/24] bpf: Add build_id_parse_size function Jiri Olsa
2020-11-10 0:15 ` Alexei Starovoitov
2020-11-10 10:01 ` Jiri Olsa
2020-11-09 21:53 ` [PATCH 03/24] perf: Add build id data in mmap2 event Jiri Olsa
2020-11-10 8:07 ` Peter Zijlstra
2020-11-10 10:08 ` Jiri Olsa
2020-11-10 11:54 ` Arnaldo Carvalho de Melo
2020-11-10 12:22 ` Peter Zijlstra
2020-11-10 15:25 ` Arnaldo Carvalho de Melo
2020-11-10 8:28 ` Peter Zijlstra
2020-11-10 10:10 ` Jiri Olsa
2020-11-10 18:23 ` Jiri Olsa
2020-11-10 18:55 ` Arnaldo Carvalho de Melo
2020-11-11 15:54 ` Jiri Olsa
2020-11-13 4:29 ` Namhyung Kim
2020-11-13 11:01 ` Jiri Olsa
2020-11-09 21:53 ` [PATCH 04/24] tools headers uapi: Sync tools/include/uapi/linux/perf_event.h Jiri Olsa
2020-11-09 21:53 ` [PATCH 05/24] perf tools: Do not swap mmap2 fields in case it contains build id Jiri Olsa
2020-11-09 21:53 ` [PATCH 06/24] perf tools: Add build_id__is_defined function Jiri Olsa
2020-11-09 21:53 ` [PATCH 07/24] perf tools: Add filename__decompress function Jiri Olsa
2020-11-09 21:53 ` [PATCH 08/24] perf tools: Add support to read build id from compressed elf Jiri Olsa
2020-11-09 21:54 ` [PATCH 09/24] perf tools: Add check for existing link in buildid dir Jiri Olsa
2020-11-09 21:54 ` [PATCH 10/24] perf tools: Use struct extra_kernel_map in machine__process_kernel_mmap_event Jiri Olsa
2020-11-09 21:54 ` [PATCH 11/24] perf tools: Try to load vmlinux from buildid database Jiri Olsa
2020-11-09 21:54 ` [PATCH 12/24] perf tools: Store build id from mmap2 events Jiri Olsa
2020-11-09 21:54 ` [PATCH 13/24] perf tools: Allow mmap2 event to synthesize kernel image Jiri Olsa
2020-11-09 21:54 ` [PATCH 14/24] perf tools: Allow mmap2 event to synthesize modules Jiri Olsa
2020-11-09 21:54 ` [PATCH 15/24] perf tools: Synthesize build id for kernel/modules/tasks Jiri Olsa
2020-11-13 4:32 ` Namhyung Kim
2020-11-13 11:10 ` Jiri Olsa
2020-11-09 21:54 ` [PATCH 16/24] perf tools: Add support to display build id for mmap2 events Jiri Olsa
2020-11-09 21:54 ` [PATCH 17/24] perf tools: Use machine__for_each_dso in perf_session__cache_build_ids Jiri Olsa
2020-11-09 21:54 ` [PATCH 18/24] perf tools: Add __perf_session__cache_build_ids function Jiri Olsa
2020-11-09 21:54 ` [PATCH 19/24] perf tools: Add is_perf_data function Jiri Olsa
2020-11-09 21:54 ` [PATCH 20/24] perf tools: Add build_id_cache__add function Jiri Olsa
2020-11-09 21:54 ` [PATCH 21/24] perf buildid-cache: Add support to add build ids from perf data Jiri Olsa
2020-11-09 21:54 ` [PATCH 22/24] perf buildid-cache: Add --debuginfod option Jiri Olsa
[not found] ` <CAP-5=fUDtTU2XYr6w6wYndP6RVFDLoJSnC31m+djA-r9EVMQiw@mail.gmail.com>
2020-11-23 22:26 ` Jiri Olsa
2020-11-09 21:54 ` [PATCH 23/24] perf buildid-list: Add support for mmap2's buildid events Jiri Olsa
2020-11-09 21:54 ` Jiri Olsa [this message]
2020-11-11 17:00 ` [PATCH 24/24] perf record: Add --buildid-mmap option to enable mmap's build id Andi Kleen
2020-11-12 11:57 ` Jiri Olsa
2020-11-12 20:39 ` Arnaldo Carvalho de Melo
2020-11-12 21:25 ` Jiri Olsa
2020-11-13 4:40 ` Namhyung Kim
2020-11-13 11:09 ` Jiri Olsa
2020-11-14 0:31 ` Namhyung Kim
2020-11-14 20:44 ` Jiri Olsa
2020-11-17 11:00 [PATCHv2 00/24] perf: Add mmap2 build id support Jiri Olsa
2020-11-17 11:00 ` [PATCH 24/24] perf record: Add --buildid-mmap option to enable mmap's build id Jiri Olsa
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=20201109215415.400153-25-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=alexey.budankov@linux.intel.com \
--cc=eranian@google.com \
--cc=irogers@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@kernel.org \
--cc=mpetlan@redhat.com \
--cc=namhyung@kernel.org \
--cc=songliubraving@fb.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).