selftests/bpf: Factor out many args tests from tracing_struct

Factor out many args tests from tracing_struct and rename some function names
to make more sense. Meanwhile, remove unnecessary skeleton detach operation
as it will be covered by skeleton destroy operation.

Signed-off-by: Pu Lehui <pulehui@huawei.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Link: https://lore.kernel.org/bpf/20240702121944.1091530-3-pulehui@huaweicloud.com

diff --git a/tools/testing/selftests/bpf/prog_tests/tracing_struct.c b/tools/testing/selftests/bpf/prog_tests/tracing_struct.c
index fe0fb0c9849ade3bde317a381d6edc26c3ecdebf..cb2a95da2617c77dc4e3a16df701080b2e0285fa 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/tracing_struct.c
+++ b/tools/testing/selftests/bpf/prog_tests/tracing_struct.c
@@ -3,8 +3,9 @@
 
 #include <test_progs.h>
 #include "tracing_struct.skel.h"
+#include "tracing_struct_many_args.skel.h"
 
-static void test_fentry(void)
+static void test_struct_args(void)
 {
        struct tracing_struct *skel;
        int err;
@@ -55,6 +56,25 @@ static void test_fentry(void)
 
        ASSERT_EQ(skel->bss->t6, 1, "t6 ret");
 
+destroy_skel:
+       tracing_struct__destroy(skel);
+}
+
+static void test_struct_many_args(void)
+{
+       struct tracing_struct_many_args *skel;
+       int err;
+
+       skel = tracing_struct_many_args__open_and_load();
+       if (!ASSERT_OK_PTR(skel, "tracing_struct_many_args__open_and_load"))
+               return;
+
+       err = tracing_struct_many_args__attach(skel);
+       if (!ASSERT_OK(err, "tracing_struct_many_args__attach"))
+               goto destroy_skel;
+
+       ASSERT_OK(trigger_module_test_read(256), "trigger_read");
+
        ASSERT_EQ(skel->bss->t7_a, 16, "t7:a");
        ASSERT_EQ(skel->bss->t7_b, 17, "t7:b");
        ASSERT_EQ(skel->bss->t7_c, 18, "t7:c");
@@ -74,12 +94,14 @@ static void test_fentry(void)
        ASSERT_EQ(skel->bss->t8_g, 23, "t8:g");
        ASSERT_EQ(skel->bss->t8_ret, 156, "t8 ret");
 
-       tracing_struct__detach(skel);
 destroy_skel:
-       tracing_struct__destroy(skel);
+       tracing_struct_many_args__destroy(skel);
 }
 
 void test_tracing_struct(void)
 {
-       test_fentry();
+       if (test__start_subtest("struct_args"))
+               test_struct_args();
+       if (test__start_subtest("struct_many_args"))
+               test_struct_many_args();
 }

diff --git a/tools/testing/selftests/bpf/progs/tracing_struct.c b/tools/testing/selftests/bpf/progs/tracing_struct.c
index 515daef3c84ba4bbde2516cf89bbb507ff9dbfe1..c435a3a8328ab1580c63967a7f0ab779aa7ca4d4 100644 (file)
--- a/tools/testing/selftests/bpf/progs/tracing_struct.c
+++ b/tools/testing/selftests/bpf/progs/tracing_struct.c
@@ -18,11 +18,6 @@ struct bpf_testmod_struct_arg_3 {
        int b[];
 };
 
-struct bpf_testmod_struct_arg_4 {
-       u64 a;
-       int b;
-};
-
 long t1_a_a, t1_a_b, t1_b, t1_c, t1_ret, t1_nregs;
 __u64 t1_reg0, t1_reg1, t1_reg2, t1_reg3;
 long t2_a, t2_b_a, t2_b_b, t2_c, t2_ret;
@@ -30,9 +25,6 @@ long t3_a, t3_b, t3_c_a, t3_c_b, t3_ret;
 long t4_a_a, t4_b, t4_c, t4_d, t4_e_a, t4_e_b, t4_ret;
 long t5_ret;
 int t6;
-long t7_a, t7_b, t7_c, t7_d, t7_e, t7_f_a, t7_f_b, t7_ret;
-long t8_a, t8_b, t8_c, t8_d, t8_e, t8_f_a, t8_f_b, t8_g, t8_ret;
-
 
 SEC("fentry/bpf_testmod_test_struct_arg_1")
 int BPF_PROG2(test_struct_arg_1, struct bpf_testmod_struct_arg_2, a, int, b, int, c)
