UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

perf cputopo: Update to use pakage_cpus 

core_siblings_list is the deprecated topology name for
package_cpus_list, update the code to try the non-deprecated path first.
Adjust variable names to match topology name.

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-3-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Ian Rogers 2021-11-10 16:21:03 -08:00 committed by Arnaldo Carvalho de Melo
parent 604ce2f004
commit 48f07b0b2a
3 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/perf/util/cputopo.c
View File

@ -14,7 +14,9 @@
#include "env.h"
#include "pmu-hybrid.h"
#define CORE_SIB_FMT \
#define PACKAGE_CPUS_FMT \
"%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 \
"%s/devices/system/cpu/cpu%d/topology/die_cpus_list"
@ -39,8 +41,12 @@ static int build_cpu_topology(struct cpu_topology *tp, int cpu)
u32 i = 0;
int ret = -1;
scnprintf(filename, MAXPATHLEN, CORE_SIB_FMT,
scnprintf(filename, MAXPATHLEN, PACKAGE_CPUS_FMT,
sysfs__mountpoint(), cpu);
if (access(filename, F_OK) == -1) {
scnprintf(filename, MAXPATHLEN, PACKAGE_CPUS_FMT_OLD,
sysfs__mountpoint(), cpu);
}
fp = fopen(filename, "r");
if (!fp)
goto try_dies;
@ -54,13 +60,13 @@ static int build_cpu_topology(struct cpu_topology *tp, int cpu)
if (p)
*p = '\0';
for (i = 0; i < tp->core_sib; i++) {
if (!strcmp(buf, tp->core_siblings[i]))
for (i = 0; i < tp->package_cpus_lists; i++) {
if (!strcmp(buf, tp->package_cpus_list[i]))
break;
}
if (i == tp->core_sib) {
tp->core_siblings[i] = buf;
tp->core_sib++;
if (i == tp->package_cpus_lists) {
tp->package_cpus_list[i] = buf;
tp->package_cpus_lists++;
buf = NULL;
len = 0;
}
@ -139,8 +145,8 @@ void cpu_topology__delete(struct cpu_topology *tp)
if (!tp)
return;
for (i = 0 ; i < tp->core_sib; i++)
zfree(&tp->core_siblings[i]);
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++)
@ -205,7 +211,7 @@ struct cpu_topology *cpu_topology__new(void)
tp = addr;
addr += sizeof(*tp);
tp->core_siblings = addr;
tp->package_cpus_list = addr;
addr += sz;
if (has_die) {
tp->die_siblings = addr;

11
tools/perf/util/cputopo.h
View File

@ -5,10 +5,17 @@
#include <linux/types.h>
struct cpu_topology {
u32 core_sib;
/* The number of unique package_cpus_lists below. */
u32 package_cpus_lists;
u32 die_sib;
u32 thread_sib;
char **core_siblings;
/*
* An array of strings where each string is unique and read from
* /sys/devices/system/cpu/cpuX/topology/package_cpus_list. From the ABI
* each of these is a human-readable list of CPUs sharing the same
* physical_package_id. The format is like 0-3, 8-11, 14,17.
*/
const char **package_cpus_list;
char **die_siblings;
char **thread_siblings;
};

6
tools/perf/util/header.c
View File

@ -583,12 +583,12 @@ static int write_cpu_topology(struct feat_fd *ff,
if (!tp)
return -1;
ret = do_write(ff, &tp->core_sib, sizeof(tp->core_sib));
ret = do_write(ff, &tp->package_cpus_lists, sizeof(tp->package_cpus_lists));
if (ret < 0)
goto done;
for (i = 0; i < tp->core_sib; i++) {
ret = do_write_string(ff, tp->core_siblings[i]);
for (i = 0; i < tp->package_cpus_lists; i++) {
ret = do_write_string(ff, tp->package_cpus_list[i]);
if (ret < 0)
goto done;
}