diff options
| -rw-r--r-- | tools/perf/builtin-report.c | 2 | ||||
| -rw-r--r-- | tools/perf/builtin-top.c | 4 | ||||
| -rw-r--r-- | tools/perf/util/dso.h | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 0f198f6d9b77..a4104e447f56 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -525,7 +525,7 @@ static void report__warn_kptr_restrict(const struct report *rep) if (kernel_map) { const struct dso *kdso = kernel_map->dso; - if (!RB_EMPTY_ROOT(&kdso->symbols[MAP__FUNCTION])) { + if (dso__has_symbols(kdso, MAP__FUNCTION)) { desc = "If some relocation was applied (e.g. " "kexec) symbols may be misresolved."; } diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 4e975f3ee3be..c11b46b411d5 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -742,7 +742,7 @@ static void perf_event__process_sample(struct perf_tool *tool, "Kernel address maps (/proc/{kallsyms,modules}) are restricted.\n\n" "Check /proc/sys/kernel/kptr_restrict.\n\n" "Kernel%s samples will not be resolved.\n", - al.map && !RB_EMPTY_ROOT(&al.map->dso->symbols[MAP__FUNCTION]) ? + al.map && dso__has_symbols(al.map->dso, MAP__FUNCTION) ? " modules" : ""); if (use_browser <= 0) sleep(5); @@ -765,7 +765,7 @@ static void perf_event__process_sample(struct perf_tool *tool, */ if (!machine->kptr_restrict_warned && !top->vmlinux_warned && __map__is_kernel(al.map) && - RB_EMPTY_ROOT(&al.map->dso->symbols[MAP__FUNCTION])) { + dso__has_symbols(al.map->dso, MAP__FUNCTION)) { if (symbol_conf.vmlinux_name) { char serr[256]; dso__strerror_load(al.map->dso, serr, sizeof(serr)); diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h index c229dbe0277a..881d572be6aa 100644 --- a/tools/perf/util/dso.h +++ b/tools/perf/util/dso.h @@ -233,6 +233,11 @@ static inline void __dso__zput(struct dso **dso) bool dso__loaded(const struct dso *dso, enum map_type type); +static inline bool dso__has_symbols(const struct dso *dso, enum map_type type) +{ + return !RB_EMPTY_ROOT(&dso->symbols[type]); +} + bool dso__sorted_by_name(const struct dso *dso, enum map_type type); void dso__set_sorted_by_name(struct dso *dso, enum map_type type); void dso__sort_by_name(struct dso *dso, enum map_type type); |