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

Commit 0bc8d205 authored by Akihiro Nagai's avatar Akihiro Nagai Committed by Arnaldo Carvalho de Melo
Browse files

perf script: Add option resolving vmlinux path 

Add the option get the path of [kernel.kallsyms].
Specify '--show-kernel-path' option to use this function.
This patch enables other applications to use this output easily.

Without --show-kernel-path  option

ffffffff81467612 irq_return ([kernel.kallsyms])
ffffffff81467612 irq_return ([kernel.kallsyms])
    7f24fc02a6b3 _start (/lib64/ld-2.14.so)
[snip]

With --show-kernel-path option

ffffffff81467612 irq_return (/lib/modules/3.2.0+/build/vmlinux)
ffffffff81467612 irq_return (/lib/modules/3.2.0+/build/vmlinux)
    7f24fc02a6b3 _start (/lib64/ld-2.14.so)
[snip]

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20120130044320.2384.73322.stgit@linux3


Signed-off-by: default avatarAkihiro Nagai <akihiro.nagai.hw@hitachi.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent a978f2ab

tools/perf/Documentation/perf-script.txt

+3 −0
Original line number Diff line number Diff line
@@ -200,6 +200,9 @@ OPTIONS 
	It currently includes: cpu and numa topology of the host system.

	It can only be used with the perf script report mode.



--show-kernel-path::

	Try to resolve the path of [kernel.kallsyms]



SEE ALSO

--------

linkperf:perf-record[1], linkperf:perf-script-perl[1],

tools/perf/builtin-script.c

+3 −0
Original line number Diff line number Diff line
@@ -1155,6 +1155,9 @@ static const struct option options[] = { 
		   "only display events for these comms"),

	OPT_BOOLEAN('I', "show-info", &show_full_info,

		    "display extended information from perf.data file"),

	OPT_BOOLEAN('\0', "show-kernel-path", &symbol_conf.show_kernel_path,

		    "Show the path of [kernel.kallsyms]"),



	OPT_END()

};

tools/perf/util/map.c

+6 −3
Original line number Diff line number Diff line
@@ -216,9 +216,12 @@ size_t map__fprintf_dsoname(struct map *map, FILE *fp) 
{

	const char *dsoname;



	if (map && map->dso && map->dso->name)

	if (map && map->dso && (map->dso->name || map->dso->long_name)) {

		if (symbol_conf.show_kernel_path && map->dso->long_name)

			dsoname = map->dso->long_name;

		else if (map->dso->name)

			dsoname = map->dso->name;

	else

	} else

		dsoname = "[unknown]";



	return fprintf(fp, "%s", dsoname);

tools/perf/util/symbol.h

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ struct symbol_conf { 
	unsigned short	priv_size;

	unsigned short	nr_events;

	bool		try_vmlinux_path,

			show_kernel_path,

			use_modules,

			sort_by_name,

			show_nr_samples,