selftests/bpf: Don't use deprecated libbpf APIs

Remove all uses of bpf_program__title() and
bpf_program__find_program_by_title().

Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20200903203542.15944-10-andriin@fb.com

diff --git a/tools/testing/selftests/bpf/flow_dissector_load.h b/tools/testing/selftests/bpf/flow_dissector_load.h
index daeaeb5188940540bad2aaedc055a22bc6f550c7..7290401ec1727e03b5114e377beb917d8c1abdf0 100644 (file)
--- a/tools/testing/selftests/bpf/flow_dissector_load.h
+++ b/tools/testing/selftests/bpf/flow_dissector_load.h
@@ -23,7 +23,13 @@ static inline int bpf_flow_load(struct bpf_object **obj,
        if (ret)
                return ret;
 
-       main_prog = bpf_object__find_program_by_title(*obj, section_name);
+       main_prog = NULL;
+       bpf_object__for_each_program(prog, *obj) {
+               if (strcmp(section_name, bpf_program__section_name(prog)) == 0) {
+                       main_prog = prog;
+                       break;
+               }
+       }
        if (!main_prog)
                return -1;
 

diff --git a/tools/testing/selftests/bpf/prog_tests/reference_tracking.c b/tools/testing/selftests/bpf/prog_tests/reference_tracking.c
index fc0d7f4f02cf43be16b5d5c11bbcc095f8350c41..ac1ee10cffd81d7bdf3e1394f26ee13a7a084d86 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/reference_tracking.c
+++ b/tools/testing/selftests/bpf/prog_tests/reference_tracking.c
@@ -27,7 +27,7 @@ void test_reference_tracking(void)
                const char *title;
 
                /* Ignore .text sections */
-               title = bpf_program__title(prog, false);
+               title = bpf_program__section_name(prog);
                if (strstr(title, ".text") != NULL)
                        continue;
 

diff --git a/tools/testing/selftests/bpf/test_socket_cookie.c b/tools/testing/selftests/bpf/test_socket_cookie.c
index 154a8fd2a48d97afbd01702763e9e2ff4b513e0d..ca7ca87e91aa4d302ba5e6bc373683ccdfd6675e 100644 (file)
--- a/tools/testing/selftests/bpf/test_socket_cookie.c
+++ b/tools/testing/selftests/bpf/test_socket_cookie.c
@@ -151,7 +151,7 @@ static int run_test(int cgfd)
        }
 
        bpf_object__for_each_program(prog, pobj) {
-               prog_name = bpf_program__title(prog, /*needs_copy*/ false);
+               prog_name = bpf_program__section_name(prog);
 
                if (libbpf_attach_type_by_name(prog_name, &attach_type))
                        goto err;