From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934108AbcIEN0X (ORCPT ); Mon, 5 Sep 2016 09:26:23 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38904 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932257AbcIEN0U (ORCPT ); Mon, 5 Sep 2016 09:26:20 -0400 Date: Mon, 5 Sep 2016 06:25:59 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: hpa@zytor.com, linux-kernel@vger.kernel.org, dsahern@gmail.com, mhiramat@kernel.org, mingo@kernel.org, adrian.hunter@intel.com, namhyung@kernel.org, acme@redhat.com, tglx@linutronix.de, wangnan0@huawei.com, jolsa@kernel.org, anton@samba.org Reply-To: adrian.hunter@intel.com, namhyung@kernel.org, anton@samba.org, jolsa@kernel.org, acme@redhat.com, tglx@linutronix.de, wangnan0@huawei.com, dsahern@gmail.com, hpa@zytor.com, linux-kernel@vger.kernel.org, mingo@kernel.org, mhiramat@kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf symbols: Fixup symbol sizes before picking best ones Git-Commit-ID: 432746f8e0b6a82ba832b771afe31abd51af6752 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: 432746f8e0b6a82ba832b771afe31abd51af6752 Gitweb: http://git.kernel.org/tip/432746f8e0b6a82ba832b771afe31abd51af6752 Author: Arnaldo Carvalho de Melo AuthorDate: Thu, 1 Sep 2016 11:00:23 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 1 Sep 2016 12:42:24 -0300 perf symbols: Fixup symbol sizes before picking best ones When we call symbol__fixup_duplicate() we use algorithms to pick the "best" symbols for cases where there are various functions/aliases to an address, and those check zero size symbols, which, before calling symbol__fixup_end() are _all_ symbols in a just parsed kallsyms file. So first fixup the end, then fixup the duplicates. Found while trying to figure out why 'perf test vmlinux' failed, see the output of 'perf test -v vmlinux' to see cases where the symbols picked as best for vmlinux don't match the ones picked for kallsyms. Cc: Anton Blanchard Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Wang Nan Fixes: 694bf407b061 ("perf symbols: Add some heuristics for choosing the best duplicate symbol") Link: http://lkml.kernel.org/n/tip-rxqvdgr0mqjdxee0kf8i2ufn@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/symbol-elf.c | 2 +- tools/perf/util/symbol.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index 9ba6e49..295d314 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c @@ -1136,8 +1136,8 @@ new_symbol: * For misannotated, zeroed, ASM function sizes. */ if (nr > 0) { - symbols__fixup_duplicate(&dso->symbols[map->type]); symbols__fixup_end(&dso->symbols[map->type]); + symbols__fixup_duplicate(&dso->symbols[map->type]); if (kmap) { /* * We need to fixup this here too because we create new diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index ef2f913..98cd503 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -1243,8 +1243,8 @@ int __dso__load_kallsyms(struct dso *dso, const char *filename, if (kallsyms__delta(map, filename, &delta)) return -1; - symbols__fixup_duplicate(&dso->symbols[map->type]); symbols__fixup_end(&dso->symbols[map->type]); + symbols__fixup_duplicate(&dso->symbols[map->type]); if (dso->kernel == DSO_TYPE_GUEST_KERNEL) dso->symtab_type = DSO_BINARY_TYPE__GUEST_KALLSYMS;