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

Commit 5ad90e4e authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf symbols: Add the build id cache to the vmlinux path 



So that if the kernel DSO has a build id because record inserted it in
the perf.data build id table in the header, or a BUILD_ID event was
inserted in the stream, we first look at the build id cache
($HOME/.debug/).

If we find it there, try to use it, allowing offline annotation in
addition to 'perf report'.

Reported-by: default avatarStephane Eranian <eranian@google.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 62e3436b

tools/perf/builtin-top.c

+1 −1
Original line number Diff line number Diff line
@@ -1060,7 +1060,7 @@ static void event__process_sample(const event_t *self, 
			pr_err("Can't annotate %s", sym->name);

			if (sym_filter_entry->map->dso->origin == DSO__ORIG_KERNEL) {

				pr_err(": No vmlinux file was found in the path:\n");

				vmlinux_path__fprintf(stderr);

				machine__fprintf_vmlinux_path(machine, stderr);

			} else

				pr_err(".\n");

			exit(1);

tools/perf/util/symbol.c

+23 −4
Original line number Diff line number Diff line
@@ -1695,9 +1695,20 @@ int dso__load_vmlinux_path(struct dso *self, struct map *map, 
			   symbol_filter_t filter)

{

	int i, err = 0;

	char *filename;



	pr_debug("Looking at the vmlinux_path (%d entries long)\n",

		 vmlinux_path__nr_entries);

		 vmlinux_path__nr_entries + 1);



	filename = dso__build_id_filename(self, NULL, 0);

	if (filename != NULL) {

		err = dso__load_vmlinux(self, map, filename, filter);

		if (err > 0) {

			dso__set_long_name(self, filename);

			goto out;

		}

		free(filename);

	}



	for (i = 0; i < vmlinux_path__nr_entries; ++i) {

		err = dso__load_vmlinux(self, map, vmlinux_path[i], filter);
@@ -1706,7 +1717,7 @@ int dso__load_vmlinux_path(struct dso *self, struct map *map, 
			break;

		}

	}



out:

	return err;

}
@@ -2102,13 +2113,21 @@ static int vmlinux_path__init(void) 
	return -1;

}



size_t vmlinux_path__fprintf(FILE *fp)

size_t machine__fprintf_vmlinux_path(struct machine *self, FILE *fp)

{

	int i;

	size_t printed = 0;

	struct dso *kdso = self->vmlinux_maps[MAP__FUNCTION]->dso;



	if (kdso->has_build_id) {

		char filename[PATH_MAX];

		if (dso__build_id_filename(kdso, filename, sizeof(filename)))

			printed += fprintf(fp, "[0] %s\n", filename);

	}



	for (i = 0; i < vmlinux_path__nr_entries; ++i)

		printed += fprintf(fp, "[%d] %s\n", i, vmlinux_path[i]);

		printed += fprintf(fp, "[%d] %s\n",

				   i + kdso->has_build_id, vmlinux_path[i]);



	return printed;

}

tools/perf/util/symbol.h

+1 −1
Original line number Diff line number Diff line
@@ -216,6 +216,6 @@ int machines__create_guest_kernel_maps(struct rb_root *self); 
int symbol__init(void);

bool symbol_type__is_a(char symbol_type, enum map_type map_type);



size_t vmlinux_path__fprintf(FILE *fp);

size_t machine__fprintf_vmlinux_path(struct machine *self, FILE *fp);



#endif /* __PERF_SYMBOL */