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.

Signed-off-by: Victor Kamensky <victor.kamen...@linaro.org>
Cc: Peter Zijlstra <a.p.zijls...@chello.nl>
Cc: Paul Mackerras <pau...@samba.org>
Cc: Ingo Molnar <mi...@redhat.com>
Cc: Arnaldo Carvalho de Melo <a...@kernel.org>
Cc: Adrian Hunter <adrian.hun...@intel.com>
Cc: Jiri Olsa <jo...@redhat.com>
Cc: Namhyung Kim <namhy...@kernel.org>
Cc: Avi Kivity <a...@cloudius-systems.com>
Cc: Masami Hiramatsu <masami.hiramatsu...@hitachi.com>
Cc: Anton Blanchard <an...@samba.org>
Cc: David Ahern <dsah...@gmail.com>
Cc: Will Deacon <will.dea...@arm.com>
Cc: Dave Martin <dave.mar...@arm.com>
Acked-by: Will Deacon <will.dea...@arm.com>
---
 tools/perf/util/symbol-elf.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c
index 06fcd1b..1e188dd 100644
--- a/tools/perf/util/symbol-elf.c
+++ b/tools/perf/util/symbol-elf.c
@@ -862,6 +862,14 @@ int dso__load_sym(struct dso *dso, struct map *map,
                            !strcmp(elf_name, "$t"))
                                continue;
                }
+               /* Reject Aarch64 ELF "mapping symbols": these aren't unique and
+                * don't identify functions, so will confuse the profile
+                * output: */
+               if (ehdr.e_machine == EM_AARCH64) {
+                       if (!strcmp(elf_name, "$x") ||
+                           !strcmp(elf_name, "$d"))
+                               continue;
+               }
 
                if (runtime_ss->opdsec && sym.st_shndx == runtime_ss->opdidx) {
                        u32 offset = sym.st_value - syms_ss->opdshdr.sh_addr;
-- 
1.9.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to