perf cputopo: Match die_siblings to topology ABI name

The topology name for die_siblings is die_cpus_list, use this for
consistency and add documentation.

Signed-off-by: Ian Rogers <irogers@google.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul A . Clarke <pc@us.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Riccardo Mancini <rickyman7@gmail.com>
Cc: Song Liu <song@kernel.org>
Cc: Wan Jiabing <wanjiabing@vivo.com>
Cc: Yury Norov <yury.norov@gmail.com>
Link: https://lore.kernel.org/r/20211111002109.194172-4-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/cputopo.c b/tools/perf/util/cputopo.c
index f72a7de19e0292ea6993b8c8d63b8740090e292c..420aeda16fbb86afd71a9c5b9aa8b615322e99f3 100644 (file)
--- a/tools/perf/util/cputopo.c
+++ b/tools/perf/util/cputopo.c
@@ -18,7 +18,7 @@
        "%s/devices/system/cpu/cpu%d/topology/package_cpus_list"
 #define PACKAGE_CPUS_FMT_OLD \
        "%s/devices/system/cpu/cpu%d/topology/core_siblings_list"
-#define DIE_SIB_FMT \
+#define DIE_CPUS_FMT \
        "%s/devices/system/cpu/cpu%d/topology/die_cpus_list"
 #define THRD_SIB_FMT \
        "%s/devices/system/cpu/cpu%d/topology/thread_siblings_list"
@@ -73,10 +73,10 @@ static int build_cpu_topology(struct cpu_topology *tp, int cpu)
        ret = 0;
 
 try_dies:
-       if (!tp->die_siblings)
+       if (!tp->die_cpus_list)
                goto try_threads;
 
-       scnprintf(filename, MAXPATHLEN, DIE_SIB_FMT,
+       scnprintf(filename, MAXPATHLEN, DIE_CPUS_FMT,
                  sysfs__mountpoint(), cpu);
        fp = fopen(filename, "r");
        if (!fp)
@@ -91,13 +91,13 @@ try_dies:
        if (p)
                *p = '\0';
 
-       for (i = 0; i < tp->die_sib; i++) {
-               if (!strcmp(buf, tp->die_siblings[i]))
+       for (i = 0; i < tp->die_cpus_lists; i++) {
+               if (!strcmp(buf, tp->die_cpus_list[i]))
                        break;
        }
-       if (i == tp->die_sib) {
-               tp->die_siblings[i] = buf;
-               tp->die_sib++;
+       if (i == tp->die_cpus_lists) {
+               tp->die_cpus_list[i] = buf;
+               tp->die_cpus_lists++;
                buf = NULL;
                len = 0;
        }
@@ -148,10 +148,8 @@ void cpu_topology__delete(struct cpu_topology *tp)
        for (i = 0 ; i < tp->package_cpus_lists; i++)
                zfree(&tp->package_cpus_list[i]);
 
-       if (tp->die_sib) {
-               for (i = 0 ; i < tp->die_sib; i++)
-                       zfree(&tp->die_siblings[i]);
-       }
+       for (i = 0 ; i < tp->die_cpus_lists; i++)
+               zfree(&tp->die_cpus_list[i]);
 
        for (i = 0 ; i < tp->thread_sib; i++)
                zfree(&tp->thread_siblings[i]);
@@ -170,7 +168,7 @@ static bool has_die_topology(void)
        if (strncmp(uts.machine, "x86_64", 6))
                return false;
 
-       scnprintf(filename, MAXPATHLEN, DIE_SIB_FMT,
+       scnprintf(filename, MAXPATHLEN, DIE_CPUS_FMT,
                  sysfs__mountpoint(), 0);
        if (access(filename, F_OK) == -1)
                return false;
@@ -214,7 +212,7 @@ struct cpu_topology *cpu_topology__new(void)
        tp->package_cpus_list = addr;
        addr += sz;
        if (has_die) {
-               tp->die_siblings = addr;
+               tp->die_cpus_list = addr;
                addr += sz;
        }
        tp->thread_siblings = addr;

diff --git a/tools/perf/util/cputopo.h b/tools/perf/util/cputopo.h
index 4ec9cb192c3df45a88603b3be47cc74f0fe185ea..a3e01c3678539473ab9c88f51d7da62a43bf3320 100644 (file)
--- a/tools/perf/util/cputopo.h
+++ b/tools/perf/util/cputopo.h
@@ -7,7 +7,8 @@
 struct cpu_topology {
        /* The number of unique package_cpus_lists below. */
        u32       package_cpus_lists;
-       u32       die_sib;
+       /* The number of unique die_cpu_lists below. */
+       u32       die_cpus_lists;
        u32       thread_sib;
        /*
         * An array of strings where each string is unique and read from
@@ -16,7 +17,13 @@ struct cpu_topology {
         * physical_package_id. The format is like 0-3, 8-11, 14,17.
         */
        const char **package_cpus_list;
-       char    **die_siblings;
+       /*
+        * An array of string where each string is unique and from
+        * /sys/devices/system/cpu/cpuX/topology/die_cpus_list. From the ABI
+        * each of these is a human-readable list of CPUs within the same die.
+        * The format is like 0-3, 8-11, 14,17.
+        */
+       const char **die_cpus_list;
        char    **thread_siblings;
 };
 

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 4e89cd35345b9a78c3858c8da0b673cc9d71d069..e2ba261d158358f41a9148eed39546a4f83c4145 100644 (file)
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -617,15 +617,15 @@ static int write_cpu_topology(struct feat_fd *ff,
                        return ret;
        }
 
-       if (!tp->die_sib)
+       if (!tp->die_cpus_lists)
                goto done;
 
-       ret = do_write(ff, &tp->die_sib, sizeof(tp->die_sib));
+       ret = do_write(ff, &tp->die_cpus_lists, sizeof(tp->die_cpus_lists));
        if (ret < 0)
                goto done;
 
-       for (i = 0; i < tp->die_sib; i++) {
-               ret = do_write_string(ff, tp->die_siblings[i]);
+       for (i = 0; i < tp->die_cpus_lists; i++) {
+               ret = do_write_string(ff, tp->die_cpus_list[i]);
                if (ret < 0)
                        goto done;
        }