On Wed, Sep 24, 2025 at 04:49:35PM +0200, Bastien Curutchet (eBPF Foundation) wrote:
> Hi all,
>
> The test_xsk.sh script covers many AF_XDP use cases. The tests it runs
> are defined in xksxceiver.c. Since this script is used to test real
> hardware, the goal here is to leave it as it is, and only integrate the
> tests that run on veth peers into the test_progs framework.
>
> Some tests are flaky so they can't be integrated in the CI as they are.
> I think that fixing their flakyness would require a significant amount of
> work. So, as first step, I've excluded them from the list of tests
> migrated to the CI (cf PATCH 14). If these tests get fixed at some
> point, integrating them into the CI will be straightforward.
>
> I noticed a small error on a function's return value while investigating
> on the report's summary issue pointed out by Maciej in previous iteration,
> the new PATCH 3 fixes it.
>
> PATCH 1 extracts test_xsk[.c/.h] from xskxceiver[.c/.h] to make the
> tests available to test_progs.
> PATCH 2 to 7 fix small issues in the current test
> PATCH 8 to 13 handle all errors to release resources instead of calling
> exit() when any error occurs.
> PATCH 14 isolates some flaky tests
> PATCH 15 integrate the non-flaky tests to the test_progs framework
>
> Signed-off-by: Bastien Curutchet (eBPF Foundation) <bastien.curutchet@bootlin.com>
For series:
Reviewed-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
> ---
> Changes in v4:
> - Fix test_xsk.sh's summary report.
> - Merge PATCH 11 & 12 together, otherwise PATCH 11 fails to build.
> - Split old PATCH 3 in two patches. The first one fixes
> testapp_stats_rx_dropped(), the second one fixes
> testapp_xdp_shared_umem(). The unecessary frees (in
> testapp_stats_rx_full() and testapp_stats_fill_empty() are removed)
> - Link to v3: https://lore.kernel.org/r/20250904-xsk-v3-0-ce382e331485@bootlin.com
>
> Changes in v3:
> - Rebase on latest bpf-next_base to integrate commit c9110e6f7237 ("selftests/bpf:
> Fix count write in testapp_xdp_metadata_copy()").
> - Move XDP_METADATA_COPY_* tests from flaky-tests to nominal tests
> - Link to v2: https://lore.kernel.org/r/20250902-xsk-v2-0-17c6345d5215@bootlin.com
>
> Changes in v2:
> - Rebase on the latest bpf-next_base and integrate the newly added tests
> to the work (adjust_tail* and tx_queue_consumer tests)
> - Re-order patches to split xkxceiver sooner.
> - Fix the bug reported by Maciej.
> - Fix verbose mode in test_xsk.sh by keeping kselftest (remove PATCH 1,
> 7 and 8)
> - Link to v1: https://lore.kernel.org/r/20250313-xsk-v1-0-7374729a93b9@bootlin.com
>
> ---
> Bastien Curutchet (eBPF Foundation) (15):
> selftests/bpf: test_xsk: Split xskxceiver
> selftests/bpf: test_xsk: Initialize bitmap before use
> selftests/bpf: test_xsk: Fix __testapp_validate_traffic()'s return value
> selftests/bpf: test_xsk: fix memory leak in testapp_stats_rx_dropped()
> selftests/bpf: test_xsk: fix memory leak in testapp_xdp_shared_umem()
> selftests/bpf: test_xsk: Wrap test clean-up in functions
> selftests/bpf: test_xsk: Release resources when swap fails
> selftests/bpf: test_xsk: Add return value to init_iface()
> selftests/bpf: test_xsk: Don't exit immediately when xsk_attach fails
> selftests/bpf: test_xsk: Don't exit immediately when gettimeofday fails
> selftests/bpf: test_xsk: Don't exit immediately when workers fail
> selftests/bpf: test_xsk: Don't exit immediately if validate_traffic fails
> selftests/bpf: test_xsk: Don't exit immediately on allocation failures
> selftests/bpf: test_xsk: Isolate flaky tests
> selftests/bpf: test_xsk: Integrate test_xsk.c to test_progs framework
>
> tools/testing/selftests/bpf/Makefile | 11 +-
> tools/testing/selftests/bpf/prog_tests/test_xsk.c | 2595 ++++++++++++++++++++
> tools/testing/selftests/bpf/prog_tests/test_xsk.h | 294 +++
> tools/testing/selftests/bpf/prog_tests/xsk.c | 146 ++
> tools/testing/selftests/bpf/xskxceiver.c | 2696 +--------------------
> tools/testing/selftests/bpf/xskxceiver.h | 156 --
> 6 files changed, 3174 insertions(+), 2724 deletions(-)
> ---
> base-commit: 1bd67e08d0f3fcb8cc69a73fb7aab9f048be4b8e
> change-id: 20250218-xsk-0cf90e975d14
>
> Best regards,
> --
> Bastien Curutchet (eBPF Foundation) <bastien.curutchet@bootlin.com>
>