Commit 9754353d authored by Haixin Yu's avatar Haixin Yu Committed by Arnaldo Carvalho de Melo
Browse files

perf pmu arm64: Fix reading the PMU cpu slots in sysfs 



Commit f8ad6018 ("perf pmu: Remove duplication around
EVENT_SOURCE_DEVICE_PATH") uses sysfs__read_ull() to read a full sysfs
path, which will never succeeds as it already comes with the sysfs mount
point in it, which sysfs__read_ull() will add again.

Fix it by reading the file using filename__read_ull(), that will not add
the sysfs mount point.

Fixes: f8ad6018 ("perf pmu: Remove duplication around EVENT_SOURCE_DEVICE_PATH")
Signed-off-by: default avatarHaixin Yu <yuhaixin.yhx@linux.alibaba.com>
Tested-by: default avatarJing Zhang <renyu.zj@linux.alibaba.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Will Deacon <will@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/ZL4G7rWXkfv-Ectq@B-Q60VQ05P-2326.local


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 6eaae198

tools/perf/arch/arm64/util/pmu.c

+4 −3
Original line number Diff line number Diff line
@@ -54,10 +54,11 @@ double perf_pmu__cpu_slots_per_cycle(void) 
		perf_pmu__pathname_scnprintf(path, sizeof(path),

					     pmu->name, "caps/slots");

		/*

		 * The value of slots is not greater than 32 bits, but sysfs__read_int

		 * can't read value with 0x prefix, so use sysfs__read_ull instead.

		 * The value of slots is not greater than 32 bits, but

		 * filename__read_int can't read value with 0x prefix,

		 * so use filename__read_ull instead.

		 */

		sysfs__read_ull(path, &slots);

		filename__read_ull(path, &slots);

	}



	return slots ? (double)slots : NAN;