selfetest/bpf: Make some tests serial
authorYucong Sun <sunyucong@gmail.com>
Wed, 6 Oct 2021 18:56:19 +0000 (11:56 -0700)
committerAndrii Nakryiko <andrii@kernel.org>
Fri, 8 Oct 2021 22:17:00 +0000 (15:17 -0700)
Change tests that often fails in parallel execution mode to serial.

Signed-off-by: Yucong Sun <sunyucong@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20211006185619.364369-15-fallentree@fb.com
38 files changed:
tools/testing/selftests/bpf/prog_tests/bpf_iter_setsockopt.c
tools/testing/selftests/bpf/prog_tests/bpf_obj_id.c
tools/testing/selftests/bpf/prog_tests/cg_storage_multi.c
tools/testing/selftests/bpf/prog_tests/cgroup_attach_autodetach.c
tools/testing/selftests/bpf/prog_tests/cgroup_attach_multi.c
tools/testing/selftests/bpf/prog_tests/cgroup_attach_override.c
tools/testing/selftests/bpf/prog_tests/cgroup_link.c
tools/testing/selftests/bpf/prog_tests/check_mtu.c
tools/testing/selftests/bpf/prog_tests/fexit_bpf2bpf.c
tools/testing/selftests/bpf/prog_tests/flow_dissector_load_bytes.c
tools/testing/selftests/bpf/prog_tests/flow_dissector_reattach.c
tools/testing/selftests/bpf/prog_tests/get_branch_snapshot.c
tools/testing/selftests/bpf/prog_tests/kfree_skb.c
tools/testing/selftests/bpf/prog_tests/migrate_reuseport.c
tools/testing/selftests/bpf/prog_tests/modify_return.c
tools/testing/selftests/bpf/prog_tests/ns_current_pid_tgid.c
tools/testing/selftests/bpf/prog_tests/perf_buffer.c
tools/testing/selftests/bpf/prog_tests/perf_link.c
tools/testing/selftests/bpf/prog_tests/probe_user.c
tools/testing/selftests/bpf/prog_tests/raw_tp_writable_test_run.c
tools/testing/selftests/bpf/prog_tests/select_reuseport.c
tools/testing/selftests/bpf/prog_tests/send_signal_sched_switch.c
tools/testing/selftests/bpf/prog_tests/sk_storage_tracing.c
tools/testing/selftests/bpf/prog_tests/snprintf_btf.c
tools/testing/selftests/bpf/prog_tests/sock_fields.c
tools/testing/selftests/bpf/prog_tests/sockmap_listen.c
tools/testing/selftests/bpf/prog_tests/timer.c
tools/testing/selftests/bpf/prog_tests/timer_mim.c
tools/testing/selftests/bpf/prog_tests/tp_attach_query.c
tools/testing/selftests/bpf/prog_tests/trace_printk.c
tools/testing/selftests/bpf/prog_tests/trace_vprintk.c
tools/testing/selftests/bpf/prog_tests/trampoline_count.c
tools/testing/selftests/bpf/prog_tests/xdp_attach.c
tools/testing/selftests/bpf/prog_tests/xdp_bonding.c
tools/testing/selftests/bpf/prog_tests/xdp_cpumap_attach.c
tools/testing/selftests/bpf/prog_tests/xdp_devmap_attach.c
tools/testing/selftests/bpf/prog_tests/xdp_info.c
tools/testing/selftests/bpf/prog_tests/xdp_link.c

index 85babb0..b52ff8c 100644 (file)
@@ -179,7 +179,7 @@ done:
        free_fds(est_fds, nr_est);
 }
 
-void test_bpf_iter_setsockopt(void)
+void serial_test_bpf_iter_setsockopt(void)
 {
        struct bpf_iter_setsockopt *iter_skel = NULL;
        struct bpf_cubic *cubic_skel = NULL;
index 284d592..eb8eeeb 100644 (file)
@@ -3,7 +3,7 @@
 
 #define nr_iters 2
 
-void test_bpf_obj_id(void)
+void serial_test_bpf_obj_id(void)
 {
        const __u64 array_magic_value = 0xfaceb00c;
        const __u32 array_key = 0;
index 876be0e..621c572 100644 (file)
@@ -363,7 +363,7 @@ close_bpf_object:
        cg_storage_multi_shared__destroy(obj);
 }
 
-void test_cg_storage_multi(void)
+void serial_test_cg_storage_multi(void)
 {
        int parent_cgroup_fd = -1, child_cgroup_fd = -1;
 
index 70e94e7..5de485c 100644 (file)
@@ -21,7 +21,7 @@ static int prog_load(void)
                               bpf_log_buf, BPF_LOG_BUF_SIZE);
 }
 
