Commit ebdada9d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'vsock-tests' 

Stefano Garzarella says:

====================
vsock/test: add recv_buf()/send_buf() utility functions and some improvements

We recently found that some tests were failing [1].

The problem was that we were not waiting for all the bytes correctly,
so we had a partial read. I had initially suggested using MSG_WAITALL,
but this could have timeout problems.

Since we already had send_byte() and recv_byte() that handled the timeout,
but also the expected return value, I moved that code to two new functions
that we can now use to send/receive generic buffers.

The last commit is just an improvement to a test I found difficult to
understand while using the new functions.

@Arseniy a review and some testing are really appreciated :-)

[1] https://lore.kernel.org/netdev/63xflnwiohdfo6m3vnrrxgv2ulplencpwug5qqacugqh7xxpu3@tsczkuqgwurb/


====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 685c6d5b bc7bea45

tools/testing/vsock/util.c

+80 −44
Original line number Diff line number Diff line
@@ -211,102 +211,138 @@ int vsock_seqpacket_accept(unsigned int cid, unsigned int port, 
	return vsock_accept(cid, port, clientaddrp, SOCK_SEQPACKET);

}



/* Transmit one byte and check the return value.

/* Transmit bytes from a buffer and check the return value.

 *

 * expected_ret:

 *  <0 Negative errno (for testing errors)

 *   0 End-of-file

 *   1 Success

 *  >0 Success (bytes successfully written)

 */

void send_byte(int fd, int expected_ret, int flags)

void send_buf(int fd, const void *buf, size_t len, int flags,

	      ssize_t expected_ret)

