On Wed, Jun 19, 2024 at 1:16 AM Jiri Olsa <jolsa@xxxxxxxxxx> wrote:
>
> This reverts [1] and changes return value for bpf_session_cookie
> in bpf selftests. Having long * might lead to problems on 32-bit
> architectures.
>
> Fixes: 2b8dd87332cd ("bpf: Make bpf_session_cookie() kfunc return long *")
> Suggested-by: Andrii Nakryiko <andrii@xxxxxxxxxx>
> Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
> ---
> kernel/trace/bpf_trace.c | 2 +-
> tools/testing/selftests/bpf/bpf_kfuncs.h | 2 +-
> tools/testing/selftests/bpf/progs/kprobe_multi_session_cookie.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
LGTM, thanks for the follow up!
Acked-by: Andrii Nakryiko <andrii@xxxxxxxxxx>
> diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
> index 4b3fda456299..cd098846e251 100644
> --- a/kernel/trace/bpf_trace.c
> +++ b/kernel/trace/bpf_trace.c
> @@ -3530,7 +3530,7 @@ __bpf_kfunc bool bpf_session_is_return(void)
> return session_ctx->is_return;
> }
>
> -__bpf_kfunc long *bpf_session_cookie(void)
> +__bpf_kfunc __u64 *bpf_session_cookie(void)
> {
> struct bpf_session_run_ctx *session_ctx;
>
> diff --git a/tools/testing/selftests/bpf/bpf_kfuncs.h b/tools/testing/selftests/bpf/bpf_kfuncs.h
> index be91a6919315..3b6675ab4086 100644
> --- a/tools/testing/selftests/bpf/bpf_kfuncs.h
> +++ b/tools/testing/selftests/bpf/bpf_kfuncs.h
> @@ -77,5 +77,5 @@ extern int bpf_verify_pkcs7_signature(struct bpf_dynptr *data_ptr,
> struct bpf_key *trusted_keyring) __ksym;
>
> extern bool bpf_session_is_return(void) __ksym __weak;
> -extern long *bpf_session_cookie(void) __ksym __weak;
> +extern __u64 *bpf_session_cookie(void) __ksym __weak;
> #endif
> diff --git a/tools/testing/selftests/bpf/progs/kprobe_multi_session_cookie.c b/tools/testing/selftests/bpf/progs/kprobe_multi_session_cookie.c
> index d49070803e22..0835b5edf685 100644
> --- a/tools/testing/selftests/bpf/progs/kprobe_multi_session_cookie.c
> +++ b/tools/testing/selftests/bpf/progs/kprobe_multi_session_cookie.c
> @@ -25,7 +25,7 @@ int BPF_PROG(trigger)
>
> static int check_cookie(__u64 val, __u64 *result)
> {
> - long *cookie;
> + __u64 *cookie;
>
> if (bpf_get_current_pid_tgid() >> 32 != pid)
> return 1;
> --
> 2.45.2
>
