Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

selftests/bpf: Retire bpf_tcp_helpers.h #7010

Closed
wants to merge 11 commits into from
Closed

selftests/bpf: Retire bpf_tcp_helpers.h #7010

wants to merge 11 commits into from

Conversation

kernel-patches-daemon-bpf[bot]
Copy link

Pull request for series with
subject: selftests/bpf: Retire bpf_tcp_helpers.h
version: 1
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=851982

Kernel Patches Daemon and others added 11 commits May 8, 2024 15:03
adding ci files
2a4c29b
selftests/bpf: Remove bpf_tracing_net.h usages from two networking tests
defb9e6 
This patch removes the bpf_tracing_net.h usage from the networking tests,
fib_lookup and test_lwt_redirect. Instead of using the (copied) macro
TC_ACT_SHOT and ETH_HLEN from bpf_tracing_net.h, they can directly
use the ones defined in the network header files under linux/.

Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
selftests/bpf: Add a few tcp helper functions and macros to bpf_traci…
2deee7a 
…ng_net.h

This patch adds a few tcp related helper functions to bpf_tracing_net.h.
They will be useful for both tcp-cc and network tracing related
bpf progs. They have already been in the bpf_tcp_helpers.h. This change
is needed to retire the bpf_tcp_helpers.h and consolidate all tests
to vmlinux.h (i.e. bpf_tracing_net.h).

Some of the helpers (tcp_sk and inet_csk) are also defined in
bpf_cc_cubic.c and they are removed. While at it, remove
the vmlinux.h from bpf_cc_cubic.c. bpf_tracing_net.h (which has
vmlinux.h after this patch) is enough and will be consistent
with the other tcp-cc tests in the later patches.

The other TCP_* macro additions will be needed for the bpf_dctcp
changes in the later patch.

Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
selftests/bpf: Reuse the tcp_sk() from the bpf_tracing_net.h
4b9fd61 
This patch removes the individual tcp_sk implementations from the
tcp-cc tests. The tcp_sk() implementation from the bpf_tracing_net.h
is reused instead.

Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
selftests/bpf: Sanitize the SEC and inline usages in the bpf-tcp-cc t…
1488412 
…ests

It is needed to remove the BPF_STRUCT_OPS usages from the tcp-cc tests
because it is defined in bpf_tcp_helpers.h which is going to be retired.
While at it, this patch consolidates all tcp-cc struct_ops programs to
use the SEC("struct_ops") + BPF_PROG().

It also removes the unnecessary __always_inline usages from the
tcp-cc tests.

Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
selftests/bpf: Rename tcp-cc private struct in bpf_cubic and bpf_dctcp
d22b1a2 
The "struct bictcp" and "struct dctcp" are private to the bpf prog
and they are stored in the private buffer in inet_csk(sk)->icsk_ca_priv.
Hence, there is no bpf CO-RE required.

The same struct name exists in the vmlinux.h. To reuse vmlinux.h,
they need to be renamed such that the bpf prog logic will be
immuned from the kernel tcp-cc changes.

This patch adds a "bpf_" prefix to them.

Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
selftests/bpf: Use bpf_tracing_net.h in bpf_cubic
2aba736 
This patch uses bpf_tracing_net.h (i.e. vmlinux.h) in bpf_cubic.
This will allow to retire the bpf_tcp_helpers.h and consolidate
tcp-cc tests to vmlinux.h.

Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
selftests/bpf: Use bpf_tracing_net.h in bpf_dctcp
8b69b29 
This patch uses bpf_tracing_net.h (i.e. vmlinux.h) in bpf_dctcp.
This will allow to retire the bpf_tcp_helpers.h and consolidate
tcp-cc tests to vmlinux.h.

It will have a dup on min/max macros with the bpf_cubic. It could
be further refactored in the future.

Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
selftests/bpf: Remove bpf_tcp_helpers.h usages from other misc bpf tc…
45b9515 
…p-cc tests

This patch removed the final few bpf_tcp_helpers.h usages
in some misc bpf tcp-cc tests and replace it with
bpf_tracing_net.h (i.e. vmlinux.h)

Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
selftests/bpf: Remove the bpf_tcp_helpers.h usages from other non tcp…
c5cf414 
…-cc tests

The patch removes the remaining bpf_tcp_helpers.h usages in the
non tcp-cc networking tests. It either replaces it with bpf_tracing_net.h
or just removed it because the test is not actually using any
kernel sockets. For the later, the missing macro (mainly SOL_TCP) is
defined locally.

