[bpf-next,v2,0/3] selftests: bpf: Migrate test_xdp_redirect.sh to test_progs

Message

Bastien Curutchet (eBPF Foundation) Jan. 10, 2025, 9:21 a.m. UTC

Hi all,

This patch series continues the work to migrate the *.sh tests into
prog_tests.

test_xdp_redirect.sh tests the XDP redirections done through
bpf_redirect().

These XDP redirections are already tested by prog_tests/xdp_do_redirect.c
but IMO it doesn't cover the exact same code path because
xdp_do_redirect.c uses bpf_prog_test_run_opts() to trigger redirections
of 'fake packets' while test_xdp_redirect.sh redirects packets coming
from the network. Also, the test_xdp_redirect.sh script tests the
redirections with both SKB and DRV modes while xdp_do_redirect.c only
tests the DRV mode.

The patch series adds two new test cases in prog_tests/xdp_do_redirect.c
to replace the test_xdp_redirect.sh script.

Signed-off-by: Bastien Curutchet (eBPF Foundation) <[e-mail]>
---
Changes in v2:
- Use directly skel->progs instead of 'bpf_object__find_program_by_name()'
- Use 'ip -n NSX' in SYS calls instead of opening NSX with open_netns()
- Use #define for static indexes of veth1 and veth2
- Delete the useless second ping
- Set nstoken to NULL after close_netns()
- Merge the two added tests into one with 3 subtests (one for each flag:
  0, DRV, SKB)
- Link to v1: https://lore.kernel.org/r/[e-mail]

---
Bastien Curutchet (eBPF Foundation) (3):
      selftests/bpf: test_xdp_redirect: Rename BPF sections
      selftests/bpf: Migrate test_xdp_redirect.sh to xdp_do_redirect.c
      selftests/bpf: Migrate test_xdp_redirect.c to test_xdp_do_redirect.c

 tools/testing/selftests/bpf/Makefile               |   1 -
 .../selftests/bpf/prog_tests/xdp_do_redirect.c     | 164 +++++++++++++++++++++
 .../selftests/bpf/progs/test_xdp_do_redirect.c     |  12 ++
 .../selftests/bpf/progs/test_xdp_redirect.c        |  26 ----
 tools/testing/selftests/bpf/test_xdp_redirect.sh   |  79 ----------
 5 files changed, 176 insertions(+), 106 deletions(-)
---
base-commit: b27feb5365c6a1bf7e71ba5c795717ee0eec298d
change-id: 20241219-xdp_redirect-2b8ec79dc24e

Best regards,

Comments

[e-mail] Jan. 11, 2025, 1:41 a.m. UTC | #1

Hello:

This series was applied to bpf/bpf-next.git (master)
by Martin KaFai Lau <[e-mail]>:

On Fri, 10 Jan 2025 10:21:08 +0100 you wrote:
> Hi all,
> 
> This patch series continues the work to migrate the *.sh tests into
> prog_tests.
> 
> test_xdp_redirect.sh tests the XDP redirections done through
> bpf_redirect().
> 
> [...]

Here is the summary with links:
  - [bpf-next,v2,1/3] selftests/bpf: test_xdp_redirect: Rename BPF sections
    https://git.kernel.org/bpf/bpf-next/c/2c6c5c7c1ad1
  - [bpf-next,v2,2/3] selftests/bpf: Migrate test_xdp_redirect.sh to xdp_do_redirect.c
    (no matching commit)
  - [bpf-next,v2,3/3] selftests/bpf: Migrate test_xdp_redirect.c to test_xdp_do_redirect.c
    https://git.kernel.org/bpf/bpf-next/c/3e99fa9fab19

You are awesome, thank you!