Commit edbac739 authored by Dmitry Safonov's avatar Dmitry Safonov Committed by Jakub Kicinski
Browse files

selftests/net: Drop timeout argument from test_client_verify() 



It's always TEST_TIMEOUT_SEC, with an unjustified exception in rst test,
that is more paranoia-long timeout rather than based on requirements.

Signed-off-by: default avatarDmitry Safonov <0x7f454c46@gmail.com>
Link: https://patch.msgid.link/20250319-tcp-ao-selftests-polling-v2-7-da48040153d1@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1e1738fa

tools/testing/selftests/net/tcp_ao/connect.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static void *client_fn(void *arg) 
	if (test_get_tcp_counters(sk, &ao1))

		test_error("test_get_tcp_counters()");



	if (test_client_verify(sk, 100, nr_packets, TEST_TIMEOUT_SEC)) {

	if (test_client_verify(sk, 100, nr_packets)) {

		test_fail("verify failed");

		return NULL;

	}

tools/testing/selftests/net/tcp_ao/icmps-discard.c

+1 −2
Original line number Diff line number Diff line
@@ -395,7 +395,6 @@ static void icmp_interfere(const size_t nr, uint32_t rcv_nxt, void *src, void *d 


static void send_interfered(int sk)

{

	const unsigned int timeout = TEST_TIMEOUT_SEC;

	struct sockaddr_in6 src, dst;

	socklen_t addr_sz;
@@ -409,7 +408,7 @@ static void send_interfered(int sk) 
	while (1) {

		uint32_t rcv_nxt;



		if (test_client_verify(sk, packet_size, packets_nr, timeout)) {

		if (test_client_verify(sk, packet_size, packets_nr)) {

			test_fail("client: connection is broken");

			return;

		}

tools/testing/selftests/net/tcp_ao/key-management.c

+4 −4
Original line number Diff line number Diff line
@@ -918,7 +918,7 @@ static int run_client(const char *tst_name, unsigned int port, 
	collection.keys[rnext_index].used_on_server_tx = 1;



	synchronize_threads(); /* 3: accepted => send data */

	if (test_client_verify(sk, msg_sz, msg_nr, TEST_TIMEOUT_SEC)) {

	if (test_client_verify(sk, msg_sz, msg_nr)) {

		test_fail("verify failed");

		close(sk);

		if (before)
@@ -1016,7 +1016,7 @@ static void try_unmatched_keys(int sk, int *rnext_index, unsigned int port) 
	trace_ao_event_expect(TCP_AO_RNEXT_REQUEST, this_ip_addr, this_ip_dest,

			      -1, port, 0, -1, -1, -1, -1, -1,

			      -1, key->server_keyid, -1);

	if (test_client_verify(sk, msg_len, nr_packets, TEST_TIMEOUT_SEC))

	if (test_client_verify(sk, msg_len, nr_packets))

		test_fail("verify failed");

	*rnext_index = i;

}
@@ -1061,7 +1061,7 @@ static void check_current_back(const char *tst_name, unsigned int port, 
			      port, -1, 0, -1, -1, -1, -1, -1,

			      collection.keys[rotate_to_index].client_keyid,

			      collection.keys[current_index].client_keyid, -1);

	if (test_client_verify(sk, msg_len, nr_packets, TEST_TIMEOUT_SEC))

	if (test_client_verify(sk, msg_len, nr_packets))

		test_fail("verify failed");

	/* There is a race here: between setting the current_key with

	 * setsockopt(TCP_AO_INFO) and starting to send some data - there
@@ -1099,7 +1099,7 @@ static void roll_over_keys(const char *tst_name, unsigned int port, 
				collection.keys[i].server_keyid, -1);

		if (test_set_key(sk, -1, collection.keys[i].server_keyid))

			test_error("Can't change the Rnext key");

		if (test_client_verify(sk, msg_len, nr_packets, TEST_TIMEOUT_SEC)) {

		if (test_client_verify(sk, msg_len, nr_packets)) {

			test_fail("verify failed");

			close(sk);

			test_tcp_counters_free(&tmp);

tools/testing/selftests/net/tcp_ao/lib/aolib.h

+1 −2
Original line number Diff line number Diff line
@@ -484,8 +484,7 @@ static inline int test_set_ao_flags(int sk, bool ao_required, bool accept_icmps) 
}



extern ssize_t test_server_run(int sk, ssize_t quota, time_t timeout_sec);

extern int test_client_verify(int sk, const size_t msg_len, const size_t nr,

			      time_t timeout_sec);

extern int test_client_verify(int sk, const size_t msg_len, const size_t nr);



struct tcp_ao_key_counters {

	uint8_t sndid;

tools/testing/selftests/net/tcp_ao/lib/sock.c

+7 −8
Original line number Diff line number Diff line
@@ -646,7 +646,7 @@ int test_skpair_server(int sk, ssize_t quota, test_cnt cond, volatile int *err) 


static ssize_t test_client_loop(int sk, size_t buf_sz, const size_t msg_len,

				struct tcp_counters *c, test_cnt cond,

				volatile int *err, time_t timeout_sec)

				volatile int *err)

{

	char msg[msg_len];

	int nodelay = 1;
@@ -665,7 +665,7 @@ static ssize_t test_client_loop(int sk, size_t buf_sz, const size_t msg_len, 
		size_t sent, bytes = min(msg_len, buf_sz - i);

		int ret;



		ret = __test_skpair_poll(sk, 1, timeout_sec, c, cond, err);

		ret = __test_skpair_poll(sk, 1, TEST_TIMEOUT_SEC, c, cond, err);

		if (ret)

			return ret;
@@ -679,7 +679,8 @@ static ssize_t test_client_loop(int sk, size_t buf_sz, const size_t msg_len, 
		do {

			ssize_t got;



			ret = __test_skpair_poll(sk, 0, timeout_sec, c, cond, err);

			ret = __test_skpair_poll(sk, 0, TEST_TIMEOUT_SEC,

						 c, cond, err);

			if (ret)

				return ret;
@@ -698,13 +699,12 @@ static ssize_t test_client_loop(int sk, size_t buf_sz, const size_t msg_len, 
	return i;

}



int test_client_verify(int sk, const size_t msg_len, const size_t nr,

		       time_t timeout_sec)

int test_client_verify(int sk, const size_t msg_len, const size_t nr)

{

	size_t buf_sz = msg_len * nr;

	ssize_t ret;



	ret = test_client_loop(sk, buf_sz, msg_len, NULL, 0, NULL, timeout_sec);

	ret = test_client_loop(sk, buf_sz, msg_len, NULL, 0, NULL);

	if (ret < 0)

		return (int)ret;

	return ret != buf_sz ? -1 : 0;
@@ -722,8 +722,7 @@ int test_skpair_client(int sk, const size_t msg_len, const size_t nr, 
		test_error("test_get_tcp_counters()");

	synchronize_threads(); /* 1: init skpair & read nscounters */



	ret = test_client_loop(sk, buf_sz, msg_len, &c, cond, err,

			       TEST_TIMEOUT_SEC);

	ret = test_client_loop(sk, buf_sz, msg_len, &c, cond, err);

	test_tcp_counters_free(&c);

	if (ret < 0)

		return (int)ret;