{

	const uint8_t byte = 'A';

	ssize_t nwritten;

	ssize_t nwritten = 0;

	ssize_t ret;



	timeout_begin(TIMEOUT);

	do {

		nwritten = send(fd, &byte, sizeof(byte), flags);

		timeout_check("write");

	} while (nwritten < 0 && errno == EINTR);

		ret = send(fd, buf + nwritten, len - nwritten, flags);

		timeout_check("send");



		if (ret == 0 || (ret < 0 && errno != EINTR))

			break;



		nwritten += ret;

	} while (nwritten < len);

	timeout_end();



	if (expected_ret < 0) {

		if (nwritten != -1) {

			fprintf(stderr, "bogus send(2) return value %zd\n",

				nwritten);

		if (ret != -1) {

			fprintf(stderr, "bogus send(2) return value %zd (expected %zd)\n",

				ret, expected_ret);

			exit(EXIT_FAILURE);

		}

		if (errno != -expected_ret) {

			perror("write");

			perror("send");

			exit(EXIT_FAILURE);

		}

		return;

	}



	if (nwritten < 0) {

		perror("write");

	if (ret < 0) {

		perror("send");

		exit(EXIT_FAILURE);

	}

	if (nwritten == 0) {

		if (expected_ret == 0)

			return;



		fprintf(stderr, "unexpected EOF while sending byte\n");

		exit(EXIT_FAILURE);

	}

	if (nwritten != sizeof(byte)) {

		fprintf(stderr, "bogus send(2) return value %zd\n", nwritten);

	if (nwritten != expected_ret) {

		if (ret == 0)

			fprintf(stderr, "unexpected EOF while sending bytes\n");



		fprintf(stderr, "bogus send(2) bytes written %zd (expected %zd)\n",

			nwritten, expected_ret);

		exit(EXIT_FAILURE);

	}

}



/* Receive one byte and check the return value.

/* Receive bytes in a buffer and check the return value.

 *

 * expected_ret:

 *  <0 Negative errno (for testing errors)

 *   0 End-of-file

 *   1 Success

 *  >0 Success (bytes successfully read)

 */

void recv_byte(int fd, int expected_ret, int flags)

void recv_buf(int fd, void *buf, size_t len, int flags, ssize_t expected_ret)

{

	uint8_t byte;

	ssize_t nread;

	ssize_t nread = 0;

	ssize_t ret;



	timeout_begin(TIMEOUT);

	do {

		nread = recv(fd, &byte, sizeof(byte), flags);

		timeout_check("read");

	} while (nread < 0 && errno == EINTR);

		ret = recv(fd, buf + nread, len - nread, flags);

		timeout_check("recv");



		if (ret == 0 || (ret < 0 && errno != EINTR))

			break;



		nread += ret;

	} while (nread < len);

	timeout_end();



	if (expected_ret < 0) {

		if (nread != -1) {

			fprintf(stderr, "bogus recv(2) return value %zd\n",

				nread);

		if (ret != -1) {

			fprintf(stderr, "bogus recv(2) return value %zd (expected %zd)\n",

				ret, expected_ret);

			exit(EXIT_FAILURE);

		}

		if (errno != -expected_ret) {

			perror("read");

			perror("recv");

			exit(EXIT_FAILURE);

		}

		return;

	}



	if (nread < 0) {

		perror("read");

	if (ret < 0) {

		perror("recv");

		exit(EXIT_FAILURE);

	}

	if (nread == 0) {

		if (expected_ret == 0)

			return;



		fprintf(stderr, "unexpected EOF while receiving byte\n");

	if (nread != expected_ret) {

		if (ret == 0)

			fprintf(stderr, "unexpected EOF while receiving bytes\n");



		fprintf(stderr, "bogus recv(2) bytes read %zd (expected %zd)\n",

			nread, expected_ret);

		exit(EXIT_FAILURE);

	}

	if (nread != sizeof(byte)) {

		fprintf(stderr, "bogus recv(2) return value %zd\n", nread);

		exit(EXIT_FAILURE);

}



/* Transmit one byte and check the return value.

 *

 * expected_ret:

 *  <0 Negative errno (for testing errors)

 *   0 End-of-file

 *   1 Success

 */

void send_byte(int fd, int expected_ret, int flags)

{

	const uint8_t byte = 'A';



	send_buf(fd, &byte, sizeof(byte), flags, expected_ret);

}



/* Receive one byte and check the return value.

 *

 * expected_ret:

 *  <0 Negative errno (for testing errors)

 *   0 End-of-file

 *   1 Success

 */

void recv_byte(int fd, int expected_ret, int flags)

{

	uint8_t byte;



	recv_buf(fd, &byte, sizeof(byte), flags, expected_ret);



	if (byte != 'A') {

		fprintf(stderr, "unexpected byte read %c\n", byte);

		exit(EXIT_FAILURE);

tools/testing/vsock/util.h

+3 −0
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ int vsock_stream_accept(unsigned int cid, unsigned int port, 
int vsock_seqpacket_accept(unsigned int cid, unsigned int port,

			   struct sockaddr_vm *clientaddrp);

void vsock_wait_remote_close(int fd);

void send_buf(int fd, const void *buf, size_t len, int flags,

	      ssize_t expected_ret);

void recv_buf(int fd, void *buf, size_t len, int flags, ssize_t expected_ret);

void send_byte(int fd, int expected_ret, int flags);

void recv_byte(int fd, int expected_ret, int flags);

void run_tests(const struct test_case *test_cases,

tools/testing/vsock/vsock_test.c

+34 −153
Original line number Diff line number Diff line
@@ -262,7 +262,6 @@ static void test_msg_peek_client(const struct test_opts *opts, 
				 bool seqpacket)

{

	unsigned char buf[MSG_PEEK_BUF_LEN];

	ssize_t send_size;

	int fd;

	int i;
@@ -281,17 +280,7 @@ static void test_msg_peek_client(const struct test_opts *opts, 


	control_expectln("SRVREADY");



	send_size = send(fd, buf, sizeof(buf), 0);



	if (send_size < 0) {

		perror("send");

		exit(EXIT_FAILURE);

	}



	if (send_size != sizeof(buf)) {

		fprintf(stderr, "Invalid send size %zi\n", send_size);

		exit(EXIT_FAILURE);

	}

	send_buf(fd, buf, sizeof(buf), 0, sizeof(buf));



	close(fd);

}
@@ -302,7 +291,6 @@ static void test_msg_peek_server(const struct test_opts *opts, 
	unsigned char buf_half[MSG_PEEK_BUF_LEN / 2];

	unsigned char buf_normal[MSG_PEEK_BUF_LEN];

	unsigned char buf_peek[MSG_PEEK_BUF_LEN];

	ssize_t res;

	int fd;



	if (seqpacket)
@@ -316,34 +304,16 @@ static void test_msg_peek_server(const struct test_opts *opts, 
	}



	/* Peek from empty socket. */

	res = recv(fd, buf_peek, sizeof(buf_peek), MSG_PEEK | MSG_DONTWAIT);

	if (res != -1) {

		fprintf(stderr, "expected recv(2) failure, got %zi\n", res);

		exit(EXIT_FAILURE);

	}



	if (errno != EAGAIN) {

		perror("EAGAIN expected");

		exit(EXIT_FAILURE);

	}

	recv_buf(fd, buf_peek, sizeof(buf_peek), MSG_PEEK | MSG_DONTWAIT,

		 -EAGAIN);



	control_writeln("SRVREADY");



	/* Peek part of data. */

	res = recv(fd, buf_half, sizeof(buf_half), MSG_PEEK);

	if (res != sizeof(buf_half)) {

		fprintf(stderr, "recv(2) + MSG_PEEK, expected %zu, got %zi\n",

			sizeof(buf_half), res);

		exit(EXIT_FAILURE);

	}

	recv_buf(fd, buf_half, sizeof(buf_half), MSG_PEEK, sizeof(buf_half));



	/* Peek whole data. */

	res = recv(fd, buf_peek, sizeof(buf_peek), MSG_PEEK);

	if (res != sizeof(buf_peek)) {

		fprintf(stderr, "recv(2) + MSG_PEEK, expected %zu, got %zi\n",

			sizeof(buf_peek), res);

		exit(EXIT_FAILURE);

	}

	recv_buf(fd, buf_peek, sizeof(buf_peek), MSG_PEEK, sizeof(buf_peek));



	/* Compare partial and full peek. */

	if (memcmp(buf_half, buf_peek, sizeof(buf_half))) {
@@ -356,22 +326,11 @@ static void test_msg_peek_server(const struct test_opts *opts, 
		 * so check it with MSG_PEEK. We must get length

		 * of the message.

		 */

		res = recv(fd, buf_half, sizeof(buf_half), MSG_PEEK |

			   MSG_TRUNC);

		if (res != sizeof(buf_peek)) {

			fprintf(stderr,

				"recv(2) + MSG_PEEK | MSG_TRUNC, exp %zu, got %zi\n",

				sizeof(buf_half), res);

			exit(EXIT_FAILURE);

		}

		recv_buf(fd, buf_half, sizeof(buf_half), MSG_PEEK | MSG_TRUNC,

			 sizeof(buf_peek));

	}



	res = recv(fd, buf_normal, sizeof(buf_normal), 0);

	if (res != sizeof(buf_normal)) {

		fprintf(stderr, "recv(2), expected %zu, got %zi\n",

			sizeof(buf_normal), res);

		exit(EXIT_FAILURE);

	}

	recv_buf(fd, buf_normal, sizeof(buf_normal), 0, sizeof(buf_normal));



	/* Compare full peek and normal read. */

	if (memcmp(buf_peek, buf_normal, sizeof(buf_peek))) {
@@ -416,7 +375,6 @@ static void test_seqpacket_msg_bounds_client(const struct test_opts *opts) 
	msg_count = SOCK_BUF_SIZE / MAX_MSG_SIZE;



	for (int i = 0; i < msg_count; i++) {

		ssize_t send_size;

		size_t buf_size;

		int flags;

		void *buf;
@@ -444,17 +402,7 @@ static void test_seqpacket_msg_bounds_client(const struct test_opts *opts) 
			flags = 0;

		}



		send_size = send(fd, buf, buf_size, flags);



		if (send_size < 0) {

			perror("send");

			exit(EXIT_FAILURE);

		}



		if (send_size != buf_size) {

			fprintf(stderr, "Invalid send size\n");

			exit(EXIT_FAILURE);

		}

		send_buf(fd, buf, buf_size, flags, buf_size);



		/*

		 * Hash sum is computed at both client and server in
@@ -555,10 +503,7 @@ static void test_seqpacket_msg_trunc_client(const struct test_opts *opts) 
		exit(EXIT_FAILURE);

	}



	if (send(fd, buf, sizeof(buf), 0) != sizeof(buf)) {

		perror("send failed");

		exit(EXIT_FAILURE);

	}

	send_buf(fd, buf, sizeof(buf), 0, sizeof(buf));



	control_writeln("SENDDONE");

	close(fd);
@@ -680,7 +625,6 @@ static void test_seqpacket_timeout_server(const struct test_opts *opts) 
static void test_seqpacket_bigmsg_client(const struct test_opts *opts)

{

	unsigned long sock_buf_size;

	ssize_t send_size;

	socklen_t len;

	void *data;

	int fd;
@@ -707,18 +651,7 @@ static void test_seqpacket_bigmsg_client(const struct test_opts *opts) 
		exit(EXIT_FAILURE);

	}



	send_size = send(fd, data, sock_buf_size, 0);

	if (send_size != -1) {

		fprintf(stderr, "expected 'send(2)' failure, got %zi\n",

			send_size);

		exit(EXIT_FAILURE);

	}



	if (errno != EMSGSIZE) {

		fprintf(stderr, "expected EMSGSIZE in 'errno', got %i\n",

			errno);

		exit(EXIT_FAILURE);

	}

	send_buf(fd, data, sock_buf_size, 0, -EMSGSIZE);



	control_writeln("CLISENT");
@@ -772,15 +705,9 @@ static void test_seqpacket_invalid_rec_buffer_client(const struct test_opts *opt 
	memset(buf1, BUF_PATTERN_1, buf_size);

	memset(buf2, BUF_PATTERN_2, buf_size);



	if (send(fd, buf1, buf_size, 0) != buf_size) {

		perror("send failed");

		exit(EXIT_FAILURE);

	}

	send_buf(fd, buf1, buf_size, 0, buf_size);



	if (send(fd, buf2, buf_size, 0) != buf_size) {

		perror("send failed");

		exit(EXIT_FAILURE);

	}

	send_buf(fd, buf2, buf_size, 0, buf_size);



	close(fd);

}
@@ -901,7 +828,6 @@ static void test_stream_poll_rcvlowat_client(const struct test_opts *opts) 
	unsigned long lowat_val = RCVLOWAT_BUF_SIZE;

	char buf[RCVLOWAT_BUF_SIZE];

	struct pollfd fds;

	ssize_t read_res;

	short poll_flags;

	int fd;
@@ -956,12 +882,7 @@ static void test_stream_poll_rcvlowat_client(const struct test_opts *opts) 
	/* Use MSG_DONTWAIT, if call is going to wait, EAGAIN

	 * will be returned.

	 */

	read_res = recv(fd, buf, sizeof(buf), MSG_DONTWAIT);

	if (read_res != RCVLOWAT_BUF_SIZE) {

		fprintf(stderr, "Unexpected recv result %zi\n",

			read_res);

		exit(EXIT_FAILURE);

	}

	recv_buf(fd, buf, sizeof(buf), MSG_DONTWAIT, RCVLOWAT_BUF_SIZE);



	control_writeln("POLLDONE");
@@ -973,7 +894,7 @@ static void test_stream_poll_rcvlowat_client(const struct test_opts *opts) 
static void test_inv_buf_client(const struct test_opts *opts, bool stream)

{

	unsigned char data[INV_BUF_TEST_DATA_LEN] = {0};

	ssize_t ret;

	ssize_t expected_ret;

	int fd;



	if (stream)
@@ -989,38 +910,17 @@ static void test_inv_buf_client(const struct test_opts *opts, bool stream) 
	control_expectln("SENDDONE");



	/* Use invalid buffer here. */

	ret = recv(fd, NULL, sizeof(data), 0);

	if (ret != -1) {

		fprintf(stderr, "expected recv(2) failure, got %zi\n", ret);

		exit(EXIT_FAILURE);

	}



	if (errno != EFAULT) {

		fprintf(stderr, "unexpected recv(2) errno %d\n", errno);

		exit(EXIT_FAILURE);

	}



	ret = recv(fd, data, sizeof(data), MSG_DONTWAIT);

	recv_buf(fd, NULL, sizeof(data), 0, -EFAULT);



	if (stream) {

		/* For SOCK_STREAM we must continue reading. */

		if (ret != sizeof(data)) {

			fprintf(stderr, "expected recv(2) success, got %zi\n", ret);

			exit(EXIT_FAILURE);

		}

		/* Don't check errno in case of success. */

		expected_ret = sizeof(data);

	} else {

		/* For SOCK_SEQPACKET socket's queue must be empty. */

		if (ret != -1) {

			fprintf(stderr, "expected recv(2) failure, got %zi\n", ret);

			exit(EXIT_FAILURE);

		expected_ret = -EAGAIN;

	}



		if (errno != EAGAIN) {

			fprintf(stderr, "unexpected recv(2) errno %d\n", errno);

			exit(EXIT_FAILURE);

		}

	}

	recv_buf(fd, data, sizeof(data), MSG_DONTWAIT, expected_ret);



	control_writeln("DONE");
@@ -1030,7 +930,6 @@ static void test_inv_buf_client(const struct test_opts *opts, bool stream) 
static void test_inv_buf_server(const struct test_opts *opts, bool stream)

{

	unsigned char data[INV_BUF_TEST_DATA_LEN] = {0};

	ssize_t res;

	int fd;



	if (stream)
@@ -1043,11 +942,7 @@ static void test_inv_buf_server(const struct test_opts *opts, bool stream) 
		exit(EXIT_FAILURE);

	}



	res = send(fd, data, sizeof(data), 0);

	if (res != sizeof(data)) {

		fprintf(stderr, "unexpected send(2) result %zi\n", res);

		exit(EXIT_FAILURE);

	}

	send_buf(fd, data, sizeof(data), 0, sizeof(data));



	control_writeln("SENDDONE");
@@ -1081,7 +976,6 @@ static void test_seqpacket_inv_buf_server(const struct test_opts *opts) 


static void test_stream_virtio_skb_merge_client(const struct test_opts *opts)

{

	ssize_t res;

	int fd;



	fd = vsock_stream_connect(opts->peer_cid, 1234);
@@ -1091,22 +985,14 @@ static void test_stream_virtio_skb_merge_client(const struct test_opts *opts) 
	}



	/* Send first skbuff. */

	res = send(fd, HELLO_STR, strlen(HELLO_STR), 0);

	if (res != strlen(HELLO_STR)) {

		fprintf(stderr, "unexpected send(2) result %zi\n", res);

		exit(EXIT_FAILURE);

	}

	send_buf(fd, HELLO_STR, strlen(HELLO_STR), 0, strlen(HELLO_STR));



	control_writeln("SEND0");

	/* Peer reads part of first skbuff. */

	control_expectln("REPLY0");



	/* Send second skbuff, it will be appended to the first. */

	res = send(fd, WORLD_STR, strlen(WORLD_STR), 0);

	if (res != strlen(WORLD_STR)) {

		fprintf(stderr, "unexpected send(2) result %zi\n", res);

		exit(EXIT_FAILURE);

	}

	send_buf(fd, WORLD_STR, strlen(WORLD_STR), 0, strlen(WORLD_STR));



	control_writeln("SEND1");

	/* Peer reads merged skbuff packet. */
@@ -1117,8 +1003,8 @@ static void test_stream_virtio_skb_merge_client(const struct test_opts *opts) 


static void test_stream_virtio_skb_merge_server(const struct test_opts *opts)

{

	size_t read = 0, to_read;

	unsigned char buf[64];

	ssize_t res;

	int fd;



	fd = vsock_stream_accept(VMADDR_CID_ANY, 1234, NULL);
@@ -1130,26 +1016,21 @@ static void test_stream_virtio_skb_merge_server(const struct test_opts *opts) 
	control_expectln("SEND0");



	/* Read skbuff partially. */

	res = recv(fd, buf, 2, 0);

	if (res != 2) {

		fprintf(stderr, "expected recv(2) returns 2 bytes, got %zi\n", res);

		exit(EXIT_FAILURE);

	}

	to_read = 2;

	recv_buf(fd, buf + read, to_read, 0, to_read);

	read += to_read;



	control_writeln("REPLY0");

	control_expectln("SEND1");



	res = recv(fd, buf + 2, sizeof(buf) - 2, 0);

	if (res != 8) {

		fprintf(stderr, "expected recv(2) returns 8 bytes, got %zi\n", res);

		exit(EXIT_FAILURE);

	}

	/* Read the rest of both buffers */

	to_read = strlen(HELLO_STR WORLD_STR) - read;

	recv_buf(fd, buf + read, to_read, 0, to_read);

	read += to_read;



	res = recv(fd, buf, sizeof(buf) - 8 - 2, MSG_DONTWAIT);

	if (res != -1) {

		fprintf(stderr, "expected recv(2) failure, got %zi\n", res);

		exit(EXIT_FAILURE);

	}

	/* No more bytes should be there */

	to_read = sizeof(buf) - read;

	recv_buf(fd, buf + read, to_read, MSG_DONTWAIT, -EAGAIN);



	if (memcmp(buf, HELLO_STR WORLD_STR, strlen(HELLO_STR WORLD_STR))) {

		fprintf(stderr, "pattern mismatch\n");