-void test_cgroup_attach_autodetach(void)
+void serial_test_cgroup_attach_autodetach(void)
 {
        __u32 duration = 0, prog_cnt = 4, attach_flags;
        int allow_prog[2] = {-1};
index 20bb883..731bea8 100644 (file)
@@ -74,7 +74,7 @@ static int prog_load_cnt(int verdict, int val)
        return ret;
 }
 
-void test_cgroup_attach_multi(void)
+void serial_test_cgroup_attach_multi(void)
 {
        __u32 prog_ids[4], prog_cnt = 0, attach_flags, saved_prog_id;
        int cg1 = 0, cg2 = 0, cg3 = 0, cg4 = 0, cg5 = 0, key = 0;
index 9e96f8d..10d3c33 100644 (file)
@@ -23,7 +23,7 @@ static int prog_load(int verdict)
                               bpf_log_buf, BPF_LOG_BUF_SIZE);
 }
 
-void test_cgroup_attach_override(void)
+void serial_test_cgroup_attach_override(void)
 {
        int drop_prog = -1, allow_prog = -1, foo = -1, bar = -1;
        __u32 duration = 0;
index 9091524..9e6e6aa 100644 (file)
@@ -24,7 +24,7 @@ int ping_and_check(int exp_calls, int exp_alt_calls)
        return 0;
 }
 
-void test_cgroup_link(void)
+void serial_test_cgroup_link(void)
 {
        struct {
                const char *path;
index 012068f..f73e6e3 100644 (file)
@@ -195,7 +195,7 @@ cleanup:
        test_check_mtu__destroy(skel);
 }
 
-void test_check_mtu(void)
+void serial_test_check_mtu(void)
 {
        __u32 mtu_lo;
 
index 2839f42..9cff14a 100644 (file)
@@ -380,7 +380,8 @@ static void test_func_map_prog_compatibility(void)
                                     "./test_attach_probe.o");
 }
 
-void test_fexit_bpf2bpf(void)
+/* NOTE: affect other tests, must run in serial mode */
+void serial_test_fexit_bpf2bpf(void)
 {
        if (test__start_subtest("target_no_callees"))
                test_target_no_callees();
index 0e8a4d2..6093728 100644 (file)
@@ -2,7 +2,7 @@
 #include <test_progs.h>
 #include <network_helpers.h>
 
-void test_flow_dissector_load_bytes(void)
+void serial_test_flow_dissector_load_bytes(void)
 {
        struct bpf_flow_keys flow_keys;
        __u32 duration = 0, retval, size;
index 3931ede..f0c6c22 100644 (file)
@@ -628,7 +628,7 @@ out_close:
        }
 }
 
-void test_flow_dissector_reattach(void)
+void serial_test_flow_dissector_reattach(void)
 {
        int err, new_net, saved_net;
 
index e4f92fe..d6d70a3 100644 (file)
@@ -73,7 +73,7 @@ static void close_perf_events(void)
        free(pfd_array);
 }
 
-void test_get_branch_snapshot(void)
+void serial_test_get_branch_snapshot(void)
 {
        struct get_branch_snapshot *skel = NULL;
        int err;
index ddfb6bf..032a322 100644 (file)
@@ -48,7 +48,8 @@ static void on_sample(void *ctx, int cpu, void *data, __u32 size)
        *(bool *)ctx = true;
 }
 
-void test_kfree_skb(void)
+/* TODO: fix kernel panic caused by this test in parallel mode */
+void serial_test_kfree_skb(void)
 {
        struct __sk_buff skb = {};
        struct bpf_prog_test_run_attr tattr = {
index 59adb47..7589c03 100644 (file)
@@ -541,7 +541,7 @@ close_servers:
        }
 }
 
-void test_migrate_reuseport(void)
+void serial_test_migrate_reuseport(void)
 {
        struct test_migrate_reuseport *skel;
        int i;
index 97fec70..b772fe3 100644 (file)
@@ -53,7 +53,8 @@ cleanup:
        modify_return__destroy(skel);
 }
 
