[PATCH net-next 01/13] selftests: xsk: factor endpoint work out of pthread wrappers
flat view
WARM3d
From: Maciej Fijalkowski <maciej.fijalkowski@intel.com>
Date: 2026-10-01 20:22:28
Also in:
bpf
Subsystem:
bpf [general] (safe dynamic programs and tools), bpf [selftests] (test runners & infrastructure), kernel selftest framework, the rest, xdp sockets (af_xdp) · Maintainers:
Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko, Eduard Zingerman, Kumar Kartikeya Dwivedi, Shuah Khan, Shuah Khan, Linus Torvalds, Magnus Karlsson, Maciej Fijalkowski
Revision v1 of 2 in this series.
Revisions (2)
- v1 current
- v2 [diff vs current]
Move TX execution, RX setup and RX validation into synchronous helpers and leave the pthread entry points as thin wrappers, so the same code can later run without a thread per endpoint. Barrier, pacing and test behavior are unchanged, but plan is to step away from thread-based model in favor of separate process approach, hence this preparation. Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com> --- .../selftests/bpf/prog_tests/test_xsk.c | 98 +++++++++++-------- 1 file changed, 59 insertions(+), 39 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/test_xsk.c b/tools/testing/selftests/bpf/prog_tests/test_xsk.c
index 4549358cc8c2..2a1362874092 100644
--- a/tools/testing/selftests/bpf/prog_tests/test_xsk.c
+++ b/tools/testing/selftests/bpf/prog_tests/test_xsk.c@@ -1623,40 +1623,31 @@ static int thread_common_ops(struct test_spec *test, struct ifobject *ifobject) return 0; } -void *worker_testapp_validate_tx(void *arg) +static int testapp_validate_tx_endpoint(struct test_spec *test, + struct ifobject *ifobject) { - struct test_spec *test = (struct test_spec *)arg; - struct ifobject *ifobject = test->ifobj_tx; int err; if (test->current_step == 1) { - if (!ifobject->shared_umem) { - if (thread_common_ops(test, ifobject)) { - test->fail = true; - pthread_exit(NULL); - } - } else { - if (thread_common_ops_tx(test, ifobject)) { - test->fail = true; - pthread_exit(NULL); - } - } + if (!ifobject->shared_umem) + err = thread_common_ops(test, ifobject); + else + err = thread_common_ops_tx(test, ifobject); + if (err) + return err; } err = send_pkts(test, ifobject); if (!err && ifobject->validation_func) err = ifobject->validation_func(ifobject); - if (err) - test->fail = true; - pthread_exit(NULL); + return err; } -void *worker_testapp_validate_rx(void *arg) +static int testapp_prepare_rx_endpoint(struct test_spec *test, + struct ifobject *ifobject) { - struct test_spec *test = (struct test_spec *)arg; - struct ifobject *ifobject = test->ifobj_rx; int err; if (test->current_step == 1) {
@@ -1669,35 +1660,64 @@ void *worker_testapp_validate_rx(void *arg) strerror(-err)); } - if (test->use_barrier) - pthread_barrier_wait(&barr); + return err; +} - /* We leave only now in case of error to avoid getting stuck in the barrier */ - if (err) { - test->fail = true; - pthread_exit(NULL); - } +static int testapp_validate_rx_endpoint(struct test_spec *test, + struct ifobject *ifobject) +{ + bool supported; + int err; err = receive_pkts(test); if (!err && ifobject->validation_func) err = ifobject->validation_func(ifobject); + if (!err) + return TEST_PASS; - if (err) { - if (!test->adjust_tail) { - test->fail = true; - } else { - bool supported; + if (!test->adjust_tail) + return err; - if (is_adjust_tail_supported(ifobject->xdp_progs, &supported)) - test->fail = true; - else if (!supported) - test->adjust_tail_support = false; - else - test->fail = true; - } + if (is_adjust_tail_supported(ifobject->xdp_progs, &supported)) + return TEST_FAILURE; + if (!supported) { + test->adjust_tail_support = false; + return TEST_PASS; } + return err; +} + +void *worker_testapp_validate_tx(void *arg) +{ + struct test_spec *test = (struct test_spec *)arg; + int err; + + err = testapp_validate_tx_endpoint(test, test->ifobj_tx); + if (err) + test->fail = true; + + pthread_exit(NULL); +} + +void *worker_testapp_validate_rx(void *arg) +{ + struct test_spec *test = (struct test_spec *)arg; + struct ifobject *ifobject = test->ifobj_rx; + int err; + + err = testapp_prepare_rx_endpoint(test, ifobject); + + if (test->use_barrier) + pthread_barrier_wait(&barr); + + /* We leave only now in case of error to avoid getting stuck in the barrier */ + if (!err) + err = testapp_validate_rx_endpoint(test, ifobject); + if (err) + test->fail = true; + pthread_exit(NULL); }
--
2.43.0