| Message ID | 20210210111406.785541-1-revest@chromium.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 07881ccbf40cc7893869f3f170301889ddca54ac |
| Delegated to: | BPF |
| Headers | show |
| Series | [bpf-next,v7,1/5] bpf: Be less specific about socket cookies guarantees | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | warning | Series does not have a cover letter |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for bpf-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | warning | 6 maintainers not CCed: yhs@fb.com quentin@isovalent.com kafai@fb.com netdev@vger.kernel.org songliubraving@fb.com john.fastabend@gmail.com |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 12238 this patch: 12238 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | warning | WARNING: please, no space before tabs |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 12886 this patch: 12886 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
Hello: This series was applied to bpf/bpf-next.git (refs/heads/master): On Wed, 10 Feb 2021 12:14:02 +0100 you wrote: > Since "92acdc58ab11 bpf, net: Rework cookie generator as per-cpu one" > socket cookies are not guaranteed to be non-decreasing. The > bpf_get_socket_cookie helper descriptions are currently specifying that > cookies are non-decreasing but we don't want users to rely on that. > > Reported-by: Daniel Borkmann <daniel@iogearbox.net> > Signed-off-by: Florent Revest <revest@chromium.org> > Acked-by: KP Singh <kpsingh@kernel.org> > > [...] Here is the summary with links: - [bpf-next,v7,1/5] bpf: Be less specific about socket cookies guarantees https://git.kernel.org/bpf/bpf-next/c/07881ccbf40c - [bpf-next,v7,2/5] bpf: Expose bpf_get_socket_cookie to tracing programs https://git.kernel.org/bpf/bpf-next/c/c5dbb89fc2ac - [bpf-next,v7,3/5] selftests/bpf: Integrate the socket_cookie test to test_progs https://git.kernel.org/bpf/bpf-next/c/61f8c9c8f3c8 - [bpf-next,v7,4/5] selftests/bpf: Use vmlinux.h in socket_cookie_prog.c https://git.kernel.org/bpf/bpf-next/c/6cd4dcc3fb81 - [bpf-next,v7,5/5] selftests/bpf: Add a selftest for the tracing bpf_get_socket_cookie https://git.kernel.org/bpf/bpf-next/c/6fdd671baaf5 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index c001766adcbc..0b735c2729b2 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -1656,22 +1656,22 @@ union bpf_attr { * networking traffic statistics as it provides a global socket * identifier that can be assumed unique. * Return - * A 8-byte long non-decreasing number on success, or 0 if the - * socket field is missing inside *skb*. + * A 8-byte long unique number on success, or 0 if the socket + * field is missing inside *skb*. * * u64 bpf_get_socket_cookie(struct bpf_sock_addr *ctx) * Description * Equivalent to bpf_get_socket_cookie() helper that accepts * *skb*, but gets socket from **struct bpf_sock_addr** context. * Return - * A 8-byte long non-decreasing number. + * A 8-byte long unique number. * * u64 bpf_get_socket_cookie(struct bpf_sock_ops *ctx) * Description * Equivalent to **bpf_get_socket_cookie**\ () helper that accepts * *skb*, but gets socket from **struct bpf_sock_ops** context. * Return - * A 8-byte long non-decreasing number. + * A 8-byte long unique number. * * u32 bpf_get_socket_uid(struct sk_buff *skb) * Return diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index c001766adcbc..0b735c2729b2 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -1656,22 +1656,22 @@ union bpf_attr { * networking traffic statistics as it provides a global socket * identifier that can be assumed unique. * Return - * A 8-byte long non-decreasing number on success, or 0 if the - * socket field is missing inside *skb*. + * A 8-byte long unique number on success, or 0 if the socket + * field is missing inside *skb*. * * u64 bpf_get_socket_cookie(struct bpf_sock_addr *ctx) * Description * Equivalent to bpf_get_socket_cookie() helper that accepts * *skb*, but gets socket from **struct bpf_sock_addr** context. * Return - * A 8-byte long non-decreasing number. + * A 8-byte long unique number. * * u64 bpf_get_socket_cookie(struct bpf_sock_ops *ctx) * Description * Equivalent to **bpf_get_socket_cookie**\ () helper that accepts * *skb*, but gets socket from **struct bpf_sock_ops** context. * Return - * A 8-byte long non-decreasing number. + * A 8-byte long unique number. * * u32 bpf_get_socket_uid(struct sk_buff *skb) * Return