uringmachine 0.19 → 0.20.0

data/vendor/liburing/test/send_recv.c

@@ -15,13 +15,15 @@
 #include "liburing.h"
 #include "helpers.h"
 
-static char str[] = "This is a test of send and recv over io_uring!";
+#define MAX_MSG	4096
 
-#define MAX_MSG	128
+static unsigned long str[MAX_MSG / sizeof(unsigned long)];
 
 #define PORT	10202
 #define HOST	"127.0.0.1"
 
+static int no_send_vec;
+
 static int recv_prep(struct io_uring *ring, struct iovec *iov, int *sock,
 		     int registerfiles, int async, int provide)
 {
@@ -86,7 +88,8 @@ err:
 static int do_recv(struct io_uring *ring, struct iovec *iov, int enobufs)
 {
 	struct io_uring_cqe *cqe;
-	int ret;
+	unsigned long *ptr;
+	int i, ret;
 
 	ret = io_uring_wait_cqe(ring, &cqe);
 	if (ret) {
@@ -109,14 +112,16 @@ static int do_recv(struct io_uring *ring, struct iovec *iov, int enobufs)
 		goto err;
 	}
 
-	if (cqe->res -1 != strlen(str)) {
-		fprintf(stderr, "got wrong length: %d/%d\n", cqe->res,
-							(int) strlen(str) + 1);
+	if (cqe->res != MAX_MSG) {
+		fprintf(stderr, "got wrong length: %d/%d\n", cqe->res, MAX_MSG);
 		goto err;
 	}
 
-	if (strcmp(str, iov->iov_base)) {
-		fprintf(stderr, "string mismatch\n");
+	ptr = iov->iov_base;
+	for (i = 0; i < MAX_MSG / sizeof(unsigned long); i++) {
+		if (ptr[i] == str[i])
+			continue;
+		fprintf(stderr, "data mismatch at %d: %lu\n", i, ptr[i]);
 		goto err;
 	}
 
@@ -183,13 +188,10 @@ err:
 	return (void *)(intptr_t)ret;
 }
 
-static int do_send(void)
+static int do_send(int async, int vec, int big_vec)
 {
 	struct sockaddr_in saddr;
-	struct iovec iov = {
-		.iov_base = str,
-		.iov_len = sizeof(str),
-	};
+	struct iovec vecs[32];
 	struct io_uring ring;
 	struct io_uring_cqe *cqe;
 	struct io_uring_sqe *sqe;
@@ -218,8 +220,37 @@ static int do_send(void)
 		goto err;
 	}
 
+retry:
 	sqe = io_uring_get_sqe(&ring);
-	io_uring_prep_send(sqe, sockfd, iov.iov_base, iov.iov_len, 0);
+	if (vec) {
+		size_t total = MAX_MSG;
+		unsigned long *ptr = str;
+		int i, nvecs;
+
+		if (!big_vec) {
+			vecs[0].iov_base = str;
+			vecs[0].iov_len = MAX_MSG / 2;
+			vecs[1].iov_base = &str[256];
+			vecs[1].iov_len = MAX_MSG / 2;
+			nvecs = 2;
+		} else {
+			total /= 32;
+
+			for (i = 0; i < 32; i++) {
+				vecs[i].iov_base = ptr;
+				vecs[i].iov_len = total;
+				ptr += total / sizeof(unsigned long);
+			}
+			nvecs = 32;
+		}
+
+		io_uring_prep_send(sqe, sockfd, vecs, nvecs, 0);
+		sqe->ioprio = (1U << 5);
+	} else {
+		io_uring_prep_send(sqe, sockfd, str, sizeof(str), 0);
+	}
+	if (async)
+		sqe->flags |= IOSQE_ASYNC;
 	sqe->user_data = 1;
 
 	ret = io_uring_submit(&ring);
@@ -230,10 +261,16 @@ static int do_send(void)
 
 	ret = io_uring_wait_cqe(&ring, &cqe);
 	if (cqe->res == -EINVAL) {
+		if (vec) {
+			vec = 0;
+			no_send_vec = 1;
+			io_uring_cqe_seen(&ring, cqe);
+			goto retry;
+		}
 		fprintf(stdout, "send not supported, skipping\n");
 		goto err;
 	}
-	if (cqe->res != iov.iov_len) {
+	if (cqe->res != sizeof(str)) {
 		fprintf(stderr, "failed cqe: %d\n", cqe->res);
 		goto err;
 	}
@@ -249,7 +286,8 @@ err2:
 	return 1;
 }
 
-static int test(int use_sqthread, int regfiles, int async, int provide)
+static int test(int use_sqthread, int regfiles, int async, int provide, int vec,
+		int big_vec)
 {
 	pthread_mutexattr_t attr;
 	pthread_t recv_thread;
@@ -257,6 +295,9 @@ static int test(int use_sqthread, int regfiles, int async, int provide)
 	int ret;
 	void *retval;
 
+	if (vec && no_send_vec)
+		return T_EXIT_SKIP;
+
 	pthread_mutexattr_init(&attr);
 	pthread_mutexattr_setpshared(&attr, 1);
 	pthread_mutex_init(&rd.mutex, &attr);
@@ -274,7 +315,7 @@ static int test(int use_sqthread, int regfiles, int async, int provide)
 	}
 
 	pthread_mutex_lock(&rd.mutex);
-	do_send();
+	do_send(async, vec, big_vec);
 	pthread_join(recv_thread, &retval);
 	return (intptr_t)retval;
 }
@@ -325,10 +366,13 @@ static int test_invalid(void)
 
 int main(int argc, char *argv[])
 {
-	int ret;
+	int i, ret;
 
 	if (argc > 1)
-		return 0;
+		return T_EXIT_SKIP;
+
+	for (i = 0; i < MAX_MSG / sizeof(unsigned long); i++)
+		str[i] = i + 1;
 
 	ret = test_invalid();
 	if (ret) {
@@ -336,77 +380,103 @@ int main(int argc, char *argv[])
 		return ret;
 	}
 
-	ret = test(0, 0, 1, 1);
+	ret = test(0, 0, 1, 1, 0, 0);
 	if (ret) {
 		fprintf(stderr, "test sqthread=0 1 1 failed\n");
 		return ret;
 	}
 
-	ret = test(1, 1, 1, 1);
+	ret = test(1, 1, 1, 1, 0, 0);
 	if (ret) {
 		fprintf(stderr, "test sqthread=1 reg=1 1 1 failed\n");
 		return ret;
 	}
 
-	ret = test(1, 0, 1, 1);
+	ret = test(1, 0, 1, 1, 0, 0);
 	if (ret) {
 		fprintf(stderr, "test sqthread=1 reg=0 1 1 failed\n");
 		return ret;
 	}
 
-	ret = test(0, 0, 0, 1);
+	ret = test(0, 0, 0, 1, 0, 0);
 	if (ret) {
 		fprintf(stderr, "test sqthread=0 0 1 failed\n");
 		return ret;
 	}
 
-	ret = test(1, 1, 0, 1);
+	ret = test(1, 1, 0, 1, 0, 0);
 	if (ret) {
 		fprintf(stderr, "test sqthread=1 reg=1 0 1 failed\n");
 		return ret;
 	}
 
-	ret = test(1, 0, 0, 1);
+	ret = test(1, 0, 0, 1, 0, 0);
 	if (ret) {
 		fprintf(stderr, "test sqthread=1 reg=0 0 1 failed\n");
 		return ret;
 	}
 
-	ret = test(0, 0, 1, 0);
+	ret = test(0, 0, 1, 0, 0, 0);
 	if (ret) {
 		fprintf(stderr, "test sqthread=0 0 1 failed\n");
 		return ret;
 	}
 
-	ret = test(1, 1, 1, 0);
+	ret = test(1, 1, 1, 0, 0, 0);
 	if (ret) {
 		fprintf(stderr, "test sqthread=1 reg=1 1 0 failed\n");
 		return ret;
 	}
 
-	ret = test(1, 0, 1, 0);
+	ret = test(1, 0, 1, 0, 0, 0);
 	if (ret) {
 		fprintf(stderr, "test sqthread=1 reg=0 1 0 failed\n");
 		return ret;
 	}
 
-	ret = test(0, 0, 0, 0);
+	ret = test(0, 0, 0, 0, 0, 0);
 	if (ret) {
 		fprintf(stderr, "test sqthread=0 0 0 failed\n");
 		return ret;
 	}
 
-	ret = test(1, 1, 0, 0);
+	ret = test(1, 1, 0, 0, 0, 0);
 	if (ret) {
 		fprintf(stderr, "test sqthread=1 reg=1 0 0 failed\n");
 		return ret;
 	}
 
-	ret = test(1, 0, 0, 0);
+	ret = test(1, 0, 0, 0, 0, 0);
 	if (ret) {
 		fprintf(stderr, "test sqthread=1 reg=0 0 0 failed\n");
 		return ret;
 	}
 
-	return 0;
+	ret = test(0, 0, 0, 0, 1, 0);
+	if (ret) {
+		fprintf(stderr, "test small vec sync failed\n");
+		return ret;
+	}
+	if (no_send_vec)
+		return T_EXIT_PASS;
+
+	ret = test(0, 0, 1, 0, 1, 0);
+	if (ret) {
+		fprintf(stderr, "test small vec async failed\n");
+		return ret;
+	}
+
+	ret = test(0, 0, 0, 0, 1, 1);
+	if (ret) {
+		fprintf(stderr, "test big vec sync failed\n");
+		return ret;
+	}
+
+	ret = test(0, 0, 1, 0, 1, 1);
+	if (ret) {
+		fprintf(stderr, "test big vec async failed\n");
+		return ret;
+	}
+
+	return T_EXIT_PASS;
 }

data/vendor/liburing/test/shutdown.c

@@ -58,22 +58,12 @@ int main(int argc, char *argv[])
 	ret = setsockopt(p_fd[1], IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val));
 	assert(ret != -1);
 
-	int32_t flags = fcntl(p_fd[1], F_GETFL, 0);
-	assert(flags != -1);
-
-	flags |= O_NONBLOCK;
-	ret = fcntl(p_fd[1], F_SETFL, flags);
-	assert(ret != -1);
+	t_set_nonblock(p_fd[1]);
 
 	ret = connect(p_fd[1], (struct sockaddr*)&addr, sizeof(addr));
 	assert(ret == -1);
 
-	flags = fcntl(p_fd[1], F_GETFL, 0);
-	assert(flags != -1);
-
-	flags &= ~O_NONBLOCK;
-	ret = fcntl(p_fd[1], F_SETFL, flags);
-	assert(ret != -1);
+	t_clear_nonblock(p_fd[1]);
 
 	p_fd[0] = accept(recv_s0, NULL, NULL);
 	assert(p_fd[0] != -1);

data/vendor/liburing/test/socket-nb.c

@@ -51,12 +51,7 @@ static int test(int o_nonblock, int msg_dontwait)
 	ret = setsockopt(p_fd[1], IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val));
 	assert(ret != -1);
 
