Commit 5b7ba82a authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf symbols: Load kernel maps before using 



In order to use kernel maps to read object code, those maps must be
adjusted to map to the dso file offset.  Because lazy-initialization is
used, that is not done until symbols are loaded.  However the maps are
first used by thread__find_addr_map() before symbols are loaded.  So
this patch changes thread__find_addr() to "load" kernel maps before
using them.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1375875537-4509-3-git-send-email-adrian.hunter@intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent b55ae0a9

tools/perf/builtin-inject.c

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ static int perf_event__inject_buildid(struct perf_tool *tool, 
	}



	thread__find_addr_map(thread, machine, cpumode, MAP__FUNCTION,

			      event->ip.ip, &al);

			      event->ip.ip, &al, NULL);



	if (al.map != NULL) {

		if (!al.map->dso->hit) {

tools/perf/builtin-script.c

+2 −2
Original line number Diff line number Diff line
@@ -341,10 +341,10 @@ static void print_sample_addr(union perf_event *event, 
		return;



	thread__find_addr_map(thread, machine, cpumode, MAP__FUNCTION,

			      sample->addr, &al);

			      sample->addr, &al, NULL);

	if (!al.map)

		thread__find_addr_map(thread, machine, cpumode, MAP__VARIABLE,

				      sample->addr, &al);

				      sample->addr, &al, NULL);



	al.cpu = sample->cpu;

	al.sym = NULL;

tools/perf/tests/code-reading.c

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static int read_object_code(u64 addr, size_t len, u8 cpumode, 
	pr_debug("Reading object code for memory address: %#"PRIx64"\n", addr);



	thread__find_addr_map(thread, machine, cpumode, MAP__FUNCTION, addr,

			      &al);

			      &al, NULL);

	if (!al.map || !al.map->dso) {

		pr_debug("thread__find_addr_map failed\n");

		return -1;

tools/perf/util/build-id.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ int build_id__mark_dso_hit(struct perf_tool *tool __maybe_unused, 
	}



	thread__find_addr_map(thread, machine, cpumode, MAP__FUNCTION,

			      event->ip.ip, &al);

			      event->ip.ip, &al, NULL);



	if (al.map != NULL)

		al.map->dso->hit = 1;

tools/perf/util/event.c

+14 −4
Original line number Diff line number Diff line
@@ -592,9 +592,10 @@ int perf_event__process(struct perf_tool *tool __maybe_unused, 
void thread__find_addr_map(struct thread *self,

			   struct machine *machine, u8 cpumode,

			   enum map_type type, u64 addr,

			   struct addr_location *al)

			   struct addr_location *al, symbol_filter_t filter)

{

	struct map_groups *mg = &self->mg;

	bool load_map = false;



	al->thread = self;

	al->addr = addr;
@@ -609,11 +610,13 @@ void thread__find_addr_map(struct thread *self, 
	if (cpumode == PERF_RECORD_MISC_KERNEL && perf_host) {

		al->level = 'k';

		mg = &machine->kmaps;

		load_map = true;

	} else if (cpumode == PERF_RECORD_MISC_USER && perf_host) {

		al->level = '.';

	} else if (cpumode == PERF_RECORD_MISC_GUEST_KERNEL && perf_guest) {

		al->level = 'g';

		mg = &machine->kmaps;

		load_map = true;

	} else {

		/*

		 * 'u' means guest os user space.
@@ -654,16 +657,23 @@ try_again: 
			mg = &machine->kmaps;

			goto try_again;

		}

	} else

	} else {

		/*

		 * Kernel maps might be changed when loading symbols so loading

		 * must be done prior to using kernel maps.

		 */

		if (load_map)

			map__load(al->map, filter);

		al->addr = al->map->map_ip(al->map, al->addr);

	}

}



void thread__find_addr_location(struct thread *thread, struct machine *machine,

				u8 cpumode, enum map_type type, u64 addr,

				struct addr_location *al,

				symbol_filter_t filter)

{

	thread__find_addr_map(thread, machine, cpumode, type, addr, al);

	thread__find_addr_map(thread, machine, cpumode, type, addr, al, filter);

	if (al->map != NULL)

		al->sym = map__find_symbol(al->map, al->addr, filter);

	else
@@ -699,7 +709,7 @@ int perf_event__preprocess_sample(const union perf_event *event, 
		machine__create_kernel_maps(machine);



	thread__find_addr_map(thread, machine, cpumode, MAP__FUNCTION,

			      event->ip.ip, al);

			      event->ip.ip, al, filter);

	dump_printf(" ...... dso: %s\n",

		    al->map ? al->map->dso->long_name :

			al->level == 'H' ? "[hypervisor]" : "<not found>");

CRA Git | Maintained and supported by SUSTech CRA and CCSE