perf cpumap: Give CPUs their own type
A common problem is confusing CPU map indices with the CPU, by wrapping the CPU with a struct then this is avoided. This approach is similar to atomic_t. Committer notes: To make it build with BUILD_BPF_SKEL=1 these files needed the conversions to 'struct perf_cpu' usage: tools/perf/util/bpf_counter.c tools/perf/util/bpf_counter_cgroup.c tools/perf/util/bpf_ftrace.c Also perf_env__get_cpu() was removed back in "perf cpumap: Switch cpu_map__build_map to cpu function". Additionally these needed to be fixed for the ARM builds to complete: tools/perf/arch/arm/util/cs-etm.c tools/perf/arch/arm64/util/pmu.c Suggested-by: John Garry <john.garry@huawei.com> 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: James Clark <james.clark@arm.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Kajol Jain <kjain@linux.ibm.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Leo Yan <leo.yan@linaro.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Cc: Mike Leach <mike.leach@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Clarke <pc@us.ibm.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Riccardo Mancini <rickyman7@gmail.com> Cc: Stephane Eranian <eranian@google.com> Cc: Suzuki Poulouse <suzuki.poulose@arm.com> Cc: Vineet Singh <vineet.singh@intel.com> Cc: coresight@lists.linaro.org Cc: linux-arm-kernel@lists.infradead.org Cc: zhengjun.xing@intel.com Link: https://lore.kernel.org/r/20220105061351.120843-49-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
		
				
					committed by
					
						 Arnaldo Carvalho de Melo
						Arnaldo Carvalho de Melo
					
				
			
			
				
	
			
			
			
						parent
						
							ce37ab3eb2
						
					
				
				
					commit
					6d18804b96
				
			| @@ -63,7 +63,7 @@ int perf_ftrace__latency_prepare_bpf(struct perf_ftrace *ftrace) | ||||
| 		fd = bpf_map__fd(skel->maps.cpu_filter); | ||||
| 
 | ||||
| 		for (i = 0; i < ncpus; i++) { | ||||
| 			cpu = perf_cpu_map__cpu(ftrace->evlist->core.cpus, i); | ||||
| 			cpu = perf_cpu_map__cpu(ftrace->evlist->core.cpus, i).cpu; | ||||
| 			bpf_map_update_elem(fd, &cpu, &val, BPF_ANY); | ||||
| 		} | ||||
| 	} | ||||
| @@ -122,7 +122,7 @@ int perf_ftrace__latency_read_bpf(struct perf_ftrace *ftrace __maybe_unused, | ||||
| 	int i, fd, err; | ||||
| 	u32 idx; | ||||
| 	u64 *hist; | ||||
| 	int ncpus = cpu__max_cpu(); | ||||
| 	int ncpus = cpu__max_cpu().cpu; | ||||
| 
 | ||||
| 	fd = bpf_map__fd(skel->maps.latency); | ||||
| 
 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user