From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754637AbbBRS04 (ORCPT ); Wed, 18 Feb 2015 13:26:56 -0500 Received: from terminus.zytor.com ([198.137.202.10]:40748 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753027AbbBRS0x (ORCPT ); Wed, 18 Feb 2015 13:26:53 -0500 Date: Wed, 18 Feb 2015 10:26:20 -0800 From: tip-bot for Victor Kamensky Message-ID: Cc: acme@redhat.com, anton@samba.org, a.p.zijlstra@chello.nl, linux@arm.linux.org.uk, linux-kernel@vger.kernel.org, namhyung@kernel.org, adrian.hunter@intel.com, Dave.Martin@arm.com, tglx@linutronix.de, Waiman.Long@hp.com, masami.hiramatsu.pt@hitachi.com, jolsa@redhat.com, victor.kamensky@linaro.org, mingo@kernel.org, will.deacon@arm.com, paulus@samba.org, dsahern@gmail.com, hpa@zytor.com, avi@cloudius-systems.com Reply-To: anton@samba.org, acme@redhat.com, linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl, linux@arm.linux.org.uk, adrian.hunter@intel.com, namhyung@kernel.org, Dave.Martin@arm.com, tglx@linutronix.de, Waiman.Long@hp.com, jolsa@redhat.com, masami.hiramatsu.pt@hitachi.com, victor.kamensky@linaro.org, mingo@kernel.org, will.deacon@arm.com, dsahern@gmail.com, paulus@samba.org, hpa@zytor.com, avi@cloudius-systems.com In-Reply-To: <1422340442-4673-3-git-send-email-victor.kamensky@linaro.org> References: <1422340442-4673-3-git-send-email-victor.kamensky@linaro.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf symbols: debuglink should take symfs option into account Git-Commit-ID: dc6254cf870732804b76a83ff2d8a72fea4365f6 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: dc6254cf870732804b76a83ff2d8a72fea4365f6 Gitweb: http://git.kernel.org/tip/dc6254cf870732804b76a83ff2d8a72fea4365f6 Author: Victor Kamensky AuthorDate: Mon, 26 Jan 2015 22:34:02 -0800 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 6 Feb 2015 11:46:36 +0100 perf symbols: debuglink should take symfs option into account Currently code that tries to read corresponding debug symbol file from .gnu_debuglink section (DSO_BINARY_TYPE__DEBUGLINK) does not take in account symfs option, so filename__read_debuglink function cannot open ELF file, if symfs option is used. Fix is to add proper handling of symfs as it is done in other places: use __symbol__join_symfs function to get real file name of target ELF file. Signed-off-by: Victor Kamensky Tested-by: David Ahern Acked-by: David Ahern Acked-by: Namhyung Kim Cc: Adrian Hunter Cc: Anton Blanchard Cc: Avi Kivity Cc: Dave Martin Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Russell King Cc: Waiman Long Cc: Will Deacon Cc: linux-arm-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/1422340442-4673-3-git-send-email-victor.kamensky@linaro.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/dso.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index a8b3f18..814554d 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -45,13 +45,13 @@ int dso__read_binary_type_filename(const struct dso *dso, case DSO_BINARY_TYPE__DEBUGLINK: { char *debuglink; - strncpy(filename, dso->long_name, size); - debuglink = filename + dso->long_name_len; + len = __symbol__join_symfs(filename, size, dso->long_name); + debuglink = filename + len; while (debuglink != filename && *debuglink != '/') debuglink--; if (*debuglink == '/') debuglink++; - ret = filename__read_debuglink(dso->long_name, debuglink, + ret = filename__read_debuglink(filename, debuglink, size - (debuglink - filename)); } break;