-	flags = fcntl(p_fd[1], F_GETFL, 0);
-	assert(flags != -1);
-
-	flags |= O_NONBLOCK;
-	ret = fcntl(p_fd[1], F_SETFL, flags);
-	assert(ret != -1);
+	t_set_nonblock(p_fd[1]);
 
 	ret = connect(p_fd[1], (struct sockaddr *) &addr, sizeof(addr));
 	assert(ret == -1);
@@ -64,14 +59,8 @@ static int test(int o_nonblock, int msg_dontwait)
 	p_fd[0] = accept(recv_s0, NULL, NULL);
 	assert(p_fd[0] != -1);
 
-	if (o_nonblock) {
-		flags = fcntl(p_fd[0], F_GETFL, 0);
-		assert(flags != -1);
-
-		flags |= O_NONBLOCK;
-		ret = fcntl(p_fd[0], F_SETFL, flags);
-		assert(ret != -1);
-	}
+	if (o_nonblock)
+		t_set_nonblock(p_fd[0]);
 
 	while (1) {
 		int32_t code;

data/vendor/liburing/test/socket-rw-eagain.c

@@ -53,12 +53,7 @@ int main(int argc, char *argv[])
 	ret = setsockopt(p_fd[1], IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val));
 	assert(ret != -1);
 
