perf report: Use function to add missing maps lock

Switch maps__fprintf_task from loop macro maps__for_each_entry to
maps__for_each_map function that takes a callback. The function holds
the maps lock, which should be held during iteration.

Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Changbin Du <changbin.du@huawei.com>
Cc: Colin Ian King <colin.i.king@gmail.com>
Cc: Dmitrii Dolgov <9erthalion6@gmail.com>
Cc: German Gomez <german.gomez@arm.com>
Cc: Guilherme Amadio <amadio@gentoo.org>
Cc: Huacai Chen <chenhuacai@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: K Prateek Nayak <kprateek.nayak@amd.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Li Dong <lidong@vivo.com>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Miguel Ojeda <ojeda@kernel.org>
Cc: Ming Wang <wangming01@loongson.cn>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Nick Terrell <terrelln@fb.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Sandipan Das <sandipan.das@amd.com>
Cc: Sean Christopherson <seanjc@google.com>
Cc: Steinar H. Gunderson <sesse@google.com>
Cc: Vincent Whitchurch <vincent.whitchurch@axis.com>
Cc: Wenyu Liu <liuwenyu7@huawei.com>
Cc: Yang Jihong <yangjihong1@huawei.com>
Link: https://lore.kernel.org/r/20231207011722.1220634-5-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 17fb171..178fb60 100644 (file)
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -856,27 +856,47 @@ static struct task *tasks_list(struct task *task, struct machine *machine)
        return tasks_list(parent_task, machine);
 }
 
-static size_t maps__fprintf_task(struct maps *maps, int indent, FILE *fp)
+struct maps__fprintf_task_args {
+       int indent;
+       FILE *fp;
+       size_t printed;
+};
+
+static int maps__fprintf_task_cb(struct map *map, void *data)
 {
-       size_t printed = 0;
-       struct map_rb_node *rb_node;
+       struct maps__fprintf_task_args *args = data;
+       const struct dso *dso = map__dso(map);
+       u32 prot = map__prot(map);
+       int ret;
 
-       maps__for_each_entry(maps, rb_node) {
-               struct map *map = rb_node->map;
-               const struct dso *dso = map__dso(map);
-               u32 prot = map__prot(map);
+       ret = fprintf(args->fp,
+               "%*s  %" PRIx64 "-%" PRIx64 " %c%c%c%c %08" PRIx64 " %" PRIu64 " %s\n",
+               args->indent, "", map__start(map), map__end(map),
+               prot & PROT_READ ? 'r' : '-',
+               prot & PROT_WRITE ? 'w' : '-',
+               prot & PROT_EXEC ? 'x' : '-',
+               map__flags(map) ? 's' : 'p',
+               map__pgoff(map),
+               dso->id.ino, dso->name);
 
-               printed += fprintf(fp, "%*s  %" PRIx64 "-%" PRIx64 " %c%c%c%c %08" PRIx64 " %" PRIu64 " %s\n",
-                                  indent, "", map__start(map), map__end(map),
-                                  prot & PROT_READ ? 'r' : '-',
-                                  prot & PROT_WRITE ? 'w' : '-',
-                                  prot & PROT_EXEC ? 'x' : '-',
-                                  map__flags(map) ? 's' : 'p',
-                                  map__pgoff(map),
-                                  dso->id.ino, dso->name);
-       }
+       if (ret < 0)
+               return ret;
+
+       args->printed += ret;
+       return 0;
+}
+
+static size_t maps__fprintf_task(struct maps *maps, int indent, FILE *fp)
+{
+       struct maps__fprintf_task_args args = {
+               .indent = indent,
+               .fp = fp,
+               .printed = 0,
+       };
+
+       maps__for_each_map(maps, maps__fprintf_task_cb, &args);
 
-       return printed;
+       return args.printed;
 }
 
 static void task__print_level(struct task *task, FILE *fp, int level)