diff options
| author | Hou Tao <houtao1@huawei.com> | 2023-06-13 11:09:19 +0300 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2023-06-19 23:26:43 +0300 |
| commit | da77ae2b27ec73a644624a6d4bffc206e2df6bb8 (patch) | |
| tree | 497632c6c324836e12a66a25df993208f78d4cb2 /tools/testing/selftests/bpf/bench.c | |
| parent | ea400d13fc92ec66578b068e661a162e01d4b641 (diff) | |
| download | linux-da77ae2b27ec73a644624a6d4bffc206e2df6bb8.tar.xz | |
selftests/bpf: Ensure that next_cpu() returns a valid CPU number
When using option -a without --prod-affinity or --cons-affinity, if the
number of producers and consumers is greater than the number of online
CPUs, the benchmark will fail to run as shown below:
$ getconf _NPROCESSORS_ONLN
8
$ ./bench bpf-loop -a -p9
Setting up benchmark 'bpf-loop'...
setting affinity to CPU #8 failed: -22
Fix it by returning the remainder of next_cpu divided by the number of
online CPUs in next_cpu().
Signed-off-by: Hou Tao <houtao1@huawei.com>
Link: https://lore.kernel.org/r/20230613080921.1623219-4-houtao@huaweicloud.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'tools/testing/selftests/bpf/bench.c')
| -rw-r--r-- | tools/testing/selftests/bpf/bench.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/testing/selftests/bpf/bench.c b/tools/testing/selftests/bpf/bench.c index 0b5d2b5303c9..56f1c166a57b 100644 --- a/tools/testing/selftests/bpf/bench.c +++ b/tools/testing/selftests/bpf/bench.c @@ -469,7 +469,7 @@ static int next_cpu(struct cpu_set *cpu_set) exit(1); } - return cpu_set->next_cpu++; + return cpu_set->next_cpu++ % env.nr_cpus; } static struct bench_state { @@ -659,6 +659,7 @@ static void collect_measurements(long delta_ns) { int main(int argc, char **argv) { + env.nr_cpus = get_nprocs(); parse_cmdline_args_init(argc, argv); if (env.list) { |