diff options
author | Delyan Kratunov <delyank@fb.com> | 2022-02-02 15:54:20 -0800 |
---|---|---|
committer | Andrii Nakryiko <andrii@kernel.org> | 2022-02-02 22:31:18 -0800 |
commit | 04fcb5f9a104f24278ad849c642cbdf0c8f48453 (patch) | |
tree | e0347c7a158827786282e8b815870ccc0e0384fa /tools/testing/selftests/bpf/prog_tests/map_lock.c | |
parent | Merge branch 'bpf-btf-dwarf5' (diff) | |
download | wireguard-linux-04fcb5f9a104f24278ad849c642cbdf0c8f48453.tar.xz wireguard-linux-04fcb5f9a104f24278ad849c642cbdf0c8f48453.zip |
selftests/bpf: Migrate from bpf_prog_test_run
bpf_prog_test_run is being deprecated in favor of the OPTS-based
bpf_prog_test_run_opts.
We end up unable to use CHECK in most cases, so replace usages with
ASSERT_* calls.
Signed-off-by: Delyan Kratunov <delyank@fb.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20220202235423.1097270-2-delyank@fb.com
Diffstat (limited to 'tools/testing/selftests/bpf/prog_tests/map_lock.c')
-rw-r--r-- | tools/testing/selftests/bpf/prog_tests/map_lock.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/tools/testing/selftests/bpf/prog_tests/map_lock.c b/tools/testing/selftests/bpf/prog_tests/map_lock.c index 23d19e9cf26a..e4e99b37df64 100644 --- a/tools/testing/selftests/bpf/prog_tests/map_lock.c +++ b/tools/testing/selftests/bpf/prog_tests/map_lock.c @@ -4,14 +4,17 @@ static void *spin_lock_thread(void *arg) { - __u32 duration, retval; int err, prog_fd = *(u32 *) arg; + LIBBPF_OPTS(bpf_test_run_opts, topts, + .data_in = &pkt_v4, + .data_size_in = sizeof(pkt_v4), + .repeat = 10000, + ); + + err = bpf_prog_test_run_opts(prog_fd, &topts); + ASSERT_OK(err, "test_run_opts err"); + ASSERT_OK(topts.retval, "test_run_opts retval"); - err = bpf_prog_test_run(prog_fd, 10000, &pkt_v4, sizeof(pkt_v4), - NULL, NULL, &retval, &duration); - CHECK(err || retval, "", - "err %d errno %d retval %d duration %d\n", - err, errno, retval, duration); pthread_exit(arg); } |