Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5512cf24 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf machine: Set up ref_reloc_sym in machine__create_kernel_maps() 



The ref_reloc_sym is always needed for the kernel map in order to check
for relocation.  Consequently set it up when the kernel map is created.
Otherwise it was only being set up by 'perf record'.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Tested-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
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 <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1391004884-10334-5-git-send-email-adrian.hunter@intel.com


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

tools/perf/util/machine.c

+23 −0
Original line number Original line Diff line number Diff line
@@ -832,9 +832,25 @@ static int machine__create_modules(struct machine *machine) 
	return 0;

	return 0;

}

}





const char *ref_reloc_sym_names[] = {"_text", "_stext", NULL};



int machine__create_kernel_maps(struct machine *machine)

int machine__create_kernel_maps(struct machine *machine)

{

{

	struct dso *kernel = machine__get_kernel(machine);

	struct dso *kernel = machine__get_kernel(machine);

	char filename[PATH_MAX];

	const char *name;

	u64 addr = 0;

	int i;



	machine__get_kallsyms_filename(machine, filename, PATH_MAX);



	for (i = 0; (name = ref_reloc_sym_names[i]) != NULL; i++) {

		addr = kallsyms__get_function_start(filename, name);

		if (addr)

			break;

	}

	if (!addr)

		return -1;





	if (kernel == NULL ||

	if (kernel == NULL ||

	    __machine__create_kernel_maps(machine, kernel) < 0)

	    __machine__create_kernel_maps(machine, kernel) < 0)
@@ -853,6 +869,13 @@ int machine__create_kernel_maps(struct machine *machine) 
	 * Now that we have all the maps created, just set the ->end of them:

	 * Now that we have all the maps created, just set the ->end of them:

	 */

	 */

	map_groups__fixup_end(&machine->kmaps);

	map_groups__fixup_end(&machine->kmaps);



	if (maps__set_kallsyms_ref_reloc_sym(machine->vmlinux_maps, name,

					     addr)) {

		machine__destroy_kernel_maps(machine);

		return -1;

	}



	return 0;

	return 0;

}

}

tools/perf/util/machine.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,8 @@ union perf_event; 
#define	HOST_KERNEL_ID			(-1)

#define	HOST_KERNEL_ID			(-1)

#define	DEFAULT_GUEST_KERNEL_ID		(0)

#define	DEFAULT_GUEST_KERNEL_ID		(0)





extern const char *ref_reloc_sym_names[];



struct machine {

struct machine {

	struct rb_node	  rb_node;

	struct rb_node	  rb_node;

	pid_t		  pid;

	pid_t		  pid;