aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMasami Hiramatsu <masami.hiramatsu@linaro.org>2016-08-06 06:29:48 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2016-08-09 09:47:43 -0400
commit8e34189b347d76acf48ce05831176582201b664d (patch)
treeffdc09cda5483e9124820d3fa46999e649a43558 /tools
parent887fa86d6fd7a45cee2d0f9d5f75026786d61df2 (diff)
perf probe: Adjust map->reloc offset when finding kernel symbol from map
Adjust map->reloc offset for the unmapped address when finding alternative symbol address from map, because KASLR can relocate the kernel symbol address. The same adjustment has been done when finding appropriate kernel symbol address from map which was introduced by commit f90acac75713 ("perf probe: Find given address from offline dwarf") Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org> Signed-off-by: Masami Hiramatsu <masami.hiramatsu@linaro.org> Cc: Alexei Starovoitov <alexei.starovoitov@gmail.com> Cc: Wang Nan <wangnan0@huawei.com> Link: http://lkml.kernel.org/r/20160806192948.e366f3fbc4b194de600f8326@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/probe-event.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index 953dc1ab2ed7..d5ccb656fd81 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -385,7 +385,7 @@ static int find_alternative_probe_point(struct debuginfo *dinfo,
385 if (uprobes) 385 if (uprobes)
386 address = sym->start; 386 address = sym->start;
387 else 387 else
388 address = map->unmap_ip(map, sym->start); 388 address = map->unmap_ip(map, sym->start) - map->reloc;
389 break; 389 break;
390 } 390 }
391 if (!address) { 391 if (!address) {