Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf tools: Probe non-deprecated sysfs path 1st

Following Documentation/ABI/stable/sysfs-devices-system-cpu the
/sys/devices/system/cpu/cpuX/topology/core_cpus is deprecated in favor
of thread_siblings, so probe thread_siblings before falling back on
core_cpus.

Signed-off-by: Ian Rogers <irogers@google.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@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: Konstantin Khlebnikov <koct9i@gmail.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Clarke <pc@us.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: https://lore.kernel.org/r/20211124001231.3277836-4-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Ian Rogers and committed by
Arnaldo Carvalho de Melo
6dd86469 0ce05781

+2 -3
+2 -3
tools/perf/util/smt.c
··· 79 79 char fn[256]; 80 80 81 81 snprintf(fn, sizeof fn, 82 - "devices/system/cpu/cpu%d/topology/core_cpus", cpu); 82 + "devices/system/cpu/cpu%d/topology/thread_siblings", cpu); 83 83 if (sysfs__read_str(fn, &str, &strlen) < 0) { 84 84 snprintf(fn, sizeof fn, 85 - "devices/system/cpu/cpu%d/topology/thread_siblings", 86 - cpu); 85 + "devices/system/cpu/cpu%d/topology/core_cpus", cpu); 87 86 if (sysfs__read_str(fn, &str, &strlen) < 0) 88 87 continue; 89 88 }