perf symbols: Load map before using map->map_ip()

mhiramathitachi · acmel · commit 4afc81cd1caa · 2014-01-23T15:48:12.000-03:00
In map_groups__find_symbol() map->map_ip is used without ensuring the map is loaded. Then the address passed to map->map_ip isn't mapped at the first time. E.g. below code always fails to get a symbol at the first call; addr = /* Somewhere in the kernel text */ symbol_conf.try_vmlinux_path = true; symbol__init(); host_machine = machine__new_host(); sym = machine__find_kernel_function(host_machine, addr, NULL, NULL); /* Note that machine__find_kernel_function calls map_groups__find_symbol */ This ensures it by calling map__load before using it in map_groups__find_symbol(). Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> Cc: "David A. Long" <dave.long@linaro.org> Cc: David Ahern <dsahern@gmail.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com> Cc: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org> Cc: yrl.pp-manager.tt@hitachi.com Link: http://lkml.kernel.org/r/20140123022950.7206.17357.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
@@ -386,7 +386,8 @@ struct symbol *map_groups__find_symbol(struct map_groups *mg,
 {
 	struct map *map = map_groups__find(mg, type, addr);
 
-	if (map != NULL) {
+	/* Ensure map is loaded before using map->map_ip */
+	if (map != NULL && map__load(map, filter) >= 0) {
 		if (mapp != NULL)
 			*mapp = map;
 		return map__find_symbol(map, map->map_ip(map, addr), filter);

Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,8 @@ struct symbol map_groups__find_symbol(struct map_groups mg,`
`386`	`386`	`{`
`387`	`387`	`struct map *map = map_groups__find(mg, type, addr);`
`388`	`388`
`389`		`- if (map != NULL) {`
	`389`	`+ /* Ensure map is loaded before using map->map_ip */`
	`390`	`+ if (map != NULL && map__load(map, filter) >= 0) {`
`390`	`391`	`if (mapp != NULL)`
`391`	`392`	`*mapp = map;`
`392`	`393`	`return map__find_symbol(map, map->map_ip(map, addr), filter);`