-	int32_t flags = fcntl(p_fd[1], F_GETFL, 0);
-	assert(flags != -1);
-
-	flags |= O_NONBLOCK;
-	ret = fcntl(p_fd[1], F_SETFL, flags);
-	assert(ret != -1);
+	t_set_nonblock(p_fd[1]);
 
 	ret = connect(p_fd[1], (struct sockaddr*)&addr, sizeof(addr));
 	assert(ret == -1);
@@ -66,12 +61,7 @@ int main(int argc, char *argv[])
 	p_fd[0] = accept(recv_s0, NULL, NULL);
 	assert(p_fd[0] != -1);
 
-	flags = fcntl(p_fd[0], F_GETFL, 0);
-	assert(flags != -1);
-
-	flags |= O_NONBLOCK;
-        ret = fcntl(p_fd[0], F_SETFL, flags);
-	assert(ret != -1);
+	t_set_nonblock(p_fd[0]);
 
 	while (1) {
 		int32_t code;

data/vendor/liburing/test/socket-rw-offset.c

@@ -56,22 +56,12 @@ int main(int argc, char *argv[])
 	ret = setsockopt(p_fd[1], IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val));
 	assert(ret != -1);
 
-	int32_t flags = fcntl(p_fd[1], F_GETFL, 0);
-	assert(flags != -1);
-
-	flags |= O_NONBLOCK;
-	ret = fcntl(p_fd[1], F_SETFL, flags);
-	assert(ret != -1);
+	t_set_nonblock(p_fd[1]);
 
 	ret = connect(p_fd[1], (struct sockaddr*)&addr, sizeof(addr));
 	assert(ret == -1);
 
