From: Victor Kamensky <victor.kamensky@linaro.org> To: Arnaldo Carvalho de Melo <acme@kernel.org>, Russell King <linux@arm.linux.org.uk>, Namhyung Kim <namhyung@kernel.org>, David Ahern <dsahern@gmail.com>, Will Deacon <will.deacon@arm.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>, Paul Mackerras <paulus@samba.org>, Ingo Molnar <mingo@redhat.com>, Adrian Hunter <adrian.hunter@intel.com>, Jiri Olsa <jolsa@redhat.com>, Avi Kivity <avi@cloudius-systems.com>, Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>, Anton Blanchard <anton@samba.org>, Dave Martin <Dave.Martin@arm.com>, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Victor Kamensky <victor.kamensky@linaro.org> Subject: [PATCH V3 1/2] perf symbols: Ignore mapping symbols on aarch64 Date: Mon, 26 Jan 2015 22:34:01 -0800 [thread overview] Message-ID: <1422340442-4673-2-git-send-email-victor.kamensky@linaro.org> (raw) In-Reply-To: <1422340442-4673-1-git-send-email-victor.kamensky@linaro.org> Aarch64 ELF files use mapping symbols with special names $x, $d to identify regions of Aarch64 code (see Aarch64 ELF ABI - "ARM IHI 0056B", section "4.5.4 Mapping symbols"). The patch filters out these symbols at load time, similar to "696b97a perf symbols: Ignore mapping symbols on ARM" changes done for ARM before V8. Also added handling of mapping symbols that has format "$d.<any>" and similar for both cases. Note we are not making difference between EM_ARM and EM_AARCH64 mapping symbols instead code handles superset of both. Signed-off-by: Victor Kamensky <victor.kamensky@linaro.org> Acked-by: Will Deacon <will.deacon@arm.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Paul Mackerras <paulus@samba.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Arnaldo Carvalho de Melo <acme@kernel.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Avi Kivity <avi@cloudius-systems.com> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> Cc: Anton Blanchard <anton@samba.org> Cc: David Ahern <dsahern@gmail.com> Cc: Will Deacon <will.deacon@arm.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Dave Martin <Dave.Martin@arm.com> --- tools/perf/util/symbol-elf.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index 06fcd1b..8fc6e2f 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -856,10 +856,9 @@ int dso__load_sym(struct dso *dso, struct map *map, /* Reject ARM ELF "mapping symbols": these aren't unique and * don't identify functions, so will confuse the profile * output: */ - if (ehdr.e_machine == EM_ARM) { - if (!strcmp(elf_name, "$a") || - !strcmp(elf_name, "$d") || - !strcmp(elf_name, "$t")) + if (ehdr.e_machine == EM_ARM || ehdr.e_machine == EM_AARCH64) { + if (elf_name[0] == '$' && strchr("adtx", elf_name[1]) + && (elf_name[2] == '\0' || elf_name[2] == '.')) continue; } -- 1.9.3
WARNING: multiple messages have this Message-ID (diff)
From: victor.kamensky@linaro.org (Victor Kamensky) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH V3 1/2] perf symbols: Ignore mapping symbols on aarch64 Date: Mon, 26 Jan 2015 22:34:01 -0800 [thread overview] Message-ID: <1422340442-4673-2-git-send-email-victor.kamensky@linaro.org> (raw) In-Reply-To: <1422340442-4673-1-git-send-email-victor.kamensky@linaro.org> Aarch64 ELF files use mapping symbols with special names $x, $d to identify regions of Aarch64 code (see Aarch64 ELF ABI - "ARM IHI 0056B", section "4.5.4 Mapping symbols"). The patch filters out these symbols at load time, similar to "696b97a perf symbols: Ignore mapping symbols on ARM" changes done for ARM before V8. Also added handling of mapping symbols that has format "$d.<any>" and similar for both cases. Note we are not making difference between EM_ARM and EM_AARCH64 mapping symbols instead code handles superset of both. Signed-off-by: Victor Kamensky <victor.kamensky@linaro.org> Acked-by: Will Deacon <will.deacon@arm.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Paul Mackerras <paulus@samba.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Arnaldo Carvalho de Melo <acme@kernel.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Avi Kivity <avi@cloudius-systems.com> Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> Cc: Anton Blanchard <anton@samba.org> Cc: David Ahern <dsahern@gmail.com> Cc: Will Deacon <will.deacon@arm.com> Cc: Russell King <linux@arm.linux.org.uk> Cc: Dave Martin <Dave.Martin@arm.com> --- tools/perf/util/symbol-elf.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index 06fcd1b..8fc6e2f 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -856,10 +856,9 @@ int dso__load_sym(struct dso *dso, struct map *map, /* Reject ARM ELF "mapping symbols": these aren't unique and * don't identify functions, so will confuse the profile * output: */ - if (ehdr.e_machine == EM_ARM) { - if (!strcmp(elf_name, "$a") || - !strcmp(elf_name, "$d") || - !strcmp(elf_name, "$t")) + if (ehdr.e_machine == EM_ARM || ehdr.e_machine == EM_AARCH64) { + if (elf_name[0] == '$' && strchr("adtx", elf_name[1]) + && (elf_name[2] == '\0' || elf_name[2] == '.')) continue; } -- 1.9.3
next prev parent reply other threads:[~2015-01-27 6:34 UTC|newest] Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-01-27 6:34 [PATCH V3 0/2] perf symbols: debuglink and arm mapping symbols changes Victor Kamensky 2015-01-27 6:34 ` Victor Kamensky 2015-01-27 6:34 ` Victor Kamensky [this message] 2015-01-27 6:34 ` [PATCH V3 1/2] perf symbols: Ignore mapping symbols on aarch64 Victor Kamensky 2015-01-29 1:39 ` Namhyung Kim 2015-01-29 1:39 ` Namhyung Kim 2015-02-18 18:26 ` [tip:perf/core] " tip-bot for Victor Kamensky 2015-01-27 6:34 ` [PATCH V3 2/2] perf symbols: debuglink should take symfs option into account Victor Kamensky 2015-01-27 6:34 ` Victor Kamensky 2015-01-29 1:38 ` Namhyung Kim 2015-01-29 1:38 ` Namhyung Kim 2015-01-29 4:08 ` Victor Kamensky 2015-01-29 4:08 ` Victor Kamensky 2015-01-29 6:54 ` Namhyung Kim 2015-01-29 6:54 ` Namhyung Kim 2015-01-30 14:40 ` Arnaldo Carvalho de Melo 2015-01-30 14:40 ` Arnaldo Carvalho de Melo 2015-02-18 18:26 ` [tip:perf/core] " tip-bot for Victor Kamensky
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=1422340442-4673-2-git-send-email-victor.kamensky@linaro.org \ --to=victor.kamensky@linaro.org \ --cc=Dave.Martin@arm.com \ --cc=a.p.zijlstra@chello.nl \ --cc=acme@kernel.org \ --cc=adrian.hunter@intel.com \ --cc=anton@samba.org \ --cc=avi@cloudius-systems.com \ --cc=dsahern@gmail.com \ --cc=jolsa@redhat.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=masami.hiramatsu.pt@hitachi.com \ --cc=mingo@redhat.com \ --cc=namhyung@kernel.org \ --cc=paulus@samba.org \ --cc=will.deacon@arm.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: linkBe 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.