]> www.infradead.org Git - users/hch/misc.git/commitdiff
bpf: Allow syscall bpf programs to call non-recur helpers
authorAmery Hung <ameryhung@gmail.com>
Wed, 30 Jul 2025 18:58:52 +0000 (11:58 -0700)
committerAlexei Starovoitov <ast@kernel.org>
Sat, 2 Aug 2025 01:00:46 +0000 (18:00 -0700)
Allow syscall programs to call non-recur helpers too since syscall bpf
programs runs in process context through bpf syscall, BPF_PROG_TEST_RUN,
and cannot run recursively.

bpf_task_storage_{get,set} have "_recur" versions that call trylock
instead of taking the lock directly to avoid deadlock when called by
bpf programs that run recursively. Currently, only bpf_lsm, bpf_iter,
struct_ops without private stack are allow to call the non-recur helpers
since they cannot be recursively called in another bpf program.

Signed-off-by: Amery Hung <ameryhung@gmail.com>
Reviewed-by: Emil Tsalapatis <emil@etsalapatis.com>
Link: https://lore.kernel.org/r/20250730185903.3574598-2-ameryhung@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
include/linux/bpf_verifier.h

index 94defa405c85e33665a539668f5ad662ff2ba6b5..c823f8efe3edd2650137f9804f93a44e34029ce3 100644 (file)
@@ -962,6 +962,7 @@ static inline bool bpf_prog_check_recur(const struct bpf_prog *prog)
        case BPF_PROG_TYPE_STRUCT_OPS:
                return prog->aux->jits_use_priv_stack;
        case BPF_PROG_TYPE_LSM:
+       case BPF_PROG_TYPE_SYSCALL:
                return false;
        default:
                return true;