mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-21 10:01:00 +00:00
4ffbe87e2d
sysfs__read_int() returns 0 on success, and so the fast read path was
always failing.
Fixes: bb629484d9 ("perf tools: Simplify checking if SMT is active.")
Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.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: http://lore.kernel.org/lkml/20211124001231.3277836-2-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
52 lines
1.1 KiB
C
52 lines
1.1 KiB
C
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <linux/bitops.h>
|
|
#include "api/fs/fs.h"
|
|
#include "smt.h"
|
|
|
|
int smt_on(void)
|
|
{
|
|
static bool cached;
|
|
static int cached_result;
|
|
int cpu;
|
|
int ncpu;
|
|
|
|
if (cached)
|
|
return cached_result;
|
|
|
|
if (sysfs__read_int("devices/system/cpu/smt/active", &cached_result) >= 0)
|
|
goto done;
|
|
|
|
ncpu = sysconf(_SC_NPROCESSORS_CONF);
|
|
for (cpu = 0; cpu < ncpu; cpu++) {
|
|
unsigned long long siblings;
|
|
char *str;
|
|
size_t strlen;
|
|
char fn[256];
|
|
|
|
snprintf(fn, sizeof fn,
|
|
"devices/system/cpu/cpu%d/topology/core_cpus", cpu);
|
|
if (sysfs__read_str(fn, &str, &strlen) < 0) {
|
|
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 */
|
|
siblings = strtoull(str, NULL, 16);
|
|
free(str);
|
|
if (hweight64(siblings) > 1) {
|
|
cached_result = 1;
|
|
cached = true;
|
|
break;
|
|
}
|
|
}
|
|
if (!cached) {
|
|
cached_result = 0;
|
|
done:
|
|
cached = true;
|
|
}
|
|
return cached_result;
|
|
}
|