-	flags = fcntl(p_fd[1], F_GETFL, 0);
-	assert(flags != -1);
-
-	flags &= ~O_NONBLOCK;
-	ret = fcntl(p_fd[1], F_SETFL, flags);
-	assert(ret != -1);
+	t_clear_nonblock(p_fd[1]);
 
 	p_fd[0] = accept(recv_s0, NULL, NULL);
 	assert(p_fd[0] != -1);

data/vendor/liburing/test/socket-rw.c

@@ -56,22 +56,12 @@ int main(int argc, char *argv[])
 	ret = setsockopt(p_fd[1], IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val));
 	assert(ret != -1);
 
-	int32_t flags = fcntl(p_fd[1], F_GETFL, 0);
-	assert(flags != -1);
-
-	flags |= O_NONBLOCK;
-	ret = fcntl(p_fd[1], F_SETFL, flags);
-	assert(ret != -1);
+	t_set_nonblock(p_fd[1]);
 
 	ret = connect(p_fd[1], (struct sockaddr*)&addr, sizeof(addr));
 	assert(ret == -1);
 
-	flags = fcntl(p_fd[1], F_GETFL, 0);
-	assert(flags != -1);
-
-	flags &= ~O_NONBLOCK;
-	ret = fcntl(p_fd[1], F_SETFL, flags);
-	assert(ret != -1);
+	t_clear_nonblock(p_fd[1]);
 
 	p_fd[0] = accept(recv_s0, NULL, NULL);
 	assert(p_fd[0] != -1);

data/vendor/liburing/test/sqe-mixed-bad-wrap.c

