From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756926AbbJ2Jmh (ORCPT ); Thu, 29 Oct 2015 05:42:37 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56165 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756853AbbJ2Jme (ORCPT ); Thu, 29 Oct 2015 05:42:34 -0400 Date: Thu, 29 Oct 2015 02:42:21 -0700 From: tip-bot for Dima Kogan Message-ID: Cc: tglx@linutronix.de, acme@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, dima@secretsauce.net, mingo@kernel.org Reply-To: acme@redhat.com, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org, mingo@kernel.org, dima@secretsauce.net In-Reply-To: <87si6pfwz4.fsf@secretsauce.net> References: <87si6pfwz4.fsf@secretsauce.net> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf symbols: we can now read separate debug-info files based on a build ID Git-Commit-ID: 5baecbcd9c9a2f491afe1369fc22e7363f9c94d5 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: 5baecbcd9c9a2f491afe1369fc22e7363f9c94d5 Gitweb: http://git.kernel.org/tip/5baecbcd9c9a2f491afe1369fc22e7363f9c94d5 Author: Dima Kogan AuthorDate: Mon, 7 Sep 2015 17:34:19 -0700 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 28 Oct 2015 10:04:27 -0300 perf symbols: we can now read separate debug-info files based on a build ID Recent GDB (at least on a vanilla Debian box) looks for debug information in /usr/lib/debug/.build-id/nn/nnnnnnn where nn/nnnnnn is the build-id of the stripped ELF binary. This is documented here: https://sourceware.org/gdb/onlinedocs/gdb/Separate-Debug-Files.html This was not working in perf because we didn't read the build id until AFTER we searched for the separate debug information file. This patch reads the build ID and THEN does the search. Signed-off-by: Dima Kogan Link: http://lkml.kernel.org/r/87si6pfwz4.fsf@secretsauce.net Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/symbol.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index e7bf0c4..71bf711 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -1406,6 +1406,7 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter) struct symsrc ss_[2]; struct symsrc *syms_ss = NULL, *runtime_ss = NULL; bool kmod; + unsigned char build_id[BUILD_ID_SIZE]; pthread_mutex_lock(&dso->lock); @@ -1461,6 +1462,14 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter) dso->symtab_type == DSO_BINARY_TYPE__GUEST_KMODULE || dso->symtab_type == DSO_BINARY_TYPE__GUEST_KMODULE_COMP; + + /* + * Read the build id if possible. This is required for + * DSO_BINARY_TYPE__BUILDID_DEBUGINFO to work + */ + if (filename__read_build_id(dso->name, build_id, BUILD_ID_SIZE) > 0) + dso__set_build_id(dso, build_id); + /* * Iterate over candidate debug images. * Keep track of "interesting" ones (those which have a symtab, dynsym,