diff options
-rw-r--r-- | tools/perf/Documentation/perf-script.txt | 3 | ||||
-rw-r--r-- | tools/perf/builtin-script.c | 3 | ||||
-rw-r--r-- | tools/perf/util/map.c | 9 | ||||
-rw-r--r-- | tools/perf/util/symbol.h | 1 |
4 files changed, 13 insertions, 3 deletions
diff --git a/tools/perf/Documentation/perf-script.txt b/tools/perf/Documentation/perf-script.txt index 228c7bb0f0dd..e9cbfcddfa3f 100644 --- a/tools/perf/Documentation/perf-script.txt +++ b/tools/perf/Documentation/perf-script.txt | |||
@@ -200,6 +200,9 @@ OPTIONS | |||
200 | It currently includes: cpu and numa topology of the host system. | 200 | It currently includes: cpu and numa topology of the host system. |
201 | It can only be used with the perf script report mode. | 201 | It can only be used with the perf script report mode. |
202 | 202 | ||
203 | --show-kernel-path:: | ||
204 | Try to resolve the path of [kernel.kallsyms] | ||
205 | |||
203 | SEE ALSO | 206 | SEE ALSO |
204 | -------- | 207 | -------- |
205 | linkperf:perf-record[1], linkperf:perf-script-perl[1], | 208 | linkperf:perf-record[1], linkperf:perf-script-perl[1], |
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 752d4018d06d..d4ce733b9eba 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c | |||
@@ -1155,6 +1155,9 @@ static const struct option options[] = { | |||
1155 | "only display events for these comms"), | 1155 | "only display events for these comms"), |
1156 | OPT_BOOLEAN('I', "show-info", &show_full_info, | 1156 | OPT_BOOLEAN('I', "show-info", &show_full_info, |
1157 | "display extended information from perf.data file"), | 1157 | "display extended information from perf.data file"), |
1158 | OPT_BOOLEAN('\0', "show-kernel-path", &symbol_conf.show_kernel_path, | ||
1159 | "Show the path of [kernel.kallsyms]"), | ||
1160 | |||
1158 | OPT_END() | 1161 | OPT_END() |
1159 | }; | 1162 | }; |
1160 | 1163 | ||
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index 11079607105b..dea6d1c1a954 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c | |||
@@ -216,9 +216,12 @@ size_t map__fprintf_dsoname(struct map *map, FILE *fp) | |||
216 | { | 216 | { |
217 | const char *dsoname; | 217 | const char *dsoname; |
218 | 218 | ||
219 | if (map && map->dso && map->dso->name) | 219 | if (map && map->dso && (map->dso->name || map->dso->long_name)) { |
220 | dsoname = map->dso->name; | 220 | if (symbol_conf.show_kernel_path && map->dso->long_name) |
221 | else | 221 | dsoname = map->dso->long_name; |
222 | else if (map->dso->name) | ||
223 | dsoname = map->dso->name; | ||
224 | } else | ||
222 | dsoname = "[unknown]"; | 225 | dsoname = "[unknown]"; |
223 | 226 | ||
224 | return fprintf(fp, "%s", dsoname); | 227 | return fprintf(fp, "%s", dsoname); |
diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h index ba909c9970e2..2a683d4fc918 100644 --- a/tools/perf/util/symbol.h +++ b/tools/perf/util/symbol.h | |||
@@ -70,6 +70,7 @@ struct symbol_conf { | |||
70 | unsigned short priv_size; | 70 | unsigned short priv_size; |
71 | unsigned short nr_events; | 71 | unsigned short nr_events; |
72 | bool try_vmlinux_path, | 72 | bool try_vmlinux_path, |
73 | show_kernel_path, | ||
73 | use_modules, | 74 | use_modules, |
74 | sort_by_name, | 75 | sort_by_name, |
75 | show_nr_samples, | 76 | show_nr_samples, |