@@ -0,0 +1,87 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Description: run various nop tests
+ *
+ */
+#include <stdio.h>
+
+#include "liburing.h"
+#include "helpers.h"
+#include "test.h"
+
+static int seq;
+
+static int test_single_nop(struct io_uring *ring, bool should_fail)
+{
+	struct io_uring_cqe *cqe;
+	struct io_uring_sqe *sqe;
+	int ret;
+
+	sqe = io_uring_get_sqe(ring);
+	if (!sqe) {
+		fprintf(stderr, "get sqe failed\n");
+		return T_EXIT_FAIL;
+	}
+
+	if (should_fail)
+		io_uring_prep_nop128(sqe);
+	else
+		io_uring_prep_nop(sqe);
+	sqe->user_data = ++seq;
+
+	ret = io_uring_submit(ring);
+	if (ret <= 0) {
+		fprintf(stderr, "sqe submit failed: %d\n", ret);
+		return T_EXIT_FAIL;
+	}
+
+	ret = io_uring_wait_cqe(ring, &cqe);
+	if (ret < 0) {
+		fprintf(stderr, "wait completion %d\n", ret);
+	} else if (should_fail && cqe->res == 0) {
+		fprintf(stderr, "Unexpected success\n");
+	} else if (!should_fail && cqe->res != 0) {
+		fprintf(stderr, "Completion error:%d\n", cqe->res);
+	} else if (cqe->res == 0 && cqe->user_data != seq) {
+		fprintf(stderr, "Unexpected user_data: %ld\n", (long) cqe->user_data);
+	} else {
+		io_uring_cqe_seen(ring, cqe);
+		return T_EXIT_PASS;
+	}
+	return T_EXIT_FAIL;
+}
+
+int main(int argc, char *argv[])
+{
+	struct io_uring ring;
+	int ret, i;
+
+	if (argc > 1)
+		return T_EXIT_SKIP;
+
+	ret = io_uring_queue_init(8, &ring, IORING_SETUP_SQE_MIXED);
+	if (ret) {
+		if (ret == -EINVAL)
+			return T_EXIT_SKIP;
+		fprintf(stderr, "ring setup failed: %d\n", ret);
+		return T_EXIT_FAIL;
+	}
+
+	/* prime the sq to the last entry before wrapping */
+	for (i = 0; i < 7; i++) {
+		ret = test_single_nop(&ring, false);
+		if (ret != T_EXIT_PASS)
+			goto done;
+	}
+
+	/* inserting a 128b sqe in the last entry should fail */
+	ret = test_single_nop(&ring, true);
+	if (ret != T_EXIT_PASS)
+		goto done;
+
+	/* proceeding from the bad wrap should succeed */
+	ret = test_single_nop(&ring, false);
+done:
+	io_uring_queue_exit(&ring);
+	return ret;
+}

data/vendor/liburing/test/sqe-mixed-nop.c

@@ -0,0 +1,82 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Description: run various nop tests
+ *
+ */
+#include <stdio.h>
+
+#include "liburing.h"
+#include "helpers.h"
+#include "test.h"
+
+static int seq;
+
+static int test_single_nop(struct io_uring *ring, bool sqe128)
+{
+	struct io_uring_cqe *cqe;
+	struct io_uring_sqe *sqe;
+	int ret;
+
+	if (sqe128)
+		sqe = io_uring_get_sqe128(ring);
+	else
+		sqe = io_uring_get_sqe(ring);
+
+	if (!sqe) {
+		fprintf(stderr, "get sqe failed\n");
+		return T_EXIT_FAIL;
+	}
+
+	if (sqe128)
+		io_uring_prep_nop128(sqe);
+	else
+		io_uring_prep_nop(sqe);
+
+	sqe->user_data = ++seq;
+
+	ret = io_uring_submit(ring);
+	if (ret <= 0) {
+		fprintf(stderr, "sqe submit failed: %d\n", ret);
+		return T_EXIT_FAIL;
+	}
+
+	ret = io_uring_wait_cqe(ring, &cqe);
+	if (ret < 0) {
+		fprintf(stderr, "wait completion %d\n", ret);
+	} else if (cqe->res != 0) {
+		fprintf(stderr, "Completion error:%d\n", cqe->res);
+	} else if (cqe->user_data != seq) {
+		fprintf(stderr, "Unexpected user_data: %ld\n", (long) cqe->user_data);
+	} else {
+		io_uring_cqe_seen(ring, cqe);
+		return T_EXIT_PASS;
+	}
+	return T_EXIT_FAIL;
+}
+
+int main(int argc, char *argv[])
+{
+	struct io_uring ring;
+	int ret, i;
+
+	if (argc > 1)
+		return T_EXIT_SKIP;
+
+	ret = io_uring_queue_init(8, &ring, IORING_SETUP_SQE_MIXED);
+	if (ret) {
+		if (ret == -EINVAL)
+			return T_EXIT_SKIP;
+		fprintf(stderr, "ring setup failed: %d\n", ret);
+		return T_EXIT_FAIL;
+	}
+
+	/* alternate big and little sqe's */
+	for (i = 0; i < 32; i++) {
+		ret = test_single_nop(&ring, i & 1);
+		if (ret != T_EXIT_PASS)
+			break;
+	}
+
+	io_uring_queue_exit(&ring);
+	return ret;
+}