diff options
| author | Daniel Xu <dxu@dxuuu.xyz> | 2024-06-12 18:58:30 +0300 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2024-06-12 21:01:31 +0300 |
| commit | 2b8dd87332cd2782b5b3f0c423bd6693e487ed30 (patch) | |
| tree | 0a2fba86be896a371f7e8f39098b7eed0f695b60 /kernel | |
| parent | ac42f636dc11b2e8d6dea9dd5bb10a39c7bec342 (diff) | |
| download | linux-2b8dd87332cd2782b5b3f0c423bd6693e487ed30.tar.xz | |
bpf: Make bpf_session_cookie() kfunc return long *
We will soon be generating kfunc prototypes from BTF. As part of that,
we need to align the manual signatures in bpf_kfuncs.h with the actual
kfunc definitions. There is currently a conflicting signature for
bpf_session_cookie() w.r.t. return type.
The original intent was to return long * and not __u64 *. You can see
evidence of that intent in a3a5113393cc ("selftests/bpf: Add kprobe
session cookie test").
Fix conflict by changing kfunc definition.
Fixes: 5c919acef851 ("bpf: Add support for kprobe session cookie")
Signed-off-by: Daniel Xu <dxu@dxuuu.xyz>
Link: https://lore.kernel.org/r/7043e1c251ab33151d6e3830f8ea1902ed2604ac.1718207789.git.dxu@dxuuu.xyz
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/bpf_trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index d1daeab1bbc1..bc16e21a2a44 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -3527,7 +3527,7 @@ __bpf_kfunc bool bpf_session_is_return(void) return session_ctx->is_return; } -__bpf_kfunc __u64 *bpf_session_cookie(void) +__bpf_kfunc long *bpf_session_cookie(void) { struct bpf_session_run_ctx *session_ctx; |