From: tip-bot for Wang Nan <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: namhyung@kernel.org, linux-kernel@vger.kernel.org,
lizefan@huawei.com, hpa@zytor.com, acme@redhat.com,
ast@kernel.org, tglx@linutronix.de, adrian.hunter@intel.com,
hekuang@huawei.com, kirr@nexedi.com, peterz@infradead.org,
masami.hiramatsu.pt@hitachi.com, dev@codyps.com,
mingo@kernel.org, wangnan0@huawei.com, jolsa@kernel.org
Subject: [tip:perf/urgent] perf symbols: Record text offset in dso to calculate objdump address
Date: Thu, 24 Mar 2016 00:37:25 -0700 [thread overview]
Message-ID: <tip-73cdf0c6ea9c597894924f3b91ad636389555c1b@git.kernel.org> (raw)
In-Reply-To: <1456479154-136027-2-git-send-email-wangnan0@huawei.com>
Commit-ID: 73cdf0c6ea9c597894924f3b91ad636389555c1b
Gitweb: http://git.kernel.org/tip/73cdf0c6ea9c597894924f3b91ad636389555c1b
Author: Wang Nan <wangnan0@huawei.com>
AuthorDate: Fri, 26 Feb 2016 09:31:49 +0000
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Fri, 18 Mar 2016 14:23:59 -0300
perf symbols: Record text offset in dso to calculate objdump address
Store DSO's .text offset into DSO, used for VDSOs and will also be used for
other needs, like handling kernel modules.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Cody P Schafer <dev@codyps.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kirill Smelkov <kirr@nexedi.com>
Cc: Li Zefan <lizefan@huawei.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1456479154-136027-2-git-send-email-wangnan0@huawei.com
[ Extracted from larger patch ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/dso.h | 1 +
tools/perf/util/symbol-elf.c | 12 ++++++------
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h
index 45ec4d0..ef3dbc9 100644
--- a/tools/perf/util/dso.h
+++ b/tools/perf/util/dso.h
@@ -162,6 +162,7 @@ struct dso {
u8 loaded;
u8 rel;
u8 build_id[BUILD_ID_SIZE];
+ u64 text_offset;
const char *short_name;
const char *long_name;
u16 long_name_len;
diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c
index b1dd68f..bc229a7 100644
--- a/tools/perf/util/symbol-elf.c
+++ b/tools/perf/util/symbol-elf.c
@@ -793,6 +793,7 @@ int dso__load_sym(struct dso *dso, struct map *map,
uint32_t idx;
GElf_Ehdr ehdr;
GElf_Shdr shdr;
+ GElf_Shdr tshdr;
Elf_Data *syms, *opddata = NULL;
GElf_Sym sym;
Elf_Scn *sec, *sec_strndx;
@@ -832,6 +833,9 @@ int dso__load_sym(struct dso *dso, struct map *map,
sec = syms_ss->symtab;
shdr = syms_ss->symshdr;
+ if (elf_section_by_name(elf, &ehdr, &tshdr, ".text", NULL))
+ dso->text_offset = tshdr.sh_addr - tshdr.sh_offset;
+
if (runtime_ss->opdsec)
opddata = elf_rawdata(runtime_ss->opdsec, NULL);
@@ -880,12 +884,8 @@ int dso__load_sym(struct dso *dso, struct map *map,
* Handle any relocation of vdso necessary because older kernels
* attempted to prelink vdso to its virtual address.
*/
- if (dso__is_vdso(dso)) {
- GElf_Shdr tshdr;
-
- if (elf_section_by_name(elf, &ehdr, &tshdr, ".text", NULL))
- map->reloc = map->start - tshdr.sh_addr + tshdr.sh_offset;
- }
+ if (dso__is_vdso(dso))
+ map->reloc = map->start - dso->text_offset;
dso->adjust_symbols = runtime_ss->adjust_symbols || ref_reloc(kmap);
/*
next prev parent reply other threads:[~2016-03-24 7:39 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-26 9:31 [PATCH 00/46] perf tools: Fix and improvements (bpf and overwrite) Wang Nan
2016-02-26 9:31 ` [PATCH 01/46] perf tools: Record text offset in dso to calculate objdump address Wang Nan
2016-03-24 7:37 ` tip-bot for Wang Nan [this message]
2016-02-26 9:31 ` [PATCH 02/46] perf tools: Adjust symbol for shared objects Wang Nan
2016-02-26 9:31 ` [PATCH 03/46] perf config: Bring perf_default_config to the very beginning at main() Wang Nan
2016-02-27 9:44 ` [tip:perf/core] " tip-bot for Wang Nan
2016-02-26 9:31 ` [PATCH 04/46] perf trace: Improve error message when receive non-tracepoint events Wang Nan
2016-02-26 9:31 ` [PATCH 05/46] perf tools: Only set filter for tracepoints events Wang Nan
2016-02-27 9:45 ` [tip:perf/core] " tip-bot for Wang Nan
2016-02-26 9:31 ` [PATCH 06/46] perf trace: Call bpf__apply_obj_config in 'perf trace' Wang Nan
2016-02-27 9:45 ` [tip:perf/core] " tip-bot for Wang Nan
2016-02-26 9:31 ` [PATCH 07/46] perf trace: Print content of bpf-output event Wang Nan
2016-02-27 9:45 ` [tip:perf/core] " tip-bot for Wang Nan
2016-02-26 9:31 ` [PATCH 08/46] perf data: Support converting data from bpf_perf_event_output() Wang Nan
2016-03-05 8:15 ` [tip:perf/core] " tip-bot for Wang Nan
2016-02-26 9:31 ` [PATCH 09/46] perf data: Explicitly set byte order for integer types Wang Nan
2016-03-05 8:15 ` [tip:perf/core] " tip-bot for Wang Nan
2016-02-26 9:31 ` [PATCH 10/46] perf core: Introduce new ioctl options to pause and resume ring buffer Wang Nan
2016-02-29 15:39 ` Arnaldo Carvalho de Melo
2016-03-03 2:03 ` Wangnan (F)
2016-02-26 9:31 ` [PATCH 11/46] perf core: Set event's default overflow_handler Wang Nan
2016-02-26 9:32 ` [PATCH 12/46] perf core: Prepare writing into ring buffer from end Wang Nan
2016-02-26 9:32 ` [PATCH 13/46] perf core: Add backward attribute to perf event Wang Nan
2016-02-26 9:32 ` [PATCH 14/46] perf core: Reduce perf event output overhead by new overflow handler Wang Nan
2016-02-26 9:32 ` [PATCH 15/46] perf tools: Only validate is_pos for tracking evsels Wang Nan
2016-02-26 9:32 ` [PATCH 16/46] perf tools: Print write_backward value in perf_event_attr__fprintf Wang Nan
2016-02-26 9:32 ` [PATCH 17/46] perf tools: Make ordered_events reusable Wang Nan
2016-02-26 9:32 ` [PATCH 18/46] perf record: Use WARN_ONCE to replace 'if' condition Wang Nan
2016-03-05 8:15 ` [tip:perf/core] " tip-bot for Wang Nan
2016-02-26 9:32 ` [PATCH 19/46] perf record: Extract synthesize code to record__synthesize() Wang Nan
2016-03-05 8:16 ` [tip:perf/core] " tip-bot for Wang Nan
2016-02-26 9:32 ` [PATCH 20/46] perf tools: Add perf_data_file__switch() helper Wang Nan
2016-02-26 9:32 ` [PATCH 21/46] perf record: Turns auxtrace_snapshot_enable into 3 states Wang Nan
2016-02-26 9:32 ` [PATCH 22/46] perf record: Introduce record__finish_output() to finish a perf.data Wang Nan
2016-03-05 8:16 ` [tip:perf/core] " tip-bot for Wang Nan
2016-02-26 9:32 ` [PATCH 23/46] perf record: Add '--timestamp-filename' option to append timestamp to output filename Wang Nan
2016-02-26 9:32 ` [PATCH 24/46] perf record: Split output into multiple files via '--switch-output' Wang Nan
2016-02-26 9:32 ` [PATCH 25/46] perf record: Force enable --timestamp-filename when --switch-output is provided Wang Nan
2016-02-26 9:32 ` [PATCH 26/46] perf record: Disable buildid cache options by default in switch output mode Wang Nan
2016-02-26 9:32 ` [PATCH 27/46] perf record: Re-synthesize tracking events after output switching Wang Nan
2016-02-26 9:32 ` [PATCH 28/46] perf record: Generate tracking events for process forked by perf Wang Nan
2016-02-26 9:32 ` [PATCH 29/46] perf record: Ensure return non-zero rc when mmap fail Wang Nan
2016-03-05 8:17 ` [tip:perf/core] " tip-bot for Wang Nan
2016-02-26 9:32 ` [PATCH 30/46] perf record: Prevent reading invalid data in record__mmap_read Wang Nan
2016-02-26 9:32 ` [PATCH 31/46] perf tools: Add evlist channel helpers Wang Nan
2016-02-26 9:32 ` [PATCH 32/46] perf tools: Automatically add new channel according to evlist Wang Nan
2016-02-26 9:32 ` [PATCH 33/46] perf tools: Operate multiple channels Wang Nan
2016-02-26 9:32 ` [PATCH 34/46] perf tools: Squash overwrite setting into channel Wang Nan
2016-02-26 9:32 ` [PATCH 35/46] perf record: Don't read from and poll overwrite channel Wang Nan
2016-02-26 9:32 ` [PATCH 36/46] perf record: Don't poll on " Wang Nan
2016-02-26 9:32 ` [PATCH 37/46] perf tools: Detect avalibility of write_backward Wang Nan
2016-02-26 9:32 ` [PATCH 38/46] perf tools: Enable overwrite settings Wang Nan
2016-02-26 9:32 ` [PATCH 39/46] perf tools: Set write_backward attribut bit for overwrite events Wang Nan
2016-02-26 9:32 ` [PATCH 40/46] perf tools: Record fd into perf_mmap Wang Nan
2016-02-26 9:32 ` [PATCH 41/46] perf tools: Add API to pause a channel Wang Nan
2016-02-26 9:32 ` [PATCH 42/46] perf record: Toggle overwrite ring buffer for reading Wang Nan
2016-02-26 9:32 ` [PATCH 43/46] perf record: Rename variable to make code clear Wang Nan
2016-02-26 9:32 ` [PATCH 44/46] perf record: Read from backward ring buffer Wang Nan
2016-02-26 9:32 ` [PATCH 45/46] perf record: Allow generate tracking events at the end of output Wang Nan
2016-02-26 9:32 ` [PATCH 46/46] perf tools: Don't warn about out of order event if write_backward is used Wang Nan
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=tip-73cdf0c6ea9c597894924f3b91ad636389555c1b@git.kernel.org \
--to=tipbot@zytor.com \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=ast@kernel.org \
--cc=dev@codyps.com \
--cc=hekuang@huawei.com \
--cc=hpa@zytor.com \
--cc=jolsa@kernel.org \
--cc=kirr@nexedi.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--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
all inboxes | Powered by JetHome®