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

Commit fd930ff9 authored by Franck Bui-Huu's avatar Franck Bui-Huu Committed by Arnaldo Carvalho de Melo
Browse files

perf probe: Fix use of kernel image path given by 'k' option 



Users were not being able to have the explicitely specified vmlinux
pathname used, instead a search on the vmlinux path was always being
made.

Reported-by: default avatarFrancis Moreau <francis.moro@gmail.com>
Acked-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: 2nddept-manager@sdl.hitachi.co.jp
Cc: Francis Moreau <francis.moro@gmail.com>
Cc: Franck Bui-Huu <vagabon.xyz@gmail.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
LPU-Reference: <m3hbelydz8.fsf_-_@gmail.com>
Signed-off-by: default avatarFranck Bui-Huu <fbuihuu@gmail.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent d949750f

tools/perf/builtin-probe.c

+5 −0
Original line number Diff line number Diff line
@@ -249,6 +249,11 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used) 
	     !params.show_lines))

		usage_with_options(probe_usage, options);



	/*

	 * Only consider the user's kernel image path if given.

	 */

	symbol_conf.try_vmlinux_path = (symbol_conf.vmlinux_name == NULL);



	if (params.list_events) {

		if (params.mod_events) {

			pr_err("  Error: Don't use --list with --add/--del.\n");

tools/perf/util/probe-event.c

+12 −3
Original line number Diff line number Diff line
@@ -114,6 +114,8 @@ static struct symbol *__find_kernel_function_by_name(const char *name, 
const char *kernel_get_module_path(const char *module)

{

	struct dso *dso;

	struct map *map;

	const char *vmlinux_name;



	if (module) {

		list_for_each_entry(dso, &machine.kernel_dsos, node) {
@@ -123,10 +125,17 @@ const char *kernel_get_module_path(const char *module) 
		}

		pr_debug("Failed to find module %s.\n", module);

		return NULL;

	}



	map = machine.vmlinux_maps[MAP__FUNCTION];

	dso = map->dso;



	vmlinux_name = symbol_conf.vmlinux_name;

	if (vmlinux_name) {

		if (dso__load_vmlinux(dso, map, vmlinux_name, NULL) <= 0)

			return NULL;

	} else {

		dso = machine.vmlinux_maps[MAP__FUNCTION]->dso;

		if (dso__load_vmlinux_path(dso,

			 machine.vmlinux_maps[MAP__FUNCTION], NULL) < 0) {

		if (dso__load_vmlinux_path(dso, map, NULL) < 0) {

			pr_debug("Failed to load kernel map.\n");

			return NULL;

		}

tools/perf/util/symbol.c

+2 −2
Original line number Diff line number Diff line
@@ -1780,7 +1780,7 @@ static int machine__create_modules(struct machine *self) 
	return -1;

}



static int dso__load_vmlinux(struct dso *self, struct map *map,

int dso__load_vmlinux(struct dso *self, struct map *map,

		      const char *vmlinux, symbol_filter_t filter)

{

	int err = -1, fd;

tools/perf/util/symbol.h

+2 −0
Original line number Diff line number Diff line
@@ -166,6 +166,8 @@ void dso__sort_by_name(struct dso *self, enum map_type type); 
struct dso *__dsos__findnew(struct list_head *head, const char *name);



int dso__load(struct dso *self, struct map *map, symbol_filter_t filter);

int dso__load_vmlinux(struct dso *self, struct map *map,

		      const char *vmlinux, symbol_filter_t filter);

int dso__load_vmlinux_path(struct dso *self, struct map *map,

			   symbol_filter_t filter);

int dso__load_kallsyms(struct dso *self, const char *filename, struct map *map,