An exception is the test_sock_fields which is testing
the "struct bpf_sock" type instead of the kernel sock type.
Whenever "vmlinux.h" is used instead, it hits a verifier
error on doing arithmetic on the sock_common pointer:

; return !a6[0] && !a6[1] && !a6[2] && a6[3] == bpf_htonl(1); @ test_sock_fields.c:54
21: (61) r2 = *(u32 *)(r1 +28)        ; R1_w=sock_common() R2_w=scalar(smin=0,smax=umax=0xffffffff,var_off=(0x0; 0xffffffff))
22: (56) if w2 != 0x0 goto pc-6       ; R2_w=0
23: (b7) r3 = 28                      ; R3_w=28
24: (bf) r2 = r1                      ; R1_w=sock_common() R2_w=sock_common()
25: (0f) r2 += r3
R2 pointer arithmetic on sock_common prohibited

Hence, instead of including bpf_tracing_net.h, the test_sock_fields test
defines a tcp_sock with one lsndtime field in it.

Another highlight is, in sockopt_qos_to_cc.c, the tcp_cc_eq()
is replaced by bpf_strncmp(). tcp_cc_eq() was a workaround
in bpf_tcp_helpers.h before bpf_strncmp had been added.

The SOL_IPV6 addition to bpf_tracing_net.h is needed by the
test_tcpbpf_kern test.

Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
selftests/bpf: Retire bpf_tcp_helpers.h
78d97b9 
The previous patches have consolidated the tests to use
bpf_tracing_net.h (i.e. vmlinux.h) instead of bpf_tcp_helpers.h.

This patch can finally retire the bpf_tcp_helpers.h from
the repository.

Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: 0093670
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=851982
version: 1

@kernel-patches-daemon-bpf
Copy link
Author

Upstream branch: cbe35ad
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=851982
version: 1

Pull request is NOT updated. Failed to apply https://patchwork.kernel.org/project/netdevbpf/list/?series=851982
error message:

Cmd('git') failed due to: exit code(128)
  cmdline: git am --3way
  stdout: 'Applying: selftests/bpf: Remove bpf_tracing_net.h usages from two networking tests
Using index info to reconstruct a base tree...
M	tools/testing/selftests/bpf/progs/fib_lookup.c
M	tools/testing/selftests/bpf/progs/test_lwt_redirect.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: selftests/bpf: Add a few tcp helper functions and macros to bpf_tracing_net.h
Using index info to reconstruct a base tree...
M	tools/testing/selftests/bpf/progs/bpf_cc_cubic.c
M	tools/testing/selftests/bpf/progs/bpf_tracing_net.h
Falling back to patching base and 3-way merge...
Auto-merging tools/testing/selftests/bpf/progs/bpf_tracing_net.h
Auto-merging tools/testing/selftests/bpf/progs/bpf_cc_cubic.c
CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/progs/bpf_cc_cubic.c
Patch failed at 0002 selftests/bpf: Add a few tcp helper functions and macros to bpf_tracing_net.h
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".'
  stderr: 'error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch'

conflict:

diff --cc tools/testing/selftests/bpf/progs/bpf_cc_cubic.c
index 1654a530aa3d,2004be380683..000000000000
--- a/tools/testing/selftests/bpf/progs/bpf_cc_cubic.c
+++ b/tools/testing/selftests/bpf/progs/bpf_cc_cubic.c
@@@ -16,6 -16,10 +16,13 @@@
  #include "bpf_tracing_net.h"
  #include <bpf/bpf_helpers.h>
  #include <bpf/bpf_tracing.h>
++<<<<<<< HEAD
++=======
+ 
+ #define BPF_STRUCT_OPS(name, args...) \
+ SEC("struct_ops/"#name) \
+ BPF_PROG(name, args)
++>>>>>>> selftests/bpf: Add a few tcp helper functions and macros to bpf_tracing_net.h
  
  #define USEC_PER_SEC 1000000UL
  #define TCP_PACING_SS_RATIO (200)

@kernel-patches-daemon-bpf
Copy link
Author

At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=851982 irrelevant now. Closing PR.

@kernel-patches-daemon-bpf kernel-patches-daemon-bpf bot deleted the series/851982=>bpf-next branch May 9, 2024 18:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
accepted bpf-next V1-ci-pass V1
Projects
None yet
Milestone
No milestone
0 participants