s390/bpf: Remove the orig_call NULL check
authorIlya Leoshkevich <iii@linux.ibm.com>
Mon, 12 May 2025 20:57:31 +0000 (22:57 +0200)
committerAlexei Starovoitov <ast@kernel.org>
Thu, 15 May 2025 00:48:57 +0000 (17:48 -0700)
Now that orig_call can never be NULL, remove the respective check.

Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Link: https://lore.kernel.org/r/20250512221911.61314-3-iii@linux.ibm.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
arch/s390/net/bpf_jit_comp.c

index 945106b5562db02ffcc9310cb5d3694f6dc1e322..6f22b5199c2013bc7d000b81ca455be8b9ebe1fb 100644 (file)
@@ -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;
 
        /*