selftests/bpf: Normalize selftest entry points

Ensure that all test entry points are global void functions with no
input arguments. Mark few subtest entry points as static.

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20211022223228.99920-2-andrii@kernel.org

diff --git a/tools/testing/selftests/bpf/prog_tests/btf_dump.c b/tools/testing/selftests/bpf/prog_tests/btf_dump.c
index 3d837a7019fd43dd8a099baec37d1decfa425b22..aa76360d8f4990ada76623324092df2a66a746b9 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/btf_dump.c
+++ b/tools/testing/selftests/bpf/prog_tests/btf_dump.c
@@ -133,7 +133,7 @@ static char *dump_buf;
 static size_t dump_buf_sz;
 static FILE *dump_buf_file;
 
-void test_btf_dump_incremental(void)
+static void test_btf_dump_incremental(void)
 {
        struct btf *btf = NULL;
        struct btf_dump *d = NULL;

diff --git a/tools/testing/selftests/bpf/prog_tests/resolve_btfids.c b/tools/testing/selftests/bpf/prog_tests/resolve_btfids.c
index badda6309fd9088dfc1edf86a866dc7bc6a42cd7..f4a13d9dd5c8bf9676cf5a1033dad681454cce32 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/resolve_btfids.c
+++ b/tools/testing/selftests/bpf/prog_tests/resolve_btfids.c
@@ -117,14 +117,14 @@ static int resolve_symbols(void)
        return 0;
 }
 
-int test_resolve_btfids(void)
+void test_resolve_btfids(void)
 {
        __u32 *test_list, *test_lists[] = { test_list_local, test_list_global };
        unsigned int i, j;
        int ret = 0;
 
        if (resolve_symbols())
-               return -1;
+               return;
 
        /* Check BTF_ID_LIST(test_list_local) and
         * BTF_ID_LIST_GLOBAL(test_list_global) IDs
@@ -138,7 +138,7 @@ int test_resolve_btfids(void)
                                    test_symbols[i].name,
                                    test_list[i], test_symbols[i].id);
                        if (ret)
-                               return ret;
+                               return;
                }
        }
 
@@ -161,9 +161,7 @@ int test_resolve_btfids(void)
 
                if (i > 0) {
                        if (!ASSERT_LE(test_set.ids[i - 1], test_set.ids[i], "sort_check"))
-                               return -1;
+                               return;
                }
        }
-
-       return ret;
 }

diff --git a/tools/testing/selftests/bpf/prog_tests/signal_pending.c b/tools/testing/selftests/bpf/prog_tests/signal_pending.c
index dfcbddcbe4d3f94cc7da06ec7d4a6ca907185603..fdfdcff6cbef0034243c7631b8e1c13b473db7eb 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/signal_pending.c
+++ b/tools/testing/selftests/bpf/prog_tests/signal_pending.c
@@ -42,7 +42,7 @@ static void test_signal_pending_by_type(enum bpf_prog_type prog_type)
        signal(SIGALRM, SIG_DFL);
 }
 
-void test_signal_pending(enum bpf_prog_type prog_type)
+void test_signal_pending(void)
 {
        test_signal_pending_by_type(BPF_PROG_TYPE_SOCKET_FILTER);
        test_signal_pending_by_type(BPF_PROG_TYPE_FLOW_DISSECTOR);

diff --git a/tools/testing/selftests/bpf/prog_tests/snprintf.c b/tools/testing/selftests/bpf/prog_tests/snprintf.c
index 8fd1b4b29a0e0b2ab41706aac43b7568693ca4a6..394ebfc3bbf31060af8c6e2747bbeb9903b1164b 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/snprintf.c
+++ b/tools/testing/selftests/bpf/prog_tests/snprintf.c
@@ -33,7 +33,7 @@
 
 #define EXP_NO_BUF_RET 29
 
-void test_snprintf_positive(void)
+static void test_snprintf_positive(void)
 {
        char exp_addr_out[] = EXP_ADDR_OUT;
        char exp_sym_out[]  = EXP_SYM_OUT;
@@ -103,7 +103,7 @@ static int load_single_snprintf(char *fmt)
        return ret;
 }
 
-void test_snprintf_negative(void)
+static void test_snprintf_negative(void)
 {
        ASSERT_OK(load_single_snprintf("valid %d"), "valid usage");
 

diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c b/tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c
index d5c98f2cb12fb151a364f02dc8e495fd0a927678..f529e3c923ae71bd1190c071d283ac09d91a0a0d 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c
+++ b/tools/testing/selftests/bpf/prog_tests/xdp_adjust_tail.c
@@ -2,7 +2,7 @@
 #include <test_progs.h>
 #include <network_helpers.h>
 
-void test_xdp_adjust_tail_shrink(void)
+static void test_xdp_adjust_tail_shrink(void)
 {
        const char *file = "./test_xdp_adjust_tail_shrink.o";
        __u32 duration, retval, size, expect_sz;
@@ -30,7 +30,7 @@ void test_xdp_adjust_tail_shrink(void)
        bpf_object__close(obj);
 }
 
-void test_xdp_adjust_tail_grow(void)
+static void test_xdp_adjust_tail_grow(void)
 {
        const char *file = "./test_xdp_adjust_tail_grow.o";
        struct bpf_object *obj;
@@ -58,7 +58,7 @@ void test_xdp_adjust_tail_grow(void)
        bpf_object__close(obj);
 }
 
-void test_xdp_adjust_tail_grow2(void)
+static void test_xdp_adjust_tail_grow2(void)
 {
        const char *file = "./test_xdp_adjust_tail_grow.o";
        char buf[4096]; /* avoid segfault: large buf to hold grow results */

diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c b/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c
index d4e9a9972a67eca6c450a67888923c01d6893aef..3079d5568f8fac1185a94366015afea83c867087 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c
+++ b/tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c
@@ -8,7 +8,7 @@
 
 #define IFINDEX_LO 1
 
-void test_xdp_with_devmap_helpers(void)
+static void test_xdp_with_devmap_helpers(void)
 {
        struct test_xdp_with_devmap_helpers *skel;
        struct bpf_prog_info info = {};
@@ -60,7 +60,7 @@ out_close:
        test_xdp_with_devmap_helpers__destroy(skel);
 }
 
-void test_neg_xdp_devmap_helpers(void)
+static void test_neg_xdp_devmap_helpers(void)
 {
        struct test_xdp_devmap_helpers *skel;