From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754594AbbBRS0m (ORCPT ); Wed, 18 Feb 2015 13:26:42 -0500 Received: from terminus.zytor.com ([198.137.202.10]:40725 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754541AbbBRS0k (ORCPT ); Wed, 18 Feb 2015 13:26:40 -0500 Date: Wed, 18 Feb 2015 10:26:02 -0800 From: tip-bot for Victor Kamensky Message-ID: Cc: avi@cloudius-systems.com, will.deacon@arm.com, dsahern@gmail.com, hpa@zytor.com, a.p.zijlstra@chello.nl, anton@samba.org, paulus@samba.org, tglx@linutronix.de, adrian.hunter@intel.com, masami.hiramatsu.pt@hitachi.com, acme@redhat.com, victor.kamensky@linaro.org, linux@arm.linux.org.uk, Dave.Martin@arm.com, jolsa@redhat.com, mingo@kernel.org, namhyung@kernel.org, linux-kernel@vger.kernel.org Reply-To: adrian.hunter@intel.com, masami.hiramatsu.pt@hitachi.com, acme@redhat.com, hpa@zytor.com, anton@samba.org, a.p.zijlstra@chello.nl, tglx@linutronix.de, paulus@samba.org, avi@cloudius-systems.com, dsahern@gmail.com, will.deacon@arm.com, mingo@kernel.org, namhyung@kernel.org, linux-kernel@vger.kernel.org, Dave.Martin@arm.com, jolsa@redhat.com, victor.kamensky@linaro.org, linux@arm.linux.org.uk In-Reply-To: <1422340442-4673-2-git-send-email-victor.kamensky@linaro.org> References: <1422340442-4673-2-git-send-email-victor.kamensky@linaro.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf symbols: Ignore mapping symbols on aarch64 Git-Commit-ID: 4886f2ca19f6ff22ebfbe8e78c79c699e572b89f X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 4886f2ca19f6ff22ebfbe8e78c79c699e572b89f Gitweb: http://git.kernel.org/tip/4886f2ca19f6ff22ebfbe8e78c79c699e572b89f Author: Victor Kamensky AuthorDate: Mon, 26 Jan 2015 22:34:01 -0800 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 6 Feb 2015 11:46:36 +0100 perf symbols: Ignore mapping symbols on aarch64 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." 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 Acked-by: Namhyung Kim Acked-by: Will Deacon Cc: Adrian Hunter Cc: Anton Blanchard Cc: Avi Kivity Cc: Dave Martin Cc: David Ahern Cc: Jiri Olsa Cc: linux-arm-kernel@lists.infradead.org Cc: Masami Hiramatsu Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Russell King Link: http://lkml.kernel.org/r/1422340442-4673-2-git-send-email-victor.kamensky@linaro.org Signed-off-by: Arnaldo Carvalho de Melo --- 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 b24f9d8..225eb73 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -859,10 +859,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; }