selftests/bpf: Switch to new bpf_object__next_{map,program} APIs

Replace deprecated bpf_{map,program}__next APIs with newly added
bpf_object__next_{map,program} APIs, so that no compilation warnings
emit.

Signed-off-by: Hengqi Chen <hengqi.chen@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Song Liu <songliubraving@fb.com>
Link: https://lore.kernel.org/bpf/20211003165844.4054931-3-hengqi.chen@gmail.com

diff --git a/samples/bpf/xdp1_user.c b/samples/bpf/xdp1_user.c
index 116e39f..8675fa5 100644 (file)
--- a/samples/bpf/xdp1_user.c
+++ b/samples/bpf/xdp1_user.c
@@ -128,7 +128,7 @@ int main(int argc, char **argv)
        if (bpf_prog_load_xattr(&prog_load_attr, &obj, &prog_fd))
                return 1;
 
-       map = bpf_map__next(NULL, obj);
+       map = bpf_object__next_map(obj, NULL);
        if (!map) {
                printf("finding a map in obj file failed\n");
                return 1;

diff --git a/samples/bpf/xdp_sample_pkts_user.c b/samples/bpf/xdp_sample_pkts_user.c
index 495e098..f4382cc 100644 (file)
--- a/samples/bpf/xdp_sample_pkts_user.c
+++ b/samples/bpf/xdp_sample_pkts_user.c
@@ -154,7 +154,7 @@ int main(int argc, char **argv)
                return 1;
        }
 
-       map = bpf_map__next(NULL, obj);
+       map = bpf_object__next_map(obj, NULL);
        if (!map) {
                printf("finding a map in obj file failed\n");
                return 1;

diff --git a/tools/bpf/bpftool/iter.c b/tools/bpf/bpftool/iter.c
index 84a9b01..6c0de64 100644 (file)
--- a/tools/bpf/bpftool/iter.c
+++ b/tools/bpf/bpftool/iter.c
@@ -57,7 +57,7 @@ static int do_pin(int argc, char **argv)
                goto close_obj;
        }
 
-       prog = bpf_program__next(NULL, obj);
+       prog = bpf_object__next_program(obj, NULL);
        if (!prog) {
                p_err("can't find bpf program in objfile %s", objfile);
                goto close_obj;

diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
index 9c3e343..a24ea7e 100644 (file)
--- a/tools/bpf/bpftool/prog.c
+++ b/tools/bpf/bpftool/prog.c
@@ -1601,7 +1601,7 @@ static int load_with_options(int argc, char **argv, bool first_prog_only)
                goto err_close_obj;
 
        if (first_prog_only) {
-               prog = bpf_program__next(NULL, obj);
+               prog = bpf_object__next_program(obj, NULL);
                if (!prog) {
                        p_err("object file doesn't contain any bpf program");
                        goto err_close_obj;

diff --git a/tools/testing/selftests/bpf/prog_tests/btf.c b/tools/testing/selftests/bpf/prog_tests/btf.c
index 9c85d7d..acd33d0 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/btf.c
+++ b/tools/testing/selftests/bpf/prog_tests/btf.c
@@ -4511,7 +4511,7 @@ static void do_test_file(unsigned int test_num)
        if (CHECK(err, "obj: %d", err))
                return;
 
-       prog = bpf_program__next(NULL, obj);
+       prog = bpf_object__next_program(obj, NULL);
        if (CHECK(!prog, "Cannot find bpf_prog")) {
                err = -1;
                goto done;

diff --git a/tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c b/tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c
index c7c1816..2839f42 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c
+++ b/tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c
@@ -285,7 +285,7 @@ static void test_fmod_ret_freplace(void)
        if (!ASSERT_OK_PTR(freplace_obj, "freplace_obj_open"))
                goto out;
 
-       prog = bpf_program__next(NULL, freplace_obj);
+       prog = bpf_object__next_program(freplace_obj, NULL);
        err = bpf_program__set_attach_target(prog, pkt_fd, NULL);
        ASSERT_OK(err, "freplace__set_attach_target");
 
@@ -302,7 +302,7 @@ static void test_fmod_ret_freplace(void)
                goto out;
 
        attach_prog_fd = bpf_program__fd(prog);
-       prog = bpf_program__next(NULL, fmod_obj);
+       prog = bpf_object__next_program(fmod_obj, NULL);
        err = bpf_program__set_attach_target(prog, attach_prog_fd, NULL);
        ASSERT_OK(err, "fmod_ret_set_attach_target");
 
@@ -352,7 +352,7 @@ static void test_obj_load_failure_common(const char *obj_file,
        if (!ASSERT_OK_PTR(obj, "obj_open"))
                goto close_prog;
 
-       prog = bpf_program__next(NULL, obj);
+       prog = bpf_object__next_program(obj, NULL);
        err = bpf_program__set_attach_target(prog, pkt_fd, NULL);
        ASSERT_OK(err, "set_attach_target");
 

diff --git a/tools/testing/selftests/bpf/prog_tests/select_reuseport.c b/tools/testing/selftests/bpf/prog_tests/select_reuseport.c
index 4efd337..d40e915 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/select_reuseport.c
+++ b/tools/testing/selftests/bpf/prog_tests/select_reuseport.c
@@ -114,7 +114,7 @@ static int prepare_bpf_obj(void)
        err = bpf_object__load(obj);
        RET_ERR(err, "load bpf_object", "err:%d\n", err);
 
-       prog = bpf_program__next(NULL, obj);
+       prog = bpf_object__next_program(obj, NULL);
        RET_ERR(!prog, "get first bpf_program", "!prog\n");
        select_by_skb_data_prog = bpf_program__fd(prog);
        RET_ERR(select_by_skb_data_prog < 0, "get prog fd",

diff --git a/tools/testing/selftests/bpf/prog_tests/tcp_rtt.c b/tools/testing/selftests/bpf/prog_tests/tcp_rtt.c
index d207e96..265b4fe 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/tcp_rtt.c
+++ b/tools/testing/selftests/bpf/prog_tests/tcp_rtt.c
@@ -109,7 +109,7 @@ static int run_test(int cgroup_fd, int server_fd)
                return -1;
        }
 
-       map = bpf_map__next(NULL, obj);
+       map = bpf_object__next_map(obj, NULL);
        map_fd = bpf_map__fd(map);
 
        err = bpf_prog_attach(prog_fd, cgroup_fd, BPF_CGROUP_SOCK_OPS, 0);

diff --git a/tools/testing/selftests/bpf/xdping.c b/tools/testing/selftests/bpf/xdping.c
index 79a3453..30f1263 100644 (file)
--- a/tools/testing/selftests/bpf/xdping.c
+++ b/tools/testing/selftests/bpf/xdping.c
@@ -187,7 +187,7 @@ int main(int argc, char **argv)
                return 1;
        }
 
-       map = bpf_map__next(NULL, obj);
+       map = bpf_object__next_map(obj, NULL);
        if (map)
                map_fd = bpf_map__fd(map);
        if (!map || map_fd < 0) {