[PATCH bpf-next v3 08/14] selftests/bpf: test_xsk: Don't exit immediately when gettimeofday fails

Bastien Curutchet (eBPF Foundation)
2025-09-04T10:11:39Z

exit_with_error() is called when gettimeofday() fails. This exits the
program immediately. It prevents the following tests from being run and
isn't compliant with the CI.

Return TEST_FAILURE instead of calling exit_on_error().

Signed-off-by: Bastien Curutchet (eBPF Foundation) <bastien.curutchet@bootlin.com>
---
tools/testing/selftests/bpf/test_xsk.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/testing/selftests/bpf/test_xsk.c b/tools/testing/selftests/bpf/test_xsk.c
index 6a9ad7a3a78667a1b70b688698103df3cae26c61..adefb50e2b08d923c412b17d7d31300f7eb7a0e7 100644
--- a/tools/testing/selftests/bpf/test_xsk.c
+++ b/tools/testing/selftests/bpf/test_xsk.c
@@ -1106,7 +1106,7 @@ static int receive_pkts(struct test_spec *test)

ret = gettimeofday(&tv_now, NULL);
if (ret)
- exit_with_error(errno);
+ return TEST_FAILURE;

timeradd(&tv_now, &tv_timeout, &tv_end);

@@ -1122,7 +1122,7 @@ static int receive_pkts(struct test_spec *test)

ret = gettimeofday(&tv_now, NULL);
if (ret)
- exit_with_error(errno);
+ return TEST_FAILURE;

if (timercmp(&tv_now, &tv_end, >)) {
ksft_print_msg("ERROR: [%s] Receive loop timed out\n", __func__);
@@ -1265,13 +1265,13 @@ static int wait_for_tx_completion(struct xsk_socket_info *xsk)

ret = gettimeofday(&tv_now, NULL);
if (ret)
- exit_with_error(errno);
+ return TEST_FAILURE;
timeradd(&tv_now, &tv_timeout, &tv_end);

while (xsk->outstanding_tx) {
ret = gettimeofday(&tv_now, NULL);
if (ret)
- exit_with_error(errno);
+ return TEST_FAILURE;
if (timercmp(&tv_now, &tv_end, >)) {
ksft_print_msg("ERROR: [%s] Transmission loop timed out\n", __func__);
return TEST_FAILURE;

--
2.50.1