uringmachine 0.10 → 0.11.1

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

@@ -0,0 +1,158 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Check that recv on an empty socket will bubble back -EAGAIN if
+ * MSG_DONTWAIT is set, regardless of whether or not O_NONBLOCK is set
+ * on the socket itself.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <assert.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <netinet/tcp.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
+#include "liburing.h"
+#include "helpers.h"
+
+static int test(int o_nonblock, int msg_dontwait)
+{
+	int p_fd[2], ret, flags, recv_s0, val;
+	struct io_uring_sqe *sqe;
+	struct io_uring_cqe *cqe;
+	struct sockaddr_in addr;
+	struct io_uring ring;
+	char recv_buff[128];
+
+	recv_s0 = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, IPPROTO_TCP);
+
+	val = 1;
+	ret = setsockopt(recv_s0, SOL_SOCKET, SO_REUSEPORT, &val, sizeof(val));
+	assert(ret != -1);
+	ret = setsockopt(recv_s0, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
+	assert(ret != -1);
+
+	addr.sin_family = AF_INET;
+	addr.sin_addr.s_addr = inet_addr("127.0.0.1");
+	ret = t_bind_ephemeral_port(recv_s0, &addr);
+	assert(!ret);
+	ret = listen(recv_s0, 128);
+	assert(ret != -1);
+
+	p_fd[1] = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, IPPROTO_TCP);
+
+	val = 1;
+	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);
+
+	ret = connect(p_fd[1], (struct sockaddr *) &addr, sizeof(addr));
+	assert(ret == -1);
+
+	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);
+	}
+
+	while (1) {
+		int32_t code;
+		socklen_t code_len = sizeof(code);
+
+		ret = getsockopt(p_fd[1], SOL_SOCKET, SO_ERROR, &code, &code_len);
+		assert(ret != -1);
+
+		if (!code)
+			break;
+	}
+
+	ret = io_uring_queue_init(32, &ring, 0);
+	assert(ret >= 0);
+
+	flags = msg_dontwait ? MSG_DONTWAIT : 0;
+	sqe = io_uring_get_sqe(&ring);
+	io_uring_prep_recv(sqe, p_fd[0], recv_buff, sizeof(recv_buff), flags);
+	sqe->user_data = 1;
+	io_uring_submit(&ring);
+
+	ret = io_uring_peek_cqe(&ring, &cqe);
+	if (ret) {
+		if (ret != -EAGAIN) {
+			fprintf(stderr, "bad peek: %d\n", ret);
+			goto err;
+		}
+		if (msg_dontwait) {
+			fprintf(stderr, "Got -EAGAIN without MSG_DONTWAIT\n");
+			goto err;
+		}
+	} else {
+		if (!msg_dontwait) {
+			fprintf(stderr, "Unexpected completion\n");
+			goto err;
+		}
+	}
+
+	io_uring_queue_exit(&ring);
+	close(p_fd[0]);
+	close(p_fd[1]);
+	close(recv_s0);
+	return T_EXIT_PASS;
+err:
+	io_uring_queue_exit(&ring);
+	close(p_fd[0]);
+	close(p_fd[1]);
+	close(recv_s0);
+	return T_EXIT_FAIL;
+}
+
+int main(int argc, char *argv[])
+{
+	int ret;
+
+	if (argc > 1)
+		return T_EXIT_SKIP;
+
+	ret = test(0, 0);
+	if (ret) {
+		fprintf(stderr, "test 0 0 failed\n");
+		return T_EXIT_FAIL;
+	}
+
+	ret = test(0, 1);
+	if (ret) {
+		fprintf(stderr, "test 0 1 failed\n");
+		return T_EXIT_FAIL;
+	}
+
+	ret = test(1, 0);
+	if (ret) {
+		fprintf(stderr, "test 1 0 failed\n");
+		return T_EXIT_FAIL;
+	}
+
+	ret = test(1, 1);
+	if (ret) {
+		fprintf(stderr, "test 1 1 failed\n");
+		return T_EXIT_FAIL;
+	}
+
+	return T_EXIT_PASS;
+}

data/vendor/liburing/test/sqwait.c

@@ -60,6 +60,12 @@ int main(int argc, char *argv[])
 	}
 
 	fret = T_EXIT_SKIP;
+	for (i = 0; i < INFLIGHT; i++) {
+		if (posix_memalign(&iovs[i].iov_base, 4096, 4096))
+			goto err;
+		iovs[i].iov_len = 4096;
+	}
+
 	ret = io_uring_queue_init(8, &ring, IORING_SETUP_SQPOLL);
 	if (ret < 0) {
 		if (errno == EINVAL || errno == EPERM)
@@ -78,12 +84,6 @@ int main(int argc, char *argv[])
 		goto err;
 	}
 
