Messages in this thread Patch in this message | | | From | Namhyung Kim <> | Subject | [PATCH 4/4] perf annotate: Try chroot filename for objdump | Date | Tue, 1 Feb 2022 23:08:28 -0800 |
| |
Likewise, it should use a proper name in case the task runs under chroot.
Acked-by: Jiri Olsa <jolsa@kernel.org> Signed-off-by: Namhyung Kim <namhyung@kernel.org> --- tools/perf/util/annotate.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 8190a124b99d..e4c641b240df 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -33,6 +33,7 @@ #include "string2.h" #include "util/event.h" #include "arch/common.h" +#include "namespaces.h" #include <regex.h> #include <pthread.h> #include <linux/bitops.h> @@ -1696,6 +1697,15 @@ static int dso__disassemble_filename(struct dso *dso, char *filename, size_t fil * DSO is the same as when 'perf record' ran. */ __symbol__join_symfs(filename, filename_size, dso->long_name); + + if (access(filename, R_OK) && errno == ENOENT && dso->nsinfo) { + char *new_name = filename_with_chroot(dso->nsinfo->pid, + filename); + if (new_name) { + strlcpy(filename, new_name, filename_size); + free(new_name); + } + } } free(build_id_path); -- 2.35.0.rc2.247.g8bbb082509-goog
| |