From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Jiri Olsa <jolsa@kernel.org>
Cc: Ian Rogers <irogers@google.com>,
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>,
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 11/25] perf tools: Use struct extra_kernel_map in machine__process_kernel_mmap_event
Date: Thu, 26 Nov 2020 14:48:54 -0300 [thread overview]
Message-ID: <20201126174854.GC70905@kernel.org> (raw)
In-Reply-To: <20201126170026.2619053-12-jolsa@kernel.org>
Em Thu, Nov 26, 2020 at 06:00:12PM +0100, Jiri Olsa escreveu:
> Using struct extra_kernel_map in machine__process_kernel_mmap_event,
> to pass mmap details. This way we can used single function for all 3
> mmap versions.
Thanks, applied.
- Arnaldo
> Acked-by: Ian Rogers <irogers@google.com>
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
> tools/perf/util/machine.c | 62 +++++++++++++++++++++------------------
> 1 file changed, 33 insertions(+), 29 deletions(-)
>
> diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
> index 15385ea00190..1ae32a81639c 100644
> --- a/tools/perf/util/machine.c
> +++ b/tools/perf/util/machine.c
> @@ -1581,32 +1581,25 @@ static bool machine__uses_kcore(struct machine *machine)
> }
>
> static bool perf_event__is_extra_kernel_mmap(struct machine *machine,
> - union perf_event *event)
> + struct extra_kernel_map *xm)
> {
> return machine__is(machine, "x86_64") &&
> - is_entry_trampoline(event->mmap.filename);
> + is_entry_trampoline(xm->name);
> }
>
> static int machine__process_extra_kernel_map(struct machine *machine,
> - union perf_event *event)
> + struct extra_kernel_map *xm)
> {
> struct dso *kernel = machine__kernel_dso(machine);
> - struct extra_kernel_map xm = {
> - .start = event->mmap.start,
> - .end = event->mmap.start + event->mmap.len,
> - .pgoff = event->mmap.pgoff,
> - };
>
> if (kernel == NULL)
> return -1;
>
> - strlcpy(xm.name, event->mmap.filename, KMAP_NAME_LEN);
> -
> - return machine__create_extra_kernel_map(machine, kernel, &xm);
> + return machine__create_extra_kernel_map(machine, kernel, xm);
> }
>
> static int machine__process_kernel_mmap_event(struct machine *machine,
> - union perf_event *event)
> + struct extra_kernel_map *xm)
> {
> struct map *map;
> enum dso_space_type dso_space;
> @@ -1621,20 +1614,18 @@ static int machine__process_kernel_mmap_event(struct machine *machine,
> else
> dso_space = DSO_SPACE__KERNEL_GUEST;
>
> - is_kernel_mmap = memcmp(event->mmap.filename,
> - machine->mmap_name,
> + is_kernel_mmap = memcmp(xm->name, machine->mmap_name,
> strlen(machine->mmap_name) - 1) == 0;
> - if (event->mmap.filename[0] == '/' ||
> - (!is_kernel_mmap && event->mmap.filename[0] == '[')) {
> - map = machine__addnew_module_map(machine, event->mmap.start,
> - event->mmap.filename);
> + if (xm->name[0] == '/' ||
> + (!is_kernel_mmap && xm->name[0] == '[')) {
> + map = machine__addnew_module_map(machine, xm->start,
> + xm->name);
> if (map == NULL)
> goto out_problem;
>
> - map->end = map->start + event->mmap.len;
> + map->end = map->start + xm->end - xm->start;
> } else if (is_kernel_mmap) {
> - const char *symbol_name = (event->mmap.filename +
> - strlen(machine->mmap_name));
> + const char *symbol_name = (xm->name + strlen(machine->mmap_name));
> /*
> * Should be there already, from the build-id table in
> * the header.
> @@ -1688,18 +1679,17 @@ static int machine__process_kernel_mmap_event(struct machine *machine,
> if (strstr(kernel->long_name, "vmlinux"))
> dso__set_short_name(kernel, "[kernel.vmlinux]", false);
>
> - machine__update_kernel_mmap(machine, event->mmap.start,
> - event->mmap.start + event->mmap.len);
> + machine__update_kernel_mmap(machine, xm->start, xm->end);
>
> /*
> * Avoid using a zero address (kptr_restrict) for the ref reloc
> * symbol. Effectively having zero here means that at record
> * time /proc/sys/kernel/kptr_restrict was non zero.
> */
> - if (event->mmap.pgoff != 0) {
> + if (xm->pgoff != 0) {
> map__set_kallsyms_ref_reloc_sym(machine->vmlinux_map,
> symbol_name,
> - event->mmap.pgoff);
> + xm->pgoff);
> }
>
> if (machine__is_default_guest(machine)) {
> @@ -1708,8 +1698,8 @@ static int machine__process_kernel_mmap_event(struct machine *machine,
> */
> dso__load(kernel, machine__kernel_map(machine));
> }
> - } else if (perf_event__is_extra_kernel_mmap(machine, event)) {
> - return machine__process_extra_kernel_map(machine, event);
> + } else if (perf_event__is_extra_kernel_mmap(machine, xm)) {
> + return machine__process_extra_kernel_map(machine, xm);
> }
> return 0;
> out_problem:
> @@ -1735,7 +1725,14 @@ int machine__process_mmap2_event(struct machine *machine,
>
> if (sample->cpumode == PERF_RECORD_MISC_GUEST_KERNEL ||
> sample->cpumode == PERF_RECORD_MISC_KERNEL) {
> - ret = machine__process_kernel_mmap_event(machine, event);
> + struct extra_kernel_map xm = {
> + .start = event->mmap2.start,
> + .end = event->mmap2.start + event->mmap2.len,
> + .pgoff = event->mmap2.pgoff,
> + };
> +
> + strlcpy(xm.name, event->mmap2.filename, KMAP_NAME_LEN);
> + ret = machine__process_kernel_mmap_event(machine, &xm);
> if (ret < 0)
> goto out_problem;
> return 0;
> @@ -1785,7 +1782,14 @@ int machine__process_mmap_event(struct machine *machine, union perf_event *event
>
> if (sample->cpumode == PERF_RECORD_MISC_GUEST_KERNEL ||
> sample->cpumode == PERF_RECORD_MISC_KERNEL) {
> - ret = machine__process_kernel_mmap_event(machine, event);
> + struct extra_kernel_map xm = {
> + .start = event->mmap.start,
> + .end = event->mmap.start + event->mmap.len,
> + .pgoff = event->mmap.pgoff,
> + };
> +
> + strlcpy(xm.name, event->mmap.filename, KMAP_NAME_LEN);
> + ret = machine__process_kernel_mmap_event(machine, &xm);
> if (ret < 0)
> goto out_problem;
> return 0;
> --
> 2.26.2
>
--
- Arnaldo
next prev parent reply other threads:[~2020-11-26 17:49 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-26 17:00 [PATCHv4 00/25] perf: Add mmap2 build id support Jiri Olsa
2020-11-26 17:00 ` [PATCH 01/25] bpf: Move stack_map_get_build_id into lib Jiri Olsa
2020-11-26 17:00 ` [PATCH 02/25] bpf: Add size arg to build_id_parse function Jiri Olsa
2020-12-03 19:24 ` Jiri Olsa
2020-12-03 21:23 ` Song Liu
2020-12-04 23:30 ` Jiri Olsa
2020-11-26 17:00 ` [PATCH 03/25] perf: Add build id data in mmap2 event Jiri Olsa
2020-11-26 17:00 ` [PATCH 04/25] tools headers uapi: Sync tools/include/uapi/linux/perf_event.h Jiri Olsa
2020-11-26 17:00 ` [PATCH 05/25] tools lib: Adopt memchr_inv() from kernel Jiri Olsa
2020-11-26 17:42 ` Arnaldo Carvalho de Melo
2020-11-26 17:00 ` [PATCH 06/25] perf tools: Do not swap mmap2 fields in case it contains build id Jiri Olsa
2020-11-26 17:30 ` Arnaldo Carvalho de Melo
2020-11-27 19:46 ` Jiri Olsa
2020-11-26 17:00 ` [PATCH 07/25] perf tools: Add build_id__is_defined function Jiri Olsa
2020-11-26 17:43 ` Arnaldo Carvalho de Melo
2020-11-26 17:00 ` [PATCH 08/25] perf tools: Add filename__decompress function Jiri Olsa
2020-11-26 17:44 ` Arnaldo Carvalho de Melo
2020-11-26 17:00 ` [PATCH 09/25] perf tools: Add support to read build id from compressed elf Jiri Olsa
2020-11-26 17:46 ` Arnaldo Carvalho de Melo
2020-11-27 19:45 ` Jiri Olsa
2020-11-26 17:00 ` [PATCH 10/25] perf tools: Add check for existing link in buildid dir Jiri Olsa
2020-11-26 17:47 ` Arnaldo Carvalho de Melo
2020-11-26 17:00 ` [PATCH 11/25] perf tools: Use struct extra_kernel_map in machine__process_kernel_mmap_event Jiri Olsa
2020-11-26 17:48 ` Arnaldo Carvalho de Melo [this message]
2020-11-26 17:00 ` [PATCH 12/25] perf tools: Try to load vmlinux from buildid database Jiri Olsa
2020-11-26 17:50 ` Arnaldo Carvalho de Melo
2020-11-26 17:00 ` [PATCH 13/25] perf tools: Store build id from mmap2 events Jiri Olsa
2020-11-26 17:00 ` [PATCH 14/25] perf tools: Allow mmap2 event to synthesize kernel image Jiri Olsa
2020-11-26 17:00 ` [PATCH 15/25] perf tools: Allow mmap2 event to synthesize modules Jiri Olsa
2020-11-26 17:00 ` [PATCH 16/25] perf tools: Synthesize build id for kernel/modules/tasks Jiri Olsa
2020-11-26 17:00 ` [PATCH 17/25] perf tools: Add support to display build id for mmap2 events Jiri Olsa
2020-11-26 17:00 ` [PATCH 18/25] perf tools: Use machine__for_each_dso in perf_session__cache_build_ids Jiri Olsa
2020-11-26 17:52 ` Arnaldo Carvalho de Melo
2020-11-26 17:00 ` [PATCH 19/25] perf tools: Add __perf_session__cache_build_ids function Jiri Olsa
2020-11-26 17:53 ` Arnaldo Carvalho de Melo
2020-11-26 17:00 ` [PATCH 20/25] perf tools: Add is_perf_data function Jiri Olsa
2020-11-26 17:51 ` Arnaldo Carvalho de Melo
2020-11-26 17:00 ` [PATCH 21/25] perf tools: Add build_id_cache__add function Jiri Olsa
2020-11-26 17:53 ` Arnaldo Carvalho de Melo
2020-11-26 17:00 ` [PATCH 22/25] perf buildid-cache: Add support to add build ids from perf data Jiri Olsa
2020-11-26 17:57 ` Arnaldo Carvalho de Melo
2020-11-27 19:49 ` Jiri Olsa
2020-11-26 17:00 ` [PATCH 23/25] perf buildid-cache: Add --debuginfod option Jiri Olsa
2020-11-26 17:00 ` [PATCH 24/25] perf buildid-list: Add support for mmap2's buildid events Jiri Olsa
2020-11-26 17:00 ` [PATCH 25/25] perf record: Add --buildid-mmap option to enable mmap's build id Jiri Olsa
2020-11-26 17:40 ` Arnaldo Carvalho de Melo
2020-11-27 4:41 ` [PATCHv4 00/25] perf: Add mmap2 build id support Namhyung Kim
-- strict thread matches above, loose matches on Subject: below --
2020-11-23 23:04 [PATCHv3 " Jiri Olsa
2020-11-23 23:04 ` [PATCH 11/25] perf tools: Use struct extra_kernel_map in machine__process_kernel_mmap_event 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=20201126174854.GC70905@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=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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox