perf header: Make nodes dynamic in write_mem_topology()

Avoid a large static array, dynamically allocate the nodes avoiding a
hard coded limited as well.

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: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: K Prateek Nayak <kprateek.nayak@amd.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Ross Zwisler <zwisler@chromium.org>
Cc: Sean Christopherson <seanjc@google.com>
Cc: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Tiezhu Yang <yangtiezhu@loongson.cn>
Cc: Yang Jihong <yangjihong1@huawei.com>
Link: https://lore.kernel.org/r/20230526183401.2326121-2-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 0c69109c0a3b70563eb83cb968b304218bc62695..d85b39079c31be35776b7c1f46c359117b6cd202 100644 (file)
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -24,6 +24,7 @@
 #include <bpf/libbpf.h>
 #endif
 #include <perf/cpumap.h>
+#include <tools/libc_compat.h> // reallocarray
 
 #include "dso.h"
 #include "evlist.h"
@@ -1396,13 +1397,14 @@ static int memory_node__sort(const void *a, const void *b)
        return na->node - nb->node;
 }
 
-static int build_mem_topology(struct memory_node *nodes, u64 size, u64 *cntp)
+static int build_mem_topology(struct memory_node **nodesp, u64 *cntp)
 {
        char path[PATH_MAX];
        struct dirent *ent;
        DIR *dir;
-       u64 cnt = 0;
        int ret = 0;
+       size_t cnt = 0, size = 0;
+       struct memory_node *nodes = NULL;
 
        scnprintf(path, PATH_MAX, "%s/devices/system/node/",
                  sysfs__mountpoint());
@@ -1426,26 +1428,32 @@ static int build_mem_topology(struct memory_node *nodes, u64 size, u64 *cntp)
                if (r != 1)
                        continue;
 
-               if (WARN_ONCE(cnt >= size,
-                       "failed to write MEM_TOPOLOGY, way too many nodes\n")) {
-                       closedir(dir);
-                       return -1;
-               }
+               if (cnt >= size) {
+                       struct memory_node *new_nodes =
+                               reallocarray(nodes, cnt + 4, sizeof(*nodes));
 
+                       if (!new_nodes) {
+                               pr_err("Failed to write MEM_TOPOLOGY, size %zd nodes\n", size);
+                               ret = -ENOMEM;
+                               goto out;
+                       }
+                       nodes = new_nodes;
+                       size += 4;
+               }
                ret = memory_node__read(&nodes[cnt++], idx);
        }
-
-       *cntp = cnt;
+out:
        closedir(dir);
-
-       if (!ret)
+       if (!ret) {
+               *cntp = cnt;
+               *nodesp = nodes;
                qsort(nodes, cnt, sizeof(nodes[0]), memory_node__sort);
+       } else
+               free(nodes);
 
        return ret;
 }
 
-#define MAX_MEMORY_NODES 2000
-
 /*
  * The MEM_TOPOLOGY holds physical memory map for every
  * node in system. The format of data is as follows:
@@ -1464,8 +1472,8 @@ static int build_mem_topology(struct memory_node *nodes, u64 size, u64 *cntp)
 static int write_mem_topology(struct feat_fd *ff __maybe_unused,
                              struct evlist *evlist __maybe_unused)
 {
-       static struct memory_node nodes[MAX_MEMORY_NODES];
-       u64 bsize, version = 1, i, nr;
+       struct memory_node *nodes = NULL;
+       u64 bsize, version = 1, i, nr = 0;
        int ret;
 
        ret = sysfs__read_xll("devices/system/memory/block_size_bytes",
@@ -1473,7 +1481,7 @@ static int write_mem_topology(struct feat_fd *ff __maybe_unused,
        if (ret)
                return ret;
 
-       ret = build_mem_topology(&nodes[0], MAX_MEMORY_NODES, &nr);
+       ret = build_mem_topology(&nodes, &nr);
        if (ret)
                return ret;
 
@@ -1508,6 +1516,7 @@ static int write_mem_topology(struct feat_fd *ff __maybe_unused,
        }
 
 out:
+       free(nodes);
        return ret;
 }