selftests/bpf: use preferred setter/getter APIs instead of deprecated ones

Switch to using preferred setters and getters instead of deprecated ones.

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/r/20220124194254.2051434-6-andrii@kernel.org
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/tools/testing/selftests/bpf/benchs/bench_ringbufs.c b/tools/testing/selftests/bpf/benchs/bench_ringbufs.c
index da8593b..c2554f9 100644 (file)
--- a/tools/testing/selftests/bpf/benchs/bench_ringbufs.c
+++ b/tools/testing/selftests/bpf/benchs/bench_ringbufs.c
@@ -151,7 +151,7 @@ static struct ringbuf_bench *ringbuf_setup_skeleton(void)
                /* record data + header take 16 bytes */
                skel->rodata->wakeup_data_size = args.sample_rate * 16;
 
-       bpf_map__resize(skel->maps.ringbuf, args.ringbuf_sz);
+       bpf_map__set_max_entries(skel->maps.ringbuf, args.ringbuf_sz);
 
        if (ringbuf_bench__load(skel)) {
                fprintf(stderr, "failed to load skeleton\n");

diff --git a/tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c b/tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c
index c52f99f..e83575e 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c
+++ b/tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c
@@ -132,7 +132,7 @@ static void test_fexit_bpf2bpf_common(const char *obj_file,
                                             &link_info, &info_len);
                ASSERT_OK(err, "link_fd_get_info");
                ASSERT_EQ(link_info.tracing.attach_type,
-                         bpf_program__get_expected_attach_type(prog[i]),
+                         bpf_program__expected_attach_type(prog[i]),
                          "link_attach_type");
                ASSERT_EQ(link_info.tracing.target_obj_id, tgt_prog_id, "link_tgt_obj_id");
                ASSERT_EQ(link_info.tracing.target_btf_id, btf_id, "link_tgt_btf_id");

diff --git a/tools/testing/selftests/bpf/prog_tests/get_stackid_cannot_attach.c b/tools/testing/selftests/bpf/prog_tests/get_stackid_cannot_attach.c
index 8d5a602..5308de1 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/get_stackid_cannot_attach.c
+++ b/tools/testing/selftests/bpf/prog_tests/get_stackid_cannot_attach.c
@@ -27,7 +27,7 @@ void test_get_stackid_cannot_attach(void)
                return;
 
        /* override program type */
-       bpf_program__set_perf_event(skel->progs.oncpu);
+       bpf_program__set_type(skel->progs.oncpu, BPF_PROG_TYPE_PERF_EVENT);
 
        err = test_stacktrace_build_id__load(skel);
        if (CHECK(err, "skel_load", "skeleton load failed: %d\n", err))

diff --git a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c
index 0a91d8d..f45a1d7 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c
+++ b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c
@@ -42,7 +42,7 @@ retry:
                return;
 
        /* override program type */
-       bpf_program__set_perf_event(skel->progs.oncpu);
+       bpf_program__set_type(skel->progs.oncpu, BPF_PROG_TYPE_PERF_EVENT);
 
        err = test_stacktrace_build_id__load(skel);
        if (CHECK(err, "skel_load", "skeleton load failed: %d\n", err))