-void test_modify_return(void)
+/* TODO: conflict with get_func_ip_test */
+void serial_test_modify_return(void)
 {
        run_test(0 /* input_retval */,
                 1 /* want_side_effect */,
index 2535788..24d4934 100644 (file)
@@ -78,7 +78,8 @@ static void test_ns_current_pid_tgid_new_ns(void)
                return;
 }
 
-void test_ns_current_pid_tgid(void)
+/* TODO: use a different tracepoint */
+void serial_test_ns_current_pid_tgid(void)
 {
        if (test__start_subtest("ns_current_pid_tgid_root_ns"))
                test_current_pid_tgid(NULL);
index 6490e96..6979aff 100644 (file)
@@ -43,7 +43,7 @@ int trigger_on_cpu(int cpu)
        return 0;
 }
 
-void test_perf_buffer(void)
+void serial_test_perf_buffer(void)
 {
        int err, on_len, nr_on_cpus = 0, nr_cpus, i;
        struct perf_buffer_opts pb_opts = {};
index b1abd0c..ede0734 100644 (file)
@@ -23,7 +23,8 @@ static void burn_cpu(void)
                ++j;
 }
 
-void test_perf_link(void)
+/* TODO: often fails in concurrent mode */
+void serial_test_perf_link(void)
 {
        struct test_perf_link *skel = NULL;
        struct perf_event_attr attr;
index 52fe157..abf890d 100644 (file)
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <test_progs.h>
 
-void test_probe_user(void)
+/* TODO: corrupts other tests uses connect() */
+void serial_test_probe_user(void)
 {
        const char *prog_name = "handle_sys_connect";
        const char *obj_file = "./test_probe_user.o";
index 5c45424..ddefa11 100644 (file)
@@ -3,7 +3,8 @@
 #include <test_progs.h>
 #include <linux/nbd.h>
 
-void test_raw_tp_writable_test_run(void)
+/* NOTE: conflict with other tests. */
+void serial_test_raw_tp_writable_test_run(void)
 {
        __u32 duration = 0;
        char error[4096];
index d40e915..3cfc910 100644 (file)
@@ -858,7 +858,7 @@ out:
        cleanup();
 }
 
-void test_select_reuseport(void)
+void serial_test_select_reuseport(void)
 {
        saved_tcp_fo = read_int_sysctl(TCP_FO_SYSCTL);
        if (saved_tcp_fo < 0)
index 189a34a..15dacfc 100644 (file)
@@ -25,7 +25,8 @@ static void *worker(void *p)
        return NULL;
 }
 
-void test_send_signal_sched_switch(void)
+/* NOTE: cause events loss */
+void serial_test_send_signal_sched_switch(void)
 {
        struct test_send_signal_kern *skel;
        pthread_t threads[THREAD_COUNT];
index 2b39259..547ae53 100644 (file)
@@ -105,7 +105,7 @@ out:
                close(listen_fd);
 }
 
-void test_sk_storage_tracing(void)
+void serial_test_sk_storage_tracing(void)
 {
        struct test_sk_storage_trace_itself *skel_itself;
        int err;
index 76e1f5f..dd41b82 100644 (file)
@@ -6,7 +6,7 @@
 /* Demonstrate that bpf_snprintf_btf succeeds and that various data types
  * are formatted correctly.
  */
-void test_snprintf_btf(void)
+void serial_test_snprintf_btf(void)
 {
        struct netif_receive_skb *skel;
        struct netif_receive_skb__bss *bss;
index 577d619..fae40db 100644 (file)
@@ -329,7 +329,7 @@ done:
                close(listen_fd);
 }
 
-void test_sock_fields(void)
+void serial_test_sock_fields(void)
 {
        struct bpf_link *egress_link = NULL, *ingress_link = NULL;
        int parent_cg_fd = -1, child_cg_fd = -1;
index 5c59790..102c73a 100644 (file)
@@ -2037,7 +2037,7 @@ static void run_tests(struct test_sockmap_listen *skel, struct bpf_map *map,
        test_udp_unix_redir(skel, map, family);
 }
 
-void test_sockmap_listen(void)
+void serial_test_sockmap_listen(void)
 {
        struct test_sockmap_listen *skel;
 
index 25f40e1..0f4e49e 100644 (file)
@@ -39,7 +39,8 @@ static int timer(struct timer *timer_skel)
        return 0;
 }
 
-void test_timer(void)
+/* TODO: use pid filtering */
+void serial_test_timer(void)
 {
        struct timer *timer_skel = NULL;
        int err;
index ced8f6c..949a061 100644 (file)
@@ -52,7 +52,7 @@ static int timer_mim(struct timer_mim *timer_skel)
        return 0;
 }
 
-void test_timer_mim(void)
+void serial_test_timer_mim(void)
 {
        struct timer_mim_reject *timer_reject_skel = NULL;
        libbpf_print_fn_t old_print_fn = NULL;
index fb095e5..8652d0a 100644 (file)
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <test_progs.h>
 
-void test_tp_attach_query(void)
+void serial_test_tp_attach_query(void)
 {
        const int num_progs = 3;
        int i, j, bytes, efd, err, prog_fd[num_progs], pmu_fd[num_progs];
index e47835f..3f7a714 100644 (file)
@@ -8,7 +8,7 @@
 #define TRACEBUF       "/sys/kernel/debug/tracing/trace_pipe"
 #define SEARCHMSG      "testing,testing"
 
-void test_trace_printk(void)
+void serial_test_trace_printk(void)
 {
        int err = 0, iter = 0, found = 0;
        struct trace_printk__bss *bss;
index 61a24e6..4610127 100644 (file)
@@ -8,7 +8,7 @@
 #define TRACEBUF       "/sys/kernel/debug/tracing/trace_pipe"
 #define SEARCHMSG      "1,2,3,4,5,6,7,8,9,10"
 
-void test_trace_vprintk(void)
+void serial_test_trace_vprintk(void)
 {
        int err = 0, iter = 0, found = 0;
        struct trace_vprintk__bss *bss;
index d7f5a93..fc14667 100644 (file)
@@ -41,7 +41,8 @@ static struct bpf_link *load(struct bpf_object *obj, const char *name)
        return bpf_program__attach_trace(prog);
 }
 
-void test_trampoline_count(void)
+/* TODO: use different target function to run in concurrent mode */
+void serial_test_trampoline_count(void)
 {
        const char *fentry_name = "fentry/__set_task_comm";
        const char *fexit_name = "fexit/__set_task_comm";
index 15ef353..4c40572 100644 (file)
@@ -4,7 +4,7 @@
 #define IFINDEX_LO 1
 #define XDP_FLAGS_REPLACE              (1U << 4)
 
-void test_xdp_attach(void)
+void serial_test_xdp_attach(void)
 {
        __u32 duration = 0, id1, id2, id0 = 0, len;
        struct bpf_object *obj1, *obj2, *obj3;
index ad3ba81..faa22b8 100644 (file)
@@ -519,7 +519,7 @@ static struct bond_test_case bond_test_cases[] = {
        { "xdp_bonding_xor_layer34", BOND_MODE_XOR, BOND_XMIT_POLICY_LAYER34, },
 };
 
-void test_xdp_bonding(void)
+void serial_test_xdp_bonding(void)
 {
        libbpf_print_fn_t old_print_fn;
        struct skeletons skeletons = {};
index 8755eff..fd812bd 100644 (file)
@@ -7,7 +7,7 @@
 
 #define IFINDEX_LO     1
 
-void test_xdp_cpumap_attach(void)
+void serial_test_xdp_cpumap_attach(void)
 {
        struct test_xdp_with_cpumap_helpers *skel;
        struct bpf_prog_info info = {};
index c72af03..d4e9a99 100644 (file)
@@ -72,7 +72,7 @@ void test_neg_xdp_devmap_helpers(void)
 }
 
 
-void test_xdp_devmap_attach(void)
+void serial_test_xdp_devmap_attach(void)
 {
        if (test__start_subtest("DEVMAP with programs in entries"))
                test_xdp_with_devmap_helpers();
index d2d7a28..4e2a4fd 100644 (file)
@@ -4,7 +4,7 @@
 
 #define IFINDEX_LO 1
 
-void test_xdp_info(void)
+void serial_test_xdp_info(void)
 {
        __u32 len = sizeof(struct bpf_prog_info), duration = 0, prog_id;
        const char *file = "./xdp_dummy.o";
index 46eed0a..983ab0b 100644 (file)
@@ -6,7 +6,7 @@
 
 #define IFINDEX_LO 1
 
-void test_xdp_link(void)
+void serial_test_xdp_link(void)
 {
        __u32 duration = 0, id1, id2, id0 = 0, prog_fd1, prog_fd2, err;
        DECLARE_LIBBPF_OPTS(bpf_xdp_set_link_opts, opts, .old_fd = -1);