From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Namhyung Kim <namhyung@kernel.org>,
Adrian Hunter <adrian.hunter@intel.com>,
David Ahern <dsahern@gmail.com>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Taeung Song <treeze.taeung@gmail.com>,
Wang Nan <wangnan0@huawei.com>,
kernel-team@lge.com, Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 07/15] perf annotate: Fix symbolic link of build-id cache
Date: Thu, 8 Jun 2017 18:59:20 -0300 [thread overview]
Message-ID: <20170608215928.10634-8-acme@kernel.org> (raw)
In-Reply-To: <20170608215928.10634-1-acme@kernel.org>
From: Namhyung Kim <namhyung@kernel.org>
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 <namhyung@kernel.org>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Taeung Song <treeze.taeung@gmail.com>
Cc: Wang Nan <wangnan0@huawei.com>
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 <acme@redhat.com>
---
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 1367d7e35242..df4486c3a2fa 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 ||
--
2.9.4
next prev parent reply other threads:[~2017-06-08 22:02 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-08 21:59 [GIT PULL 00/15] perf/urgent fixes Arnaldo Carvalho de Melo
2017-06-08 21:59 ` [PATCH 01/15] perf probe: Fix examples section of documentation Arnaldo Carvalho de Melo
2017-06-08 21:59 ` [PATCH 02/15] perf script: Fix outdated comment for perf-trace-python Arnaldo Carvalho de Melo
2017-06-08 21:59 ` [PATCH 03/15] perf script: Fix documentation errors Arnaldo Carvalho de Melo
2017-06-08 21:59 ` [PATCH 04/15] perf script python: Fix wrong code snippets in documentation Arnaldo Carvalho de Melo
2017-06-08 21:59 ` [PATCH 05/15] perf script python: Updated trace_unhandled() signature Arnaldo Carvalho de Melo
2017-06-08 21:59 ` [PATCH 06/15] perf script python: Remove dups in documentation examples Arnaldo Carvalho de Melo
2017-06-08 21:59 ` Arnaldo Carvalho de Melo [this message]
2017-06-08 21:59 ` [PATCH 08/15] perf tools: Fix a memory leak in __open_dso() Arnaldo Carvalho de Melo
2017-06-08 21:59 ` [PATCH 09/15] perf tools: Introduce dso__decompress_kmodule_{fd,path} Arnaldo Carvalho de Melo
2017-06-08 21:59 ` [PATCH 10/15] perf annotate: Use dso__decompress_kmodule_path() Arnaldo Carvalho de Melo
2017-06-08 21:59 ` [PATCH 11/15] perf tools: Decompress kernel module when reading DSO data Arnaldo Carvalho de Melo
2017-06-08 21:59 ` [PATCH 12/15] perf tools: Consolidate error path in __open_dso() Arnaldo Carvalho de Melo
2017-06-08 21:59 ` [PATCH 13/15] perf tests: Decompress kernel module before objdump Arnaldo Carvalho de Melo
2017-06-08 21:59 ` [PATCH 14/15] perf symbols: Keep DSO->symtab_type after decompress Arnaldo Carvalho de Melo
2017-06-08 21:59 ` [PATCH 15/15] perf symbols: Kill dso__build_id_is_kmod() Arnaldo Carvalho de Melo
2017-06-08 22:42 ` [GIT PULL 00/15] perf/urgent fixes Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170608215928.10634-8-acme@kernel.org \
--to=acme@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=dsahern@gmail.com \
--cc=kernel-team@lge.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=treeze.taeung@gmail.com \
--cc=wangnan0@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).