lkml.org 
[lkml]   [2009]   [Dec]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 3/3] perf tools: adjust symbol address
Using relocation offset adjust symbol address if we get
kernel symbol name form elf file

Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
---
tools/perf/builtin-record.c | 3 +++
tools/perf/util/session.c | 6 ++++++
tools/perf/util/symbol.c | 13 +++++++++++++
tools/perf/util/symbol.h | 2 ++
4 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index d13601d..4d86969 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -436,6 +436,9 @@ static int __cmd_record(int argc, const char **argv)
signal(SIGCHLD, sig_handler);
signal(SIGINT, sig_handler);

+ /* Always get relocation offset */
+ inject_events |= PERF_INJECT_RELOCATE_OFFSET;
+
if (forks && (pipe(child_ready_pipe) < 0 || pipe(go_pipe) < 0)) {
perror("failed to create pipes");
exit(-1);
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 74f43af..92d4811 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -243,6 +243,12 @@ static int perf_session__process_event(struct perf_session *self,
case PERF_RECORD_UNTHROTTLE:
return ops->unthrottle(event, self);
case PERF_RECORD_INJECT:
+ if (event->inject.inject_event_id ==
+ PERF_INJECT_RELOCATE_OFFSET) {
+ update_relocate_offset((s32)event->inject.value);
+ return 0;
+ }
+
return ops->inject(event, self);
default:
self->unknown_events++;
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 79ca6a0..5b58d34 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -19,6 +19,18 @@
#define NT_GNU_BUILD_ID 3
#endif

+static s32 relocate_offset;
+void update_relocate_offset(s32 offset)
+{
+ relocate_offset = offset;
+}
+
+static inline void update_kernel_address(GElf_Sym *sym, bool kernel)
+{
+ if (kernel)
+ sym->st_value += relocate_offset;
+}
+
enum dso_origin {
DSO__ORIG_KERNEL = 0,
DSO__ORIG_JAVA_JIT,
@@ -1012,6 +1024,7 @@ static int dso__load_sym(struct dso *self, struct map *map,
if (demangled != NULL)
elf_name = demangled;
new_symbol:
+ update_kernel_address(&sym, kernel);
f = symbol__new(sym.st_value, sym.st_size, elf_name);
free(demangled);
if (!f)
diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index f27e158..129b4ec 100644
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -10,6 +10,8 @@

#define DEBUG_CACHE_DIR ".debug"

+void update_relocate_offset(s32 offset);
+
#ifdef HAVE_CPLUS_DEMANGLE
extern char *cplus_demangle(const char *, int);

--
1.6.1.2



\
 
 \ /
  Last update: 2009-12-30 04:23    [W:0.085 / U:0.048 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site