perf tools: Apply new CPU topology sysfs attributes (0ccdb840) · Commits · 戴 / test

The existing "thread_siblings" and "thread_siblings_list" attribute will be deprecated. Use the new CPU topology sysfs attributes, "core_cpus" and "core_cpus_list", which are synonymous with the deprecated attributes. Check the new name first. If not available, use the deprecated name to be compatible with old kernel. Signed-off-by:

Kan Liang <kan.liang@linux.intel.com> Reviewed-by:

Jiri Olsa <jolsa@kernel.org> Cc: Andi Kleen <ak@linux.intel.com> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/1559688644-106558-5-git-send-email-kan.liang@linux.intel.com Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com>

tools/perf/util/cputopo.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -15,6 +15,8 @@
		"%s/devices/system/cpu/cpu%d/topology/die_cpus_list"
		#define THRD_SIB_FMT \
		"%s/devices/system/cpu/cpu%d/topology/thread_siblings_list"
		#define THRD_SIB_FMT_NEW \
		"%s/devices/system/cpu/cpu%d/topology/core_cpus_list"
		#define NODE_ONLINE_FMT \
		"%s/devices/system/node/online"
		#define NODE_MEMINFO_FMT \
		@@ -91,8 +93,12 @@ try_dies:
		ret = 0;

		try_threads:
		scnprintf(filename, MAXPATHLEN, THRD_SIB_FMT_NEW,
		sysfs__mountpoint(), cpu);
		if (access(filename, F_OK) == -1) {
		scnprintf(filename, MAXPATHLEN, THRD_SIB_FMT,
		sysfs__mountpoint(), cpu);
		}
		fp = fopen(filename, "r");
		if (!fp)
		goto done;

tools/perf/util/smt.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -22,9 +22,13 @@ int smt_on(void)
		size_t strlen;
		char fn[256];

		snprintf(fn, sizeof fn,
		"devices/system/cpu/cpu%d/topology/core_cpus", cpu);
		if (access(fn, F_OK) == -1) {
		snprintf(fn, sizeof fn,
		"devices/system/cpu/cpu%d/topology/thread_siblings",
		cpu);
		}
		if (sysfs__read_str(fn, &str, &strlen) < 0)
		continue;
		/* Entry is hex, but does not have 0x, so need custom parser */

Admin message