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>,
Wang Nan <wangnan0@huawei.com>,
kernel-team@lge.com, Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 14/15] perf symbols: Keep DSO->symtab_type after decompress
Date: Thu, 8 Jun 2017 18:59:27 -0300 [thread overview]
Message-ID: <20170608215928.10634-15-acme@kernel.org> (raw)
In-Reply-To: <20170608215928.10634-1-acme@kernel.org>
From: Namhyung Kim <namhyung@kernel.org>
The symsrc__init() overwrites dso->symtab_type as symsrc->type in
dso__load_sym(). But for compressed kernel modules in the build-id
cache, it should have original symtab type to be decompressed as needed.
This fixes perf annotate to show disassembly of the function properly.
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: Wang Nan <wangnan0@huawei.com>
Cc: kernel-team@lge.com
Link: http://lkml.kernel.org/r/20170608073109.30699-9-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/symbol-elf.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c
index d342e771dbad..502505cf236a 100644
--- a/tools/perf/util/symbol-elf.c
+++ b/tools/perf/util/symbol-elf.c
@@ -671,6 +671,8 @@ int symsrc__init(struct symsrc *ss, struct dso *dso, const char *name,
fd = dso__decompress_kmodule_fd(dso, name);
if (fd < 0)
return -1;
+
+ type = dso->symtab_type;
} else {
fd = open(name, O_RDONLY);
if (fd < 0) {
--
2.9.4
next prev parent reply other threads:[~2017-06-08 22:00 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 ` [PATCH 07/15] perf annotate: Fix symbolic link of build-id cache Arnaldo Carvalho de Melo
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 ` Arnaldo Carvalho de Melo [this message]
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-15-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=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).