From: Ilya Leoshkevich Date: Mon, 12 May 2025 20:57:31 +0000 (+0200) Subject: s390/bpf: Remove the orig_call NULL check X-Git-Tag: v6.16-rc1~131^2~21^2 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=8e57cf09c84cac99eb31354a3cc70f8b8981bfc2;p=linux-2.6-block.git s390/bpf: Remove the orig_call NULL check Now that orig_call can never be NULL, remove the respective check. Signed-off-by: Ilya Leoshkevich Link: https://lore.kernel.org/r/20250512221911.61314-3-iii@linux.ibm.com Signed-off-by: Alexei Starovoitov --- diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c index 945106b5562d..6f22b5199c20 100644 --- a/arch/s390/net/bpf_jit_comp.c +++ b/arch/s390/net/bpf_jit_comp.c @@ -2583,9 +2583,8 @@ static int __arch_prepare_bpf_trampoline(struct bpf_tramp_image *im, if (nr_stack_args > MAX_NR_STACK_ARGS) return -ENOTSUPP; - /* Return to %r14, since func_addr and %r0 are not available. */ - if ((!func_addr && !(flags & BPF_TRAMP_F_ORIG_STACK)) || - (flags & BPF_TRAMP_F_INDIRECT)) + /* Return to %r14 in the struct_ops case. */ + if (flags & BPF_TRAMP_F_INDIRECT) flags |= BPF_TRAMP_F_SKIP_FRAME; /*