-	for (i = 0; i < INFLIGHT; i++) {
-		if (posix_memalign(&iovs[i].iov_base, 4096, 4096))
-			goto err;
-		iovs[i].iov_len = 4096;
-	}
-
 	iov_off = off = 0;
 	for (i = 0; i < NR_IOS; i++) {
 		struct iovec *iov = &iovs[iov_off];
@@ -121,16 +121,14 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	if (fd != -1)
-		close(fd);
-	if (fname != argv[1])
-		unlink(fname);
 	io_uring_queue_exit(&ring);
-	return T_EXIT_PASS;
+	fret = T_EXIT_PASS;
 err:
 	if (fd != -1)
 		close(fd);
 	if (fname != argv[1])
 		unlink(fname);
+	for (i = 0; i < INFLIGHT; i++)
+		free(iovs[i].iov_base);
 	return fret;
 }

data/vendor/liburing/test/timeout.c

@@ -13,6 +13,7 @@
 #include <sys/wait.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/eventfd.h>
 
 #include "helpers.h"
 #include "liburing.h"
@@ -1062,6 +1063,153 @@ err:
 	return 1;
 }
 
+static int test_update_multishot_timeouts(struct io_uring *ring, unsigned long ms)
+{
+	struct io_uring_sqe *sqe;
+	struct io_uring_cqe *cqe;
+	struct __kernel_timespec ts, ts_upd;
+	unsigned long long exp_ms, base_ms = 10000;
+	struct timeval tv1, tv2;
+	int ret, i, nr = 6;
+	__u32 mode = 0;
+
+	if (no_multishot)
+		return T_EXIT_SKIP;
+
+	msec_to_ts(&ts, base_ms);
+
+	msec_to_ts(&ts_upd, ms);
+	gettimeofday(&tv1, NULL);
+	gettimeofday(&tv2, NULL);
+
+	sqe = io_uring_get_sqe(ring);
+	if (!sqe) {
+		fprintf(stderr, "%s: get sqe failed\n", __FUNCTION__);
+		goto err;
+	}
+
+	msec_to_ts(&ts, base_ms);
+	io_uring_prep_timeout(sqe, &ts, 0, IORING_TIMEOUT_MULTISHOT);
+	sqe->user_data = 1;
+
+	sqe = io_uring_get_sqe(ring);
+	if (!sqe) {
+		fprintf(stderr, "%s: get sqe failed\n", __FUNCTION__);
+		goto err;
+	}
+
+	io_uring_prep_timeout(sqe, &ts, 0, IORING_TIMEOUT_MULTISHOT);
+	sqe->user_data = 2;
+
+	sqe = io_uring_get_sqe(ring);
+	if (!sqe) {
+		fprintf(stderr, "%s: get sqe failed\n", __FUNCTION__);
+		goto err;
+	}
+
+	io_uring_prep_timeout_update(sqe, &ts_upd, 1, mode);
+	sqe->user_data = 3;
+
+	sqe = io_uring_get_sqe(ring);
+	if (!sqe) {
+		fprintf(stderr, "%s: get sqe failed\n", __FUNCTION__);
+		goto err;
+	}
+
+	io_uring_prep_timeout_update(sqe, &ts_upd, 2, mode);
+	sqe->user_data = 4;
+
+	ret = io_uring_submit(ring);
+	if (ret == 0) {
+		fprintf(stderr, "%s: sqe submit failed: %d\n", __FUNCTION__, ret);
+		goto err;
+	}
+
+	for (i = 0; i < nr; i++) {
+		ret = io_uring_wait_cqe(ring, &cqe);
+		if (ret < 0) {
+			fprintf(stderr, "%s: wait completion %d\n", __FUNCTION__, ret);
+			goto err;
+		}
+
+		switch (cqe->user_data) {
+		case 1:
+			if (cqe->res != -ETIME) {
+				fprintf(stderr, "%s: got %d, wanted %d\n",
+						__FUNCTION__, cqe->res, -ETIME);
+				goto err;
+			}
+			exp_ms = mtime_since_now(&tv1);
+			if (exp_ms > 1.05 * ms) {
+				fprintf(stderr, "too long, timeout wasn't updated (expired after %llu instead of %lu)\n", exp_ms, ms);
+				goto err;
+			}
+			gettimeofday(&tv1, NULL);
+
+			break;
+		case 2:
+			if (cqe->res != -ETIME) {
+				fprintf(stderr, "%s: got %d, wanted %d\n",
+						__FUNCTION__, cqe->res, -ETIME);
+				goto err;
+			}
+			exp_ms = mtime_since_now(&tv2);
+			if (exp_ms > 1.05 * ms) {
+				fprintf(stderr, "too long, timeout wasn't updated (expired after %llu instead of %lu)\n", exp_ms, ms);
+				goto err;
+			}
+			gettimeofday(&tv2, NULL);
+			break;
+		case 3:
+		case 4:
+			if (cqe->res != 0) {
+				fprintf(stderr, "%s: got %d, wanted %d\n",
+						__FUNCTION__, cqe->res, 0);
+				goto err;
+			}
+			break;
+		default:
+			goto err;
+		}
+		io_uring_cqe_seen(ring, cqe);
+	}
+
+	sqe = io_uring_get_sqe(ring);
+	if (!sqe) {
+		fprintf(stderr, "%s: get sqe failed\n", __FUNCTION__);
+		goto err;
+	}
+
+	io_uring_prep_timeout_remove(sqe, 1, 0);
+
+	sqe = io_uring_get_sqe(ring);
+	if (!sqe) {
+		fprintf(stderr, "%s: get sqe failed\n", __FUNCTION__);
+		goto err;
+	}
+
+	io_uring_prep_timeout_remove(sqe, 2, 0);
+
+	ret = io_uring_submit(ring);
+	if (ret != 2) {
+		fprintf(stderr, "%s: sqe submit failed: %d\n", __FUNCTION__, ret);
+		goto err;
+	}
+
+	for (i = 0; i < 2; i++) {
+		ret = io_uring_wait_cqe(ring, &cqe);
+		if (ret < 0) {
+			fprintf(stderr, "%s: wait completion %d\n", __FUNCTION__, ret);
+			goto err;
+		}
+		io_uring_cqe_seen(ring, cqe);
+	}
+
+	return 0;
+err:
+	return 1;
+}
+
 static int test_update_nonexistent_timeout(struct io_uring *ring)
 {
 	struct io_uring_sqe *sqe;
@@ -1559,6 +1707,44 @@ err:
 	return 1;
 }
 
