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

Commit fc54db51 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

perf report: Deal with maps 



In order to deal with [vdso] maps generalize the ip->symbol path
a bit and allow to override some bits with custom functions.

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <new-submission>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 089dd79d

Documentation/perf_counter/builtin-report.c

+35 −2
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ typedef union event_union { 


static LIST_HEAD(dsos);

static struct dso *kernel_dso;

static struct dso *vdso;



static void dsos__add(struct dso *dso)

{
@@ -136,6 +137,11 @@ static void dsos__fprintf(FILE *fp) 
		dso__fprintf(pos, fp);

}



static struct symbol *vdso__find_symbol(struct dso *dso, uint64_t ip)

{

	return dso__find_symbol(kernel_dso, ip);

}



static int load_kernel(void)

{

	int err;
@@ -151,6 +157,14 @@ static int load_kernel(void) 
	} else

		dsos__add(kernel_dso);



	vdso = dso__new("[vdso]", 0);

	if (!vdso)

		return -1;



	vdso->find_symbol = vdso__find_symbol;



	dsos__add(vdso);



	return err;

}
@@ -173,9 +187,20 @@ struct map { 
	uint64_t	 start;

	uint64_t	 end;

	uint64_t	 pgoff;

	uint64_t	 (*map_ip)(struct map *, uint64_t);

	struct dso	 *dso;

};



static uint64_t map__map_ip(struct map *map, uint64_t ip)

{

	return ip - map->start + map->pgoff;

}



static uint64_t vdso__map_ip(struct map *map, uint64_t ip)

{

	return ip;

}



static struct map *map__new(struct mmap_event *event)

{

	struct map *self = malloc(sizeof(*self));
@@ -201,6 +226,11 @@ static struct map *map__new(struct mmap_event *event) 
		self->dso = dsos__findnew(filename);

		if (self->dso == NULL)

			goto out_delete;



		if (self->dso == vdso)

			self->map_ip = vdso__map_ip;

		else

			self->map_ip = map__map_ip;

	}

	return self;

out_delete:
@@ -917,8 +947,8 @@ process_overflow_event(event_t *event, unsigned long offset, unsigned long head) 


		map = thread__find_map(thread, ip);

		if (map != NULL) {

			ip = map->map_ip(map, ip);

			dso = map->dso;

			ip -= map->start + map->pgoff;

		} else {

			/*

			 * If this is outside of all known maps,
@@ -938,7 +968,10 @@ process_overflow_event(event_t *event, unsigned long offset, unsigned long head) 
	}



	if (show & show_mask) {

		struct symbol *sym = dso__find_symbol(dso, ip);

		struct symbol *sym = NULL;



		if (dso)

			sym = dso->find_symbol(dso, ip);



		if (hist_entry__add(thread, map, dso, sym, ip, level)) {

			fprintf(stderr,

Documentation/perf_counter/util/symbol.c

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ struct dso *dso__new(const char *name, unsigned int sym_priv_size) 
		strcpy(self->name, name);

		self->syms = RB_ROOT;

		self->sym_priv_size = sym_priv_size;

		self->find_symbol = dso__find_symbol;

	}



	return self;

Documentation/perf_counter/util/symbol.h

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ struct dso { 
	struct list_head node;

	struct rb_root	 syms;

	unsigned int	 sym_priv_size;

	struct symbol    *(*find_symbol)(struct dso *, uint64_t ip);

	char		 name[0];

};