Commit a3cee974 authored by James Clark's avatar James Clark Committed by Arnaldo Carvalho de Melo
Browse files

perf arm64: Fix build with refcount checking 



With EXTRA_CFLAGS=-DREFCNT_CHECKING=1 and build-test, some unwrapped
map accesses appear. Wrap it in the new accessor to fix the error:

  error: 'struct perf_cpu_map' has no member named 'map'

Signed-off-by: default avatarJames Clark <james.clark@arm.com>
Acked-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.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/20230504160845.2065510-1-james.clark@arm.com


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

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

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static int _get_cpuid(char *buf, size_t sz, struct perf_cpu_map *cpus) 
		FILE *file;



		scnprintf(path, PATH_MAX, "%s/devices/system/cpu/cpu%d" MIDR,

				sysfs, cpus->map[cpu]);

			  sysfs, RC_CHK_ACCESS(cpus)->map[cpu].cpu);



		file = fopen(path, "r");

		if (!file) {

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

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ static struct perf_pmu *pmu__find_core_pmu(void) 
		 * The cpumap should cover all CPUs. Otherwise, some CPUs may

		 * not support some events or have different event IDs.

		 */

		if (pmu->cpus->nr != cpu__max_cpu().cpu)

		if (RC_CHK_ACCESS(pmu->cpus)->nr != cpu__max_cpu().cpu)

			return NULL;



		return pmu;