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_ptr.c | |
| parent | Merge branch 'bpf-btf-dwarf5' (diff) | |
| download | linux-04fcb5f9a104f24278ad849c642cbdf0c8f48453.tar.gz linux-04fcb5f9a104f24278ad849c642cbdf0c8f48453.tar.bz2 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_ptr.c')
| -rw-r--r-- | tools/testing/selftests/bpf/prog_tests/map_ptr.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/tools/testing/selftests/bpf/prog_tests/map_ptr.c b/tools/testing/selftests/bpf/prog_tests/map_ptr.c index 273725504f11..43e502acf050 100644 --- a/tools/testing/selftests/bpf/prog_tests/map_ptr.c +++ b/tools/testing/selftests/bpf/prog_tests/map_ptr.c @@ -9,10 +9,16 @@ void test_map_ptr(void) { struct map_ptr_kern_lskel *skel; - __u32 duration = 0, retval; char buf[128]; int err; int page_size = getpagesize(); + LIBBPF_OPTS(bpf_test_run_opts, topts, + .data_in = &pkt_v4, + .data_size_in = sizeof(pkt_v4), + .data_out = buf, + .data_size_out = sizeof(buf), + .repeat = 1, + ); skel = map_ptr_kern_lskel__open(); if (!ASSERT_OK_PTR(skel, "skel_open")) @@ -26,14 +32,12 @@ void test_map_ptr(void) skel->bss->page_size = page_size; - err = bpf_prog_test_run(skel->progs.cg_skb.prog_fd, 1, &pkt_v4, - sizeof(pkt_v4), buf, NULL, &retval, NULL); + err = bpf_prog_test_run_opts(skel->progs.cg_skb.prog_fd, &topts); - if (CHECK(err, "test_run", "err=%d errno=%d\n", err, errno)) + if (!ASSERT_OK(err, "test_run")) goto cleanup; - if (CHECK(!retval, "retval", "retval=%d map_type=%u line=%u\n", retval, - skel->bss->g_map_type, skel->bss->g_line)) + if (!ASSERT_NEQ(topts.retval, 0, "test_run retval")) goto cleanup; cleanup: |