Add helpers to look up a DSO in struct dsos by its build ID and to find (or lazily populate from machine->dsos or the build-id cache) a struct map in struct maps matching a given build ID. This prepares for resolving PERF_SAMPLE_BUILD_ID_OFFSET and PERF_SAMPLE_CALLCHAIN_BUILD_ID_OFFSET samples without virtual-address MMAP records. Signed-off-by: Ian Rogers --- tools/perf/util/dsos.c | 68 +++++++++++++++++++++++++++++++++++++++ tools/perf/util/dsos.h | 6 ++++ tools/perf/util/maps.c | 73 ++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/maps.h | 2 ++ 4 files changed, 149 insertions(+) diff --git a/tools/perf/util/dsos.c b/tools/perf/util/dsos.c index e927e707abac..60178a093f4e 100644 --- a/tools/perf/util/dsos.c +++ b/tools/perf/util/dsos.c @@ -294,6 +294,40 @@ struct dso *dsos__find(struct dsos *dsos, const char *name, bool cmp_short) return res; } +struct dsos__find_build_id_cb_args { + const struct build_id *bid; + enum dso_space_type dso_space; + struct dso *res; +}; + +static int dsos__find_build_id_cb(struct dso *dso, void *data) +{ + struct dsos__find_build_id_cb_args *args = data; + + if (dso__kernel(dso) == args->dso_space && + dso__has_build_id(dso) && dso__build_id_equal(dso, args->bid)) { + args->res = dso__get(dso); + return 1; + } + return 0; +} + +struct dso *dsos__find_by_build_id(struct dsos *dsos, const struct build_id *bid, + int dso_space) +{ + struct dsos__find_build_id_cb_args args = { + .bid = bid, + .dso_space = dso_space, + .res = NULL, + }; + + if (!build_id__is_defined(bid)) + return NULL; + + dsos__for_each_dso(dsos, dsos__find_build_id_cb, &args); + return args.res; +} + static void dso__set_basename(struct dso *dso) { bool allocated = false; @@ -349,6 +383,40 @@ struct dso *dsos__findnew_id(struct dsos *dsos, const char *name, const struct d return dso; } +struct dso *dsos__findnew_id_space(struct dsos *dsos, struct machine *machine, + const char *name, const struct dso_id *id, + int dso_space) +{ + enum dso_space_type space = dso_space; + struct dso *dso; + + down_write(&dsos->lock); + dso = __dsos__find_id(dsos, name, id, false, /*write_locked=*/true); + if (dso) { + if (dso__kernel(dso) == space) + __dso__improve_id(dso, id); + else + dso__zput(dso); + } else { + dso = dso__new_id(name, id); + if (dso) { + dso__set_basename(dso); + if (space != DSO_SPACE__USER) { + struct kmod_path m = { .name = NULL }; + + if (!kmod_path__parse_name(&m, name) && m.kmod) + dso__set_module_info(dso, &m, machine); + dso__set_kernel(dso, space); + free(m.name); + } + if (__dsos__add(dsos, dso)) + dso__zput(dso); + } + } + up_write(&dsos->lock); + return dso; +} + struct dsos__fprintf_buildid_cb_args { FILE *fp; bool (*skip)(struct dso *dso, int parm); diff --git a/tools/perf/util/dsos.h b/tools/perf/util/dsos.h index a26774950866..6343bf96b45a 100644 --- a/tools/perf/util/dsos.h +++ b/tools/perf/util/dsos.h @@ -8,6 +8,7 @@ #include #include "rwsem.h" +struct build_id; struct dso; struct dso_id; struct kmod_path; @@ -31,8 +32,13 @@ void dsos__exit(struct dsos *dsos); int __dsos__add(struct dsos *dsos, struct dso *dso); int dsos__add(struct dsos *dsos, struct dso *dso); struct dso *dsos__find(struct dsos *dsos, const char *name, bool cmp_short); +struct dso *dsos__find_by_build_id(struct dsos *dsos, const struct build_id *bid, + int dso_space); struct dso *dsos__findnew_id(struct dsos *dsos, const char *name, const struct dso_id *id); +struct dso *dsos__findnew_id_space(struct dsos *dsos, struct machine *machine, + const char *name, const struct dso_id *id, + int dso_space); bool dsos__read_build_ids(struct dsos *dsos, bool with_hits); diff --git a/tools/perf/util/maps.c b/tools/perf/util/maps.c index 675fe0223faa..3ce6feb23821 100644 --- a/tools/perf/util/maps.c +++ b/tools/perf/util/maps.c @@ -2,8 +2,11 @@ #include #include #include +#include "build-id.h" #include "debug.h" #include "dso.h" +#include "dsos.h" +#include "machine.h" #include "map.h" #include "maps.h" #include "rwsem.h" @@ -1252,6 +1255,76 @@ static int map__strcmp_name(const void *name, const void *b) return strcmp(name, dso__short_name(dso)); } +struct map *maps__find_by_build_id(struct maps *maps, struct build_id *bid) +{ + struct machine *machine = maps__machine(maps); + bool is_kmaps = RC_CHK_EQUAL(maps, machine__kernel_maps(machine)); + enum dso_space_type dso_space = is_kmaps + ? (machine__is_host(machine) ? DSO_SPACE__KERNEL : DSO_SPACE__KERNEL_GUEST) + : DSO_SPACE__USER; + struct map *result = NULL; + + if (!build_id__is_defined(bid)) + return NULL; + + down_read(maps__lock(maps)); + for (unsigned int i = 0, n = maps__nr_maps(maps); i < n; i++) { + struct map *map = maps__maps_by_address(maps)[i]; + struct dso *dso = map__dso(map); + + if (dso && dso__kernel(dso) == dso_space && + dso__has_build_id(dso) && + dso__build_id_equal(dso, bid)) { + result = map__get(map); + break; + } + } + up_read(maps__lock(maps)); + + if (!result) { + struct dso *dso = dsos__find_by_build_id(&machine->dsos, bid, dso_space); + + if (!dso) { + char sbuild_id[SBUILD_ID_SIZE]; + char *origname; + + build_id__snprintf(bid, sbuild_id, sizeof(sbuild_id)); + origname = build_id_cache__origname(sbuild_id); + if (origname) { + struct dso_id id = { .build_id = *bid }; + + dso = dsos__findnew_id_space(&machine->dsos, machine, + origname, &id, dso_space); + free(origname); + } + } + if (dso) { + down_write(maps__lock(maps)); + for (unsigned int i = 0, n = maps__nr_maps(maps); i < n; i++) { + struct map *map = maps__maps_by_address(maps)[i]; + struct dso *map_dso = map__dso(map); + + if (map_dso && dso__kernel(map_dso) == dso_space && + dso__has_build_id(map_dso) && + dso__build_id_equal(map_dso, bid)) { + result = map__get(map); + break; + } + } + if (!result) { + result = map__new2(0, dso); + if (result && __maps__insert(maps, result)) { + map__put(result); + result = NULL; + } + } + up_write(maps__lock(maps)); + dso__put(dso); + } + } + return result; +} + struct map *maps__find_by_name(struct maps *maps, const char *name) { struct map *result = NULL; diff --git a/tools/perf/util/maps.h b/tools/perf/util/maps.h index 4ec9b7453a3b..6f1791457068 100644 --- a/tools/perf/util/maps.h +++ b/tools/perf/util/maps.h @@ -11,6 +11,7 @@ struct ref_reloc_sym; struct machine; struct map; struct maps; +struct build_id; #define KMAP_NAME_LEN 256 @@ -76,6 +77,7 @@ int maps__find_ams(struct maps *maps, struct addr_map_symbol *ams); int maps__fixup_overlap_and_insert(struct maps *maps, struct map *new); struct map *maps__find_by_name(struct maps *maps, const char *name); +struct map *maps__find_by_build_id(struct maps *maps, struct build_id *bid); struct map *maps__find_next_entry(struct maps *maps, struct map *map); -- 2.56.1.703.gf848ed807c-goog