Commit 3f09728f authored by Bastien Curutchet (eBPF Foundation)'s avatar Bastien Curutchet (eBPF Foundation) Committed by Alexei Starovoitov
Browse files

selftests/bpf: test_xsk: Don't exit immediately when gettimeofday fails 



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().

Reviewed-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Signed-off-by: default avatarBastien Curutchet (eBPF Foundation) <bastien.curutchet@bootlin.com>
Link: https://lore.kernel.org/r/20251031-xsk-v7-10-39fe486593a3@bootlin.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent f12f1b5d

tools/testing/selftests/bpf/test_xsk.c

+4 −4
Original line number Diff line number Diff line
@@ -1096,7 +1096,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);
@@ -1112,7 +1112,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__);
@@ -1255,13 +1255,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;