From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Jiri Olsa <jolsa@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>,
"Frank Ch. Eigler" <fche@redhat.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: Re: [PATCH 15/26] perf tools: Synthesize proc tasks with mmap3
Date: Mon, 14 Sep 2020 13:07:38 -0300 [thread overview]
Message-ID: <20200914160738.GJ160517@kernel.org> (raw)
In-Reply-To: <20200913210313.1985612-16-jolsa@kernel.org>
Em Sun, Sep 13, 2020 at 11:03:02PM +0200, Jiri Olsa escreveu:
> Synthesizing proc tasks with mmap3 events so we can
> get build id data for synthesized maps as well.
>
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> tools/perf/util/mmap.c | 2 +-
> tools/perf/util/synthetic-events.c | 72 +++++++++++++++++-------------
> 2 files changed, 43 insertions(+), 31 deletions(-)
>
> diff --git a/tools/perf/util/mmap.c b/tools/perf/util/mmap.c
> index ab7108d22428..51f6f86580a9 100644
> --- a/tools/perf/util/mmap.c
> +++ b/tools/perf/util/mmap.c
> @@ -33,7 +33,7 @@ void mmap_cpu_mask__scnprintf(struct mmap_cpu_mask *mask, const char *tag)
>
> len = bitmap_scnprintf(mask->bits, mask->nbits, buf, MASK_SIZE);
> buf[len] = '\0';
> - pr_debug("%p: %s mask[%zd]: %s\n", mask, tag, mask->nbits, buf);
> + pr_debug2("%p: %s mask[%zd]: %s\n", mask, tag, mask->nbits, buf);
> }
Can this be in a separate patch?
> size_t mmap__mmap_len(struct mmap *map)
> diff --git a/tools/perf/util/synthetic-events.c b/tools/perf/util/synthetic-events.c
> index 89b390623b63..bd6e7b84283d 100644
> --- a/tools/perf/util/synthetic-events.c
> +++ b/tools/perf/util/synthetic-events.c
> @@ -379,7 +379,7 @@ int perf_event__synthesize_mmap_events(struct perf_tool *tool,
> }
> io__init(&io, io.fd, bf, sizeof(bf));
>
> - event->header.type = PERF_RECORD_MMAP2;
> + event->header.type = PERF_RECORD_MMAP3;
This also needs to check if the user is interested in build-id records.
If it is disabled, then using this new tool with mmap3 support will
generate perf.data files that will bot be grokked by older tools,
introducing an annoyance for people not interested in build-ids.
- Arnaldo
> t = rdclock();
>
> while (!io.eof) {
> @@ -387,20 +387,20 @@ int perf_event__synthesize_mmap_events(struct perf_tool *tool,
> size_t size;
>
> /* ensure null termination since stack will be reused. */
> - event->mmap2.filename[0] = '\0';
> + event->mmap3.filename[0] = '\0';
>
> /* 00400000-0040c000 r-xp 00000000 fd:01 41038 /bin/cat */
> if (!read_proc_maps_line(&io,
> - &event->mmap2.start,
> - &event->mmap2.len,
> - &event->mmap2.prot,
> - &event->mmap2.flags,
> - &event->mmap2.pgoff,
> - &event->mmap2.maj,
> - &event->mmap2.min,
> - &event->mmap2.ino,
> - sizeof(event->mmap2.filename),
> - event->mmap2.filename))
> + &event->mmap3.start,
> + &event->mmap3.len,
> + &event->mmap3.prot,
> + &event->mmap3.flags,
> + &event->mmap3.pgoff,
> + &event->mmap3.maj,
> + &event->mmap3.min,
> + &event->mmap3.ino,
> + sizeof(event->mmap3.filename),
> + event->mmap3.filename))
> continue;
>
> if ((rdclock() - t) > timeout) {
> @@ -412,7 +412,7 @@ int perf_event__synthesize_mmap_events(struct perf_tool *tool,
> goto out;
> }
>
> - event->mmap2.ino_generation = 0;
> + event->mmap3.ino_generation = 0;
>
> /*
> * Just like the kernel, see __perf_event_mmap in kernel/perf_event.c
> @@ -422,8 +422,8 @@ int perf_event__synthesize_mmap_events(struct perf_tool *tool,
> else
> event->header.misc = PERF_RECORD_MISC_GUEST_USER;
>
> - if ((event->mmap2.prot & PROT_EXEC) == 0) {
> - if (!mmap_data || (event->mmap2.prot & PROT_READ) == 0)
> + if ((event->mmap3.prot & PROT_EXEC) == 0) {
> + if (!mmap_data || (event->mmap3.prot & PROT_READ) == 0)
> continue;
>
> event->header.misc |= PERF_RECORD_MISC_MMAP_DATA;
> @@ -433,25 +433,37 @@ int perf_event__synthesize_mmap_events(struct perf_tool *tool,
> if (truncation)
> event->header.misc |= PERF_RECORD_MISC_PROC_MAP_PARSE_TIMEOUT;
>
> - if (!strcmp(event->mmap2.filename, ""))
> - strcpy(event->mmap2.filename, anonstr);
> + if (!strcmp(event->mmap3.filename, ""))
> + strcpy(event->mmap3.filename, anonstr);
>
> if (hugetlbfs_mnt_len &&
> - !strncmp(event->mmap2.filename, hugetlbfs_mnt,
> + !strncmp(event->mmap3.filename, hugetlbfs_mnt,
> hugetlbfs_mnt_len)) {
> - strcpy(event->mmap2.filename, anonstr);
> - event->mmap2.flags |= MAP_HUGETLB;
> + strcpy(event->mmap3.filename, anonstr);
> + event->mmap3.flags |= MAP_HUGETLB;
> }
>
> - size = strlen(event->mmap2.filename) + 1;
> + size = strlen(event->mmap3.filename) + 1;
> size = PERF_ALIGN(size, sizeof(u64));
> - event->mmap2.len -= event->mmap.start;
> - event->mmap2.header.size = (sizeof(event->mmap2) -
> - (sizeof(event->mmap2.filename) - size));
> - memset(event->mmap2.filename + size, 0, machine->id_hdr_size);
> - event->mmap2.header.size += machine->id_hdr_size;
> - event->mmap2.pid = tgid;
> - event->mmap2.tid = pid;
> + event->mmap3.len -= event->mmap.start;
> + event->mmap3.header.size = (sizeof(event->mmap3) -
> + (sizeof(event->mmap3.filename) - size));
> + memset(event->mmap3.filename + size, 0, machine->id_hdr_size);
> + event->mmap3.header.size += machine->id_hdr_size;
> + event->mmap3.pid = tgid;
> + event->mmap3.tid = pid;
> +
> + rc = filename__read_build_id(event->mmap3.filename, event->mmap3.buildid,
> + BUILD_ID_SIZE);
> + if (rc != BUILD_ID_SIZE) {
> + if (event->mmap3.filename[0] == '/') {
> + pr_debug2("Failed to read build ID for %s\n",
> + event->mmap3.filename);
> + }
> + memset(event->mmap3.buildid, 0x0, sizeof(event->mmap3.buildid));
> + }
> +
> + rc = 0;
>
> if (perf_tool__process_synth_event(tool, event, machine, process) != 0) {
> rc = -1;
> @@ -744,7 +756,7 @@ int perf_event__synthesize_thread_map(struct perf_tool *tool,
> if (comm_event == NULL)
> goto out;
>
> - mmap_event = malloc(sizeof(mmap_event->mmap2) + machine->id_hdr_size);
> + mmap_event = malloc(sizeof(mmap_event->mmap3) + machine->id_hdr_size);
> if (mmap_event == NULL)
> goto out_free_comm;
>
> @@ -826,7 +838,7 @@ static int __perf_event__synthesize_threads(struct perf_tool *tool,
> if (comm_event == NULL)
> goto out;
>
> - mmap_event = malloc(sizeof(mmap_event->mmap2) + machine->id_hdr_size);
> + mmap_event = malloc(sizeof(mmap_event->mmap3) + machine->id_hdr_size);
> if (mmap_event == NULL)
> goto out_free_comm;
>
> --
> 2.26.2
>
--
- Arnaldo
next prev parent reply other threads:[~2020-09-14 16:11 UTC|newest]
Thread overview: 93+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-13 21:02 [RFC 00/26] perf: Add mmap3 support Jiri Olsa
2020-09-13 21:02 ` [PATCH 01/26] bpf: Move stack_map_get_build_id into lib Jiri Olsa
2020-09-14 6:09 ` Song Liu
2020-09-13 21:02 ` [PATCH 02/26] perf: Introduce mmap3 version of mmap event Jiri Olsa
2020-09-14 5:38 ` Namhyung Kim
2020-09-14 6:20 ` Song Liu
2020-09-14 19:38 ` Jiri Olsa
2020-09-14 15:28 ` Arnaldo Carvalho de Melo
2020-09-14 16:35 ` peterz
2020-09-14 17:08 ` Ian Rogers
2020-09-14 20:07 ` Jiri Olsa
2020-09-15 5:49 ` Adrian Hunter
2020-09-14 19:38 ` Jiri Olsa
2020-09-14 19:39 ` Jiri Olsa
2020-09-14 22:00 ` Arnaldo Carvalho de Melo
2020-09-15 5:39 ` Adrian Hunter
2020-09-14 19:38 ` Jiri Olsa
2020-09-15 2:54 ` Namhyung Kim
2020-09-14 6:41 ` Stephane Eranian
2020-09-14 9:08 ` peterz
2020-09-14 15:32 ` Arnaldo Carvalho de Melo
2020-09-14 17:26 ` Stephane Eranian
2020-09-14 19:56 ` Jiri Olsa
2020-09-15 0:03 ` Ian Rogers
2020-09-14 15:31 ` Arnaldo Carvalho de Melo
2020-09-14 19:50 ` Jiri Olsa
2020-09-14 22:38 ` Arnaldo Carvalho de Melo
2020-09-14 19:45 ` Jiri Olsa
2020-09-14 9:36 ` peterz
2020-09-13 21:02 ` [PATCH 03/26] tools headers uapi: Sync tools/include/uapi/linux/perf_event.h Jiri Olsa
2020-09-14 5:39 ` Namhyung Kim
2020-09-13 21:02 ` [PATCH 04/26] perf tools: Add filename__decompress function Jiri Olsa
2020-09-14 15:35 ` Arnaldo Carvalho de Melo
2020-09-14 20:43 ` Jiri Olsa
2020-09-17 18:54 ` Arnaldo Carvalho de Melo
2020-09-18 10:51 ` Jiri Olsa
2020-09-13 21:02 ` [PATCH 05/26] perf tools: Add build_id__is_defined function Jiri Olsa
2020-09-14 5:44 ` Namhyung Kim
2020-09-14 16:03 ` Arnaldo Carvalho de Melo
2020-09-14 20:49 ` Jiri Olsa
2020-09-14 20:47 ` Jiri Olsa
2020-09-14 21:51 ` Arnaldo Carvalho de Melo
2020-09-13 21:02 ` [PATCH 06/26] perf tools: Add support to read build id from compressed elf Jiri Olsa
2020-09-14 16:04 ` Arnaldo Carvalho de Melo
2020-09-14 20:49 ` Jiri Olsa
2020-09-13 21:02 ` [PATCH 07/26] perf tools: Add check for existing link in buildid dir Jiri Olsa
2020-09-14 5:54 ` Namhyung Kim
2020-09-14 20:18 ` Jiri Olsa
2020-09-13 21:02 ` [PATCH 08/26] perf tools: Use struct extra_kernel_map in machine__process_kernel_mmap_event Jiri Olsa
2020-09-13 21:02 ` [PATCH 09/26] perf tools: Try load vmlinux from buildid database Jiri Olsa
2020-09-14 6:25 ` Namhyung Kim
2020-09-14 20:29 ` Jiri Olsa
2020-09-15 2:58 ` Namhyung Kim
2020-09-13 21:02 ` [PATCH 10/26] perf tools: Enable mmap3 map event when supported Jiri Olsa
2020-09-14 16:05 ` Arnaldo Carvalho de Melo
2020-09-13 21:02 ` [PATCH 11/26] perf tools: Add mmap3 support Jiri Olsa
2020-09-13 21:02 ` [PATCH 12/26] perf tools: Set build id for kernel dso objects Jiri Olsa
2020-09-13 21:03 ` [PATCH 13/26] perf tools: Plug in mmap3 event Jiri Olsa
2020-09-13 21:03 ` [PATCH 14/26] perf tools: Add mmap3 events to --show-mmap-events option Jiri Olsa
2020-09-14 6:30 ` Namhyung Kim
2020-09-14 20:29 ` Jiri Olsa
2020-09-13 21:03 ` [PATCH 15/26] perf tools: Synthesize proc tasks with mmap3 Jiri Olsa
2020-09-14 16:07 ` Arnaldo Carvalho de Melo [this message]
2020-09-14 20:51 ` Jiri Olsa
2020-09-13 21:03 ` [PATCH 16/26] perf tools: Synthesize modules " Jiri Olsa
2020-09-14 16:07 ` Arnaldo Carvalho de Melo
2020-09-15 20:17 ` Ian Rogers
2020-09-16 8:20 ` Jiri Olsa
2020-09-16 14:07 ` Arnaldo Carvalho de Melo
2020-09-16 14:17 ` peterz
2020-09-16 15:10 ` Arnaldo Carvalho de Melo
2020-09-16 15:20 ` peterz
2020-09-16 15:21 ` Jiri Olsa
2020-09-16 15:42 ` Arnaldo Carvalho de Melo
2020-09-13 21:03 ` [PATCH 17/26] perf tools: Synthesize kernel " Jiri Olsa
2020-09-14 16:08 ` Arnaldo Carvalho de Melo
2020-09-13 21:03 ` [PATCH 18/26] perf tests: Add mmap3 support for perf record test Jiri Olsa
2020-09-13 21:03 ` [PATCH 19/26] perf tools: Add buildid-list support for mmap3 Jiri Olsa
2020-09-13 21:03 ` [PATCH 20/26] perf tools: Add build_id_cache__add function Jiri Olsa
2020-09-14 16:13 ` Arnaldo Carvalho de Melo
2020-09-13 21:03 ` [PATCH 21/26] perf tools: Add machine__for_each_dso function Jiri Olsa
2020-09-14 16:15 ` Arnaldo Carvalho de Melo
2020-09-13 21:03 ` [PATCH 22/26] perf tools: Use machine__for_each_dso in perf_session__cache_build_ids Jiri Olsa
2020-09-13 21:03 ` [PATCH 23/26] perf tools: Add __perf_session__cache_build_ids function Jiri Olsa
2020-09-13 21:03 ` [PATCH 24/26] perf tools: Add buildid-list --store option Jiri Olsa
2020-09-14 6:42 ` Namhyung Kim
2020-09-14 15:14 ` Arnaldo Carvalho de Melo
2020-09-14 20:42 ` Jiri Olsa
2020-09-14 20:42 ` Jiri Olsa
2020-09-13 21:03 ` [PATCH 25/26] perf tools: Move debuginfo download code into get_debuginfo Jiri Olsa
2020-09-13 21:03 ` [PATCH 26/26] perf tools: Add report --store option Jiri Olsa
2020-09-14 5:25 ` [RFC 00/26] perf: Add mmap3 support Namhyung Kim
2020-09-14 15:13 ` Arnaldo Carvalho de Melo
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=20200914160738.GJ160517@kernel.org \
--to=acme@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--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=fche@redhat.com \
--cc=irogers@google.com \
--cc=jolsa@kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.