]> www.infradead.org Git - users/jedix/linux-maple.git/commit
bpf: Pass the same orig_call value to trampoline functions
authorIlya Leoshkevich <iii@linux.ibm.com>
Mon, 12 May 2025 20:57:30 +0000 (22:57 +0200)
committerAlexei Starovoitov <ast@kernel.org>
Thu, 15 May 2025 00:48:57 +0000 (17:48 -0700)
commit94bde253d3ae5d8a01cb958663b12daef1d06574
treedc34302a635c9c62ad1205e7b12e55110e550816
parent5f55f2168432298f5a55294831ab6a76a10cb3c3
bpf: Pass the same orig_call value to trampoline functions

There is currently some confusion in the s390x JIT regarding whether
orig_call can be NULL and what that means. Originally the NULL value
was used to distinguish the struct_ops case, but this was superseded by
BPF_TRAMP_F_INDIRECT (see commit 0c970ed2f87c ("s390/bpf: Fix indirect
trampoline generation").

The remaining reason to have this check is that NULL can actually be
passed to the arch_bpf_trampoline_size() call - but not to the
respective arch_prepare_bpf_trampoline()! call - by
bpf_struct_ops_prepare_trampoline().

Remove this asymmetry by passing stub_func to both functions, so that
JITs may rely on orig_call never being NULL.

Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Acked-by: Martin KaFai Lau <martin.lau@kernel.org>
Link: https://lore.kernel.org/r/20250512221911.61314-2-iii@linux.ibm.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
kernel/bpf/bpf_struct_ops.c