system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-19 01:39:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf test: Use perf_cpu_map__for_each_cpu()

Browse source 
Clean up variable naming to make cpu and index clearer.

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: John Garry <john.garry@huawei.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-41-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Ian Rogers 2022-01-04 22:13:43 -08:00 committed by Arnaldo Carvalho de Melo
parent 6f844b1fdd
commit aa11e55a39
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
tools/perf/tests/openat-syscall-all-cpus.c
View file

@ -22,7 +22,7 @@
static int test__openat_syscall_event_on_all_cpus(struct test_suite *test __maybe_unused, static int test__openat_syscall_event_on_all_cpus(struct test_suite *test __maybe_unused,
int subtest __maybe_unused) int subtest __maybe_unused)
{ {
int err = -1, fd, cpu; int err = -1, fd, idx, cpu;
struct perf_cpu_map *cpus; struct perf_cpu_map *cpus;
struct evsel *evsel; struct evsel *evsel;
unsigned int nr_openat_calls = 111, i; unsigned int nr_openat_calls = 111, i;
@ -58,23 +58,23 @@ static int test__openat_syscall_event_on_all_cpus(struct test_suite *test __mayb
goto out_evsel_delete; goto out_evsel_delete;
} }
for (cpu = 0; cpu < cpus->nr; ++cpu) { perf_cpu_map__for_each_cpu(cpu, idx, cpus) {
unsigned int ncalls = nr_openat_calls + cpu; unsigned int ncalls = nr_openat_calls + idx;
/* /*
* XXX eventually lift this restriction in a way that * XXX eventually lift this restriction in a way that
* keeps perf building on older glibc installations * keeps perf building on older glibc installations
* without CPU_ALLOC. 1024 cpus in 2010 still seems * without CPU_ALLOC. 1024 cpus in 2010 still seems
* a reasonable upper limit tho :-) * a reasonable upper limit tho :-)
*/ */
if (cpus->map[cpu] >= CPU_SETSIZE) { if (cpu >= CPU_SETSIZE) {
pr_debug("Ignoring CPU %d\n", cpus->map[cpu]); pr_debug("Ignoring CPU %d\n", cpu);
continue; continue;
} }
CPU_SET(cpus->map[cpu], &cpu_set); CPU_SET(cpu, &cpu_set);
if (sched_setaffinity(0, sizeof(cpu_set), &cpu_set) < 0) { if (sched_setaffinity(0, sizeof(cpu_set), &cpu_set) < 0) {
pr_debug("sched_setaffinity() failed on CPU %d: %s ", pr_debug("sched_setaffinity() failed on CPU %d: %s ",
cpus->map[cpu], cpu,
str_error_r(errno, sbuf, sizeof(sbuf))); str_error_r(errno, sbuf, sizeof(sbuf)));
goto out_close_fd; goto out_close_fd;
} }
@ -82,29 +82,29 @@ static int test__openat_syscall_event_on_all_cpus(struct test_suite *test __mayb
fd = openat(0, "/etc/passwd", O_RDONLY); fd = openat(0, "/etc/passwd", O_RDONLY);
close(fd); close(fd);
} }
CPU_CLR(cpus->map[cpu], &cpu_set); CPU_CLR(cpu, &cpu_set);
} }
evsel->core.cpus = perf_cpu_map__get(cpus); evsel->core.cpus = perf_cpu_map__get(cpus);
err = 0; err = 0;
for (cpu = 0; cpu < cpus->nr; ++cpu) { perf_cpu_map__for_each_cpu(cpu, idx, cpus) {
unsigned int expected; unsigned int expected;
if (cpus->map[cpu] >= CPU_SETSIZE) if (cpu >= CPU_SETSIZE)
continue; continue;
if (evsel__read_on_cpu(evsel, cpu, 0) < 0) { if (evsel__read_on_cpu(evsel, idx, 0) < 0) {
pr_debug("evsel__read_on_cpu\n"); pr_debug("evsel__read_on_cpu\n");
err = -1; err = -1;
break; break;
} }
expected = nr_openat_calls + cpu; expected = nr_openat_calls + idx;
if (perf_counts(evsel->counts, cpu, 0)->val != expected) { if (perf_counts(evsel->counts, idx, 0)->val != expected) {
pr_debug("evsel__read_on_cpu: expected to intercept %d calls on cpu %d, got %" PRIu64 "\n", pr_debug("evsel__read_on_cpu: expected to intercept %d calls on cpu %d, got %" PRIu64 "\n",
expected, cpus->map[cpu], perf_counts(evsel->counts, cpu, 0)->val); expected, cpu, perf_counts(evsel->counts, idx, 0)->val);
err = -1; err = -1;
} }
} }