diff options
| -rw-r--r-- | tools/perf/Documentation/perf-buildid-list.txt | 4 | ||||
| -rw-r--r-- | tools/perf/builtin-buildid-list.c | 39 | ||||
| -rw-r--r-- | tools/perf/util/machine.c | 15 | ||||
| -rw-r--r-- | tools/perf/util/machine.h | 5 |
4 files changed, 62 insertions, 1 deletions
diff --git a/tools/perf/Documentation/perf-buildid-list.txt b/tools/perf/Documentation/perf-buildid-list.txt index 25c52efcc7f0..e1e8fdbe06b9 100644 --- a/tools/perf/Documentation/perf-buildid-list.txt +++ b/tools/perf/Documentation/perf-buildid-list.txt @@ -33,6 +33,10 @@ OPTIONS -k:: --kernel:: Show running kernel build id. +-m:: +--kernel-maps:: + Show buildid, start/end text address, and path of running kernel and + its modules. -v:: --verbose:: Be more verbose. diff --git a/tools/perf/builtin-buildid-list.c b/tools/perf/builtin-buildid-list.c index cebadd632234..00bfe89f0b5d 100644 --- a/tools/perf/builtin-buildid-list.c +++ b/tools/perf/builtin-buildid-list.c @@ -12,14 +12,44 @@ #include "util/build-id.h" #include "util/debug.h" #include "util/dso.h" +#include "util/map.h" #include <subcmd/pager.h> #include <subcmd/parse-options.h> #include "util/session.h" #include "util/symbol.h" #include "util/data.h" #include <errno.h> +#include <inttypes.h> #include <linux/err.h> +static int buildid__map_cb(struct map *map, void *arg __maybe_unused) +{ + const struct dso *dso = map->dso; + char bid_buf[SBUILD_ID_SIZE]; + + memset(bid_buf, 0, sizeof(bid_buf)); + if (dso->has_build_id) + build_id__sprintf(&dso->bid, bid_buf); + printf("%s %16" PRIx64 " %16" PRIx64, bid_buf, map->start, map->end); + if (dso->long_name != NULL) { + printf(" %s", dso->long_name); + } else if (dso->short_name != NULL) { + printf(" %s", dso->short_name); + } + printf("\n"); + + return 0; +} + +static void buildid__show_kernel_maps(void) +{ + struct machine *machine; + + machine = machine__new_host(); + machine__for_each_kernel_map(machine, buildid__map_cb, NULL); + machine__delete(machine); +} + static int sysfs__fprintf_build_id(FILE *fp) { char sbuild_id[SBUILD_ID_SIZE]; @@ -99,6 +129,7 @@ out: int cmd_buildid_list(int argc, const char **argv) { bool show_kernel = false; + bool show_kernel_maps = false; bool with_hits = false; bool force = false; const struct option options[] = { @@ -106,6 +137,8 @@ int cmd_buildid_list(int argc, const char **argv) OPT_STRING('i', "input", &input_name, "file", "input file name"), OPT_BOOLEAN('f', "force", &force, "don't complain, do it"), OPT_BOOLEAN('k', "kernel", &show_kernel, "Show current kernel build id"), + OPT_BOOLEAN('m', "kernel-maps", &show_kernel_maps, + "Show build id of current kernel + modules"), OPT_INCR('v', "verbose", &verbose, "be more verbose"), OPT_END() }; @@ -117,8 +150,12 @@ int cmd_buildid_list(int argc, const char **argv) argc = parse_options(argc, argv, options, buildid_list_usage, 0); setup_pager(); - if (show_kernel) + if (show_kernel) { return !(sysfs__fprintf_build_id(stdout) > 0); + } else if (show_kernel_maps) { + buildid__show_kernel_maps(); + return 0; + } return perf_session__list_build_ids(force, with_hits); } diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 009061852808..16d225149b93 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -3327,3 +3327,18 @@ int machine__for_each_dso(struct machine *machine, machine__dso_t fn, void *priv } return err; } + +int machine__for_each_kernel_map(struct machine *machine, machine__map_t fn, void *priv) +{ + struct maps *maps = machine__kernel_maps(machine); + struct map *map; + int err = 0; + + for (map = maps__first(maps); map != NULL; map = map__next(map)) { + err = fn(map, priv); + if (err != 0) { + break; + } + } + return err; +} diff --git a/tools/perf/util/machine.h b/tools/perf/util/machine.h index 5d7daf7cb7bc..e1476343cbb2 100644 --- a/tools/perf/util/machine.h +++ b/tools/perf/util/machine.h @@ -262,6 +262,11 @@ typedef int (*machine__dso_t)(struct dso *dso, struct machine *machine, void *pr int machine__for_each_dso(struct machine *machine, machine__dso_t fn, void *priv); + +typedef int (*machine__map_t)(struct map *map, void *priv); +int machine__for_each_kernel_map(struct machine *machine, machine__map_t fn, + void *priv); + int machine__for_each_thread(struct machine *machine, int (*fn)(struct thread *thread, void *p), void *priv); |