From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751960AbdFHWvz (ORCPT ); Thu, 8 Jun 2017 18:51:55 -0400 Received: from terminus.zytor.com ([65.50.211.136]:45345 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751523AbdFHWvx (ORCPT ); Thu, 8 Jun 2017 18:51:53 -0400 Date: Thu, 8 Jun 2017 15:49:32 -0700 From: tip-bot for Namhyung Kim Message-ID: Cc: namhyung@kernel.org, dsahern@gmail.com, mingo@kernel.org, a.p.zijlstra@chello.nl, adrian.hunter@intel.com, wangnan0@huawei.com, hpa@zytor.com, jolsa@kernel.org, acme@redhat.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, treeze.taeung@gmail.com Reply-To: treeze.taeung@gmail.com, linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl, adrian.hunter@intel.com, wangnan0@huawei.com, namhyung@kernel.org, mingo@kernel.org, dsahern@gmail.com, acme@redhat.com, tglx@linutronix.de, hpa@zytor.com, jolsa@kernel.org In-Reply-To: <20170608073109.30699-2-namhyung@kernel.org> References: <20170608073109.30699-2-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf annotate: Fix symbolic link of build-id cache Git-Commit-ID: 3619ef76b37d4803bc9daee9d03d82c8526db378 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: 3619ef76b37d4803bc9daee9d03d82c8526db378 Gitweb: http://git.kernel.org/tip/3619ef76b37d4803bc9daee9d03d82c8526db378 Author: Namhyung Kim AuthorDate: Thu, 8 Jun 2017 16:31:01 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 8 Jun 2017 15:38:41 -0300 perf annotate: Fix symbolic link of build-id cache The commit 6ebd2547dd24 ("perf annotate: Fix a bug following symbolic link of a build-id file") changed to use dirname to follow the symlink. But it only considers new-style build-id cache names so old names fail on readlink() and force to use system path which might not available. Signed-off-by: Namhyung Kim Acked-by: Jiri Olsa Cc: Adrian Hunter Cc: David Ahern Cc: Peter Zijlstra Cc: Taeung Song Cc: Wang Nan Cc: kernel-team@lge.com Fixes: 6ebd2547dd24 ("perf annotate: Fix a bug following symbolic link of a build-id file") Link: http://lkml.kernel.org/r/20170608073109.30699-2-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/annotate.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 1367d7e..df4486c 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -1321,6 +1321,7 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil char linkname[PATH_MAX]; char *build_id_filename; char *build_id_path = NULL; + char *pos; if (dso->symtab_type == DSO_BINARY_TYPE__KALLSYMS && !dso__is_kcore(dso)) @@ -1340,7 +1341,14 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil if (!build_id_path) return -1; - dirname(build_id_path); + /* + * old style build-id cache has name of XX/XXXXXXX.. while + * new style has XX/XXXXXXX../{elf,kallsyms,vdso}. + * extract the build-id part of dirname in the new style only. + */ + pos = strrchr(build_id_path, '/'); + if (pos && strlen(pos) < SBUILD_ID_SIZE - 2) + dirname(build_id_path); if (dso__is_kcore(dso) || readlink(build_id_path, linkname, sizeof(linkname)) < 0 ||