selftests/bpf: Test struct_ops program with __ref arg calling bpf_tail_call
authorAmery Hung <ameryhung@gmail.com>
Thu, 20 Feb 2025 22:15:32 +0000 (14:15 -0800)
committerAlexei Starovoitov <ast@kernel.org>
Fri, 21 Feb 2025 02:44:35 +0000 (18:44 -0800)
Test if the verifier rejects struct_ops program with __ref argument
calling bpf_tail_call().

Signed-off-by: Amery Hung <ameryhung@gmail.com>
Acked-by: Eduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/r/20250220221532.1079331-2-ameryhung@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
tools/testing/selftests/bpf/prog_tests/test_struct_ops_refcounted.c
tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__tail_call.c [new file with mode: 0644]
tools/testing/selftests/bpf/test_kmods/bpf_testmod.c

index e290a2f6db9570bebdf658c6bda4ff01d04a2fef..da60c715fc5948e5f3045ca089c9a01b9cfbd612 100644 (file)
@@ -3,10 +3,12 @@
 #include "struct_ops_refcounted.skel.h"
 #include "struct_ops_refcounted_fail__ref_leak.skel.h"
 #include "struct_ops_refcounted_fail__global_subprog.skel.h"
+#include "struct_ops_refcounted_fail__tail_call.skel.h"
 
 void test_struct_ops_refcounted(void)
 {
        RUN_TESTS(struct_ops_refcounted);
        RUN_TESTS(struct_ops_refcounted_fail__ref_leak);
        RUN_TESTS(struct_ops_refcounted_fail__global_subprog);
+       RUN_TESTS(struct_ops_refcounted_fail__tail_call);
 }
diff --git a/tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__tail_call.c b/tools/testing/selftests/bpf/progs/struct_ops_refcounted_fail__tail_call.c
new file mode 100644 (file)
index 0000000..3b12502
--- /dev/null
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c) 2025 Meta Platforms, Inc. and affiliates. */
+#include <vmlinux.h>
+#include <bpf/bpf_tracing.h>
+#include "../test_kmods/bpf_testmod.h"
+#include "bpf_misc.h"
+
+char _license[] SEC("license") = "GPL";
+
+struct {
+       __uint(type, BPF_MAP_TYPE_PROG_ARRAY);
+       __uint(max_entries, 1);
+       __uint(key_size, sizeof(__u32));
+       __uint(value_size, sizeof(__u32));
+} prog_array SEC(".maps");
+
+/* Test that the verifier rejects a program with referenced kptr arguments
+ * that tail call
+ */
+SEC("struct_ops/test_refcounted")
+__failure __msg("program with __ref argument cannot tail call")
+int refcounted_fail__tail_call(unsigned long long *ctx)
+{
+       struct task_struct *task = (struct task_struct *)ctx[1];
+
+       bpf_task_release(task);
+       bpf_tail_call(ctx, &prog_array, 0);
+
+       return 0;
+}
+
+SEC(".struct_ops.link")
+struct bpf_testmod_ops testmod_ref_acquire = {
+       .test_refcounted = (void *)refcounted_fail__tail_call,
+};
+
index 89dc502de9d49880fd56e1b76a8ee7770da14eb2..578bfc40dd052850688abfb753e5494c141c5d80 100644 (file)
@@ -1130,6 +1130,7 @@ static const struct btf_kfunc_id_set bpf_testmod_kfunc_set = {
 };
 
 static const struct bpf_verifier_ops bpf_testmod_verifier_ops = {
+       .get_func_proto  = bpf_base_func_proto,
        .is_valid_access = bpf_testmod_ops_is_valid_access,
 };