On Sun, Oct 3, 2021 at 10:00 AM Hengqi Chen <hengqi.chen@xxxxxxxxx> wrote:
>
> 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@xxxxxxxxx>
Acked-by: Song Liu <songliubraving@xxxxxx>
> ---
> tools/testing/selftests/bpf/prog_tests/btf.c | 2 +-
> tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c | 6 +++---
> tools/testing/selftests/bpf/prog_tests/select_reuseport.c | 2 +-
> tools/testing/selftests/bpf/prog_tests/tcp_rtt.c | 2 +-
> tools/testing/selftests/bpf/xdping.c | 2 +-
> 5 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/btf.c b/tools/testing/selftests/bpf/prog_tests/btf.c
> index 9c85d7d27409..acd33d0cd5d9 100644
> --- 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 c7c1816899bf..2839f4270a26 100644
> --- 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 4efd337d6a3c..d40e9156c48d 100644
> --- 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 d207e968e6b1..265b4fe33ec3 100644
> --- 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 79a3453dab25..30f12637f4e4 100644
> --- 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) {
> --
> 2.25.1