+static int test_eventfd(void)
+{
+	struct __kernel_timespec ts = { .tv_sec = 5, };
+	struct io_uring_sqe *sqe;
+	struct io_uring ring;
+	int ev, ret;
+
+	ret = io_uring_queue_init(2, &ring, IORING_SETUP_DEFER_TASKRUN |
+					IORING_SETUP_SINGLE_ISSUER);
+	if (ret == -EINVAL) {
+		return T_EXIT_SKIP;
+	} else if (ret < 0) {
+		fprintf(stderr, "queue_init: %d\n", ret);
+		return T_EXIT_FAIL;
+	}
+
+	ev = eventfd(0, 0);
+	if (ev < 0) {
+		perror("eventfd");
+		return T_EXIT_SKIP;
+	}
+
+	ret = io_uring_register_eventfd(&ring, ev);
+	if (ret) {
+		fprintf(stderr, "register_eventfd: %d\n", ret);
+		return ret;
+	}
+
+	sqe = io_uring_get_sqe(&ring);
+	io_uring_prep_timeout(sqe, &ts, 100, 0);
+	sqe->user_data = 0x1234;
+	sqe->flags |= IOSQE_ASYNC;
+	io_uring_submit(&ring);
+
+	io_uring_queue_exit(&ring);
+	close(ev);
+	return T_EXIT_PASS;
+}
 
 int main(int argc, char *argv[])
 {
@@ -1751,6 +1937,12 @@ int main(int argc, char *argv[])
 			return ret;
 		}
 
+		ret = test_update_multishot_timeouts(&ring, 200);
+		if (ret && ret != T_EXIT_SKIP) {
+			fprintf(stderr, "test_update_multishot_timeouts linked failed\n");
+			return ret;
+		}
+
 		if (sqpoll) {
 			ret = test_update_timeout(&sqpoll_ring, 0, false, false,
 						  false);
@@ -1762,6 +1954,12 @@ int main(int argc, char *argv[])
 		}
 	}
 
+	ret = test_eventfd();
+	if (ret == T_EXIT_FAIL) {
+		fprintf(stderr, "test_eventfd failed\n");
+		return ret;
+	}
+
 	/*
 	 * this test must go last, it kills the ring
 	 */