@@ -349,7 +349,8 @@ LINKED_SKELS := test_static_linked.skel.h linked_funcs.skel.h \
linked_vars.skel.h linked_maps.skel.h \
test_subskeleton.skel.h test_subskeleton_lib.skel.h \
test_usdt.skel.h tracing_multi_fentry_test.skel.h \
- tracing_multi_fexit_test.skel.h
+ tracing_multi_fexit_test.skel.h \
+ tracing_multi_fentry_fexit_test.skel.h
LSKELS := kfunc_call_test.c fentry_test.c fexit_test.c fexit_sleep.c \
test_ringbuf.c atomics.c trace_printk.c trace_vprintk.c \
@@ -369,6 +370,7 @@ test_subskeleton_lib.skel.h-deps := test_subskeleton_lib2.o test_subskeleton_lib
test_usdt.skel.h-deps := test_usdt.o test_usdt_multispec.o
tracing_multi_fentry_test.skel.h-deps := tracing_multi_fentry.o tracing_multi_check.o
tracing_multi_fexit_test.skel.h-deps := tracing_multi_fexit.o tracing_multi_check.o
+tracing_multi_fentry_fexit_test.skel.h-deps := tracing_multi_fentry_fexit.o tracing_multi_check.o
LINKED_BPF_SRCS := $(patsubst %.o,%.c,$(foreach skel,$(LINKED_SKELS),$($(skel)-deps)))
@@ -2,6 +2,7 @@
#include <test_progs.h>
#include "tracing_multi_fentry_test.skel.h"
#include "tracing_multi_fexit_test.skel.h"
+#include "tracing_multi_fentry_fexit_test.skel.h"
#include "trace_helpers.h"
static void multi_fentry_test(void)
@@ -53,10 +54,38 @@ static void multi_fexit_test(void)
tracing_multi_fexit_test__destroy(skel);
}
+static void multi_fentry_fexit_test(void)
+{
+ LIBBPF_OPTS(bpf_test_run_opts, topts);
+ struct tracing_multi_fentry_fexit_test *skel = NULL;
+ int err, prog_fd;
+
+ skel = tracing_multi_fentry_fexit_test__open_and_load();
+ if (!ASSERT_OK_PTR(skel, "tracing_multi_fentry_fexit_test__open_and_load"))
+ goto cleanup;
+
+ err = tracing_multi_fentry_fexit_test__attach(skel);
+ if (!ASSERT_OK(err, "tracing_multi_fentry_fexit_test__attach"))
+ goto cleanup;
+
+ prog_fd = bpf_program__fd(skel->progs.test2);
+ err = bpf_prog_test_run_opts(prog_fd, &topts);
+ ASSERT_OK(err, "test_run");
+
+ ASSERT_EQ(skel->bss->test1_arg_result, 8, "test1_arg_result");
+ ASSERT_EQ(skel->bss->test2_arg_result, 8, "test2_arg_result");
+ ASSERT_EQ(skel->bss->test2_ret_result, 8, "test2_ret_result");
+
+cleanup:
+ tracing_multi_fentry_fexit_test__destroy(skel);
+}
+
void test_tracing_multi_test(void)
{
if (test__start_subtest("fentry"))
multi_fentry_test();
if (test__start_subtest("fexit"))
multi_fexit_test();
+ if (test__start_subtest("fentry_fexit"))
+ multi_fentry_fexit_test();
}
new file mode 100644
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <linux/bpf.h>
+#include <bpf/bpf_helpers.h>
+#include <bpf/bpf_tracing.h>
+
+char _license[] SEC("license") = "GPL";
+
+__u64 test1_arg_result = 0;
+__u64 test2_arg_result = 0;
+__u64 test2_ret_result = 0;
+
+__hidden extern void multi_arg_check(__u64 *ctx, __u64 *test_result);
+__hidden extern void multi_ret_check(void *ctx, __u64 *test_result);
+
+SEC("fentry.multi/bpf_fentry_test*")
+int BPF_PROG(test1, __u64 a, __u64 b, __u64 c, __u64 d, __u64 e, __u64 f)
+{
+ multi_arg_check(ctx, &test1_arg_result);
+ return 0;
+}
+
+SEC("fexit.multi/bpf_fentry_test*")
+int BPF_PROG(test2, __u64 a, __u64 b, __u64 c, __u64 d, __u64 e, __u64 f, int ret)
+{
+ multi_arg_check(ctx, &test2_arg_result);
+ multi_ret_check(ctx, &test2_ret_result);
+ return 0;
+}
Adding selftest for fentry/fexit multi func tests that attaches to bpf_fentry_test* functions and checks argument values based on the processed function. Signed-off-by: Jiri Olsa <jolsa@kernel.org> --- tools/testing/selftests/bpf/Makefile | 4 ++- .../selftests/bpf/prog_tests/tracing_multi.c | 29 +++++++++++++++++++ .../bpf/progs/tracing_multi_fentry_fexit.c | 28 ++++++++++++++++++ 3 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/bpf/progs/tracing_multi_fentry_fexit.c