bpf: Change bpf_session_cookie return value to __u64 *
Subsystems (6)
Jiri Olsa
reviewerPATCH 1/1 bpf: Change bpf_session_cookie return value to __u64 *
This reverts [1] and changes return value for bpf_session_cookie in bpf selftests. Having long * might lead to problems on 32-bit architectures.
--- 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(-)
kernel/trace/bpf_trace.c +1 -1
@@ -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;
tools/testing/selftests/bpf/bpf_kfuncs.h +1 -1
@@ -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
tools/testing/selftests/bpf/progs/kprobe_multi_session_cookie.c +1 -1
@@ -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 ;
Signature · 1 line
2.45.2
Quoted 5 lines · Jiri Olsa
This reverts [1] and changes return value for
bpf_session_cookiein bpf selftests. Having long * might lead to problems on 32-bit architectures.
Quoted 9 lines
Fixes 2b8dd87332cd ("bpf: Make bpf_session_cookie() kfunc return long *")Suggested-by Andrii Nakryiko <[email protected]>Signed-off-by Jiri Olsa <[email protected]>--- 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!
Quoted 40 lines
kernel/trace/bpf_trace.c +1
-1@@ -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;tools/testing/selftests/bpf/bpf_kfuncs.h +1
-1@@ -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 tools/testing/selftests/bpf/progs/kprobe_multi_session_cookie.c +1
-2@@ -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
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Daniel Borkmann <[email protected]>:
Quoted 9 lines · On Wed, 19 Jun 2024 10:16:24 +0200 you wrote:
This reverts [1] and changes return value for
bpf_session_cookiein 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 <[email protected]>Signed-off-by Jiri Olsa <[email protected]>[...]
Here is the summary with links:
- [bpf-next] bpf: Change bpf_session_cookie return value to __u64 *
https://git.kernel.org/bpf/bpf-next/c/717d6313bba1
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html