@@ -138,50 +130,4 @@ int BPF_PROG2(test_struct_arg_11, struct bpf_testmod_struct_arg_3 *, a)
        return 0;
 }
 
-SEC("fentry/bpf_testmod_test_struct_arg_7")
-int BPF_PROG2(test_struct_arg_12, __u64, a, void *, b, short, c, int, d,
-             void *, e, struct bpf_testmod_struct_arg_4, f)
-{
-       t7_a = a;
-       t7_b = (long)b;
-       t7_c = c;
-       t7_d = d;
-       t7_e = (long)e;
-       t7_f_a = f.a;
-       t7_f_b = f.b;
-       return 0;
-}
-
-SEC("fexit/bpf_testmod_test_struct_arg_7")
-int BPF_PROG2(test_struct_arg_13, __u64, a, void *, b, short, c, int, d,
-             void *, e, struct bpf_testmod_struct_arg_4, f, int, ret)
-{
-       t7_ret = ret;
-       return 0;
-}
-
-SEC("fentry/bpf_testmod_test_struct_arg_8")
-int BPF_PROG2(test_struct_arg_14, __u64, a, void *, b, short, c, int, d,
-             void *, e, struct bpf_testmod_struct_arg_4, f, int, g)
-{
-       t8_a = a;
-       t8_b = (long)b;
-       t8_c = c;
-       t8_d = d;
-       t8_e = (long)e;
-       t8_f_a = f.a;
-       t8_f_b = f.b;
-       t8_g = g;
-       return 0;
-}
-
-SEC("fexit/bpf_testmod_test_struct_arg_8")
-int BPF_PROG2(test_struct_arg_15, __u64, a, void *, b, short, c, int, d,
-             void *, e, struct bpf_testmod_struct_arg_4, f, int, g,
-             int, ret)
-{
-       t8_ret = ret;
-       return 0;
-}
-
 char _license[] SEC("license") = "GPL";

diff --git a/tools/testing/selftests/bpf/progs/tracing_struct_many_args.c b/tools/testing/selftests/bpf/progs/tracing_struct_many_args.c
new file mode 100644 (file)
index 0000000..3de4bb9
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/tracing_struct_many_args.c
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <vmlinux.h>
+#include <bpf/bpf_tracing.h>
+#include <bpf/bpf_helpers.h>
+
+struct bpf_testmod_struct_arg_4 {
+       u64 a;
+       int b;
+};
+
+long t7_a, t7_b, t7_c, t7_d, t7_e, t7_f_a, t7_f_b, t7_ret;
+long t8_a, t8_b, t8_c, t8_d, t8_e, t8_f_a, t8_f_b, t8_g, t8_ret;
+
+SEC("fentry/bpf_testmod_test_struct_arg_7")
+int BPF_PROG2(test_struct_many_args_1, __u64, a, void *, b, short, c, int, d,
+             void *, e, struct bpf_testmod_struct_arg_4, f)
+{
+       t7_a = a;
+       t7_b = (long)b;
+       t7_c = c;
+       t7_d = d;
+       t7_e = (long)e;
+       t7_f_a = f.a;
+       t7_f_b = f.b;
+       return 0;
+}
+
+SEC("fexit/bpf_testmod_test_struct_arg_7")
+int BPF_PROG2(test_struct_many_args_2, __u64, a, void *, b, short, c, int, d,
+             void *, e, struct bpf_testmod_struct_arg_4, f, int, ret)
+{
+       t7_ret = ret;
+       return 0;
+}
+
+SEC("fentry/bpf_testmod_test_struct_arg_8")
+int BPF_PROG2(test_struct_many_args_3, __u64, a, void *, b, short, c, int, d,
+             void *, e, struct bpf_testmod_struct_arg_4, f, int, g)
+{
+       t8_a = a;
+       t8_b = (long)b;
+       t8_c = c;
+       t8_d = d;
+       t8_e = (long)e;
+       t8_f_a = f.a;
+       t8_f_b = f.b;
+       t8_g = g;
+       return 0;
+}
+
+SEC("fexit/bpf_testmod_test_struct_arg_8")
+int BPF_PROG2(test_struct_many_args_4, __u64, a, void *, b, short, c, int, d,
+             void *, e, struct bpf_testmod_struct_arg_4, f, int, g,
+             int, ret)
+{
+       t8_ret = ret;
+       return 0;
+}
+
+char _license[] SEC("license") = "GPL";