uringmachine 0.8.2 → 0.11

data/vendor/liburing/test/resize-rings.c

@@ -14,6 +14,8 @@
 #include "liburing.h"
 #include "helpers.h"
 
+static bool only_defer, no_defer;
+
 #define NVECS	128
 
 #define min(a, b)	((a) < (b) ? (a) : (b))
@@ -286,6 +288,9 @@ static int test_reads(struct io_uring *ring, int fd, int async)
 		}
 	}
 
+	for (i = 0; i < NVECS; i++)
+		free(vecs[i].iov_base);
+
 	return 0;
 }
 
@@ -306,8 +311,12 @@ static int test_basic(struct io_uring *ring, int async)
 	p.sq_entries = 32;
 	p.cq_entries = 64;
 	ret = io_uring_resize_rings(ring, &p);
-	if (ret == -EINVAL)
+	if (ret == -EINVAL || ret == -ENOMEM) {
 		return T_EXIT_SKIP;
+	} else if (ret < 0) {
+		fprintf(stderr, "resize=%d\n", ret);
+		return T_EXIT_FAIL;
+	}
 
 	sqe = io_uring_get_sqe(ring);
 	io_uring_prep_nop(sqe);
@@ -548,7 +557,14 @@ static int test(int flags, int fd, int async)
 	struct io_uring ring;
 	int ret;
 
+	if (no_defer)
+		return T_EXIT_SKIP;
+	if (!(flags & IORING_SETUP_DEFER_TASKRUN) && only_defer)
+		return T_EXIT_SKIP;
+
 	ret = io_uring_queue_init_params(8, &ring, &p);
+	if (ret == -EINVAL)
+		return T_EXIT_SKIP;
 	if (ret < 0) {
 		fprintf(stderr, "ring setup failed: %d\n", ret);
 		return T_EXIT_FAIL;
@@ -556,6 +572,12 @@ static int test(int flags, int fd, int async)
 
 	ret = test_basic(&ring, async);
 	if (ret == T_EXIT_SKIP) {
+		if (!(flags & IORING_SETUP_DEFER_TASKRUN)) {
+			io_uring_queue_exit(&ring);
+			only_defer = true;
+		} else {
+			no_defer = true;
+		}
 		return T_EXIT_SKIP;
 	} else if (ret == T_EXIT_FAIL) {
 		fprintf(stderr, "test_basic %x failed\n", flags);
@@ -615,7 +637,7 @@ int main(int argc, char *argv[])
 
 	ret = test(0, fd, 0);
 	if (ret == T_EXIT_SKIP)
-		return T_EXIT_SKIP;
+		goto try_defer;
 	else if (ret == T_EXIT_FAIL)
 		return T_EXIT_FAIL;
 
@@ -631,6 +653,7 @@ int main(int argc, char *argv[])
 	if (ret == T_EXIT_FAIL)
 		return T_EXIT_FAIL;
 
+try_defer:
 	ret = test(IORING_SETUP_SINGLE_ISSUER | IORING_SETUP_DEFER_TASKRUN, fd, 0);
 	if (ret == T_EXIT_FAIL)
 		return T_EXIT_FAIL;

data/vendor/liburing/test/rsrc_tags.c

@@ -151,7 +151,7 @@ static int test_buffers_update(void)
 	struct io_uring ring;
 	const int nr = 5;
 	int buf_idx = 1, i, ret;
-	int pipes[2];
+	int fds[2];
 	char tmp_buf[1024];
 	char tmp_buf2[1024];
 	struct iovec vecs[nr];
@@ -172,7 +172,7 @@ static int test_buffers_update(void)
 		printf("ring setup failed\n");
 		return 1;
 	}
-	if (pipe(pipes) < 0) {
+	if (pipe(fds) < 0) {
 		perror("pipe");
 		return 1;
 	}
@@ -184,7 +184,7 @@ static int test_buffers_update(void)
 
 	/* test that CQE is not emitted before we're done with a buffer */
 	sqe = io_uring_get_sqe(&ring);
-	io_uring_prep_read_fixed(sqe, pipes[0], tmp_buf, 10, 0, 1);
+	io_uring_prep_read_fixed(sqe, fds[0], tmp_buf, 10, 0, 1);
 	sqe->user_data = 100;
 	ret = io_uring_submit(&ring);
 	if (ret != 1) {
@@ -204,8 +204,8 @@ static int test_buffers_update(void)
 
 	ret = io_uring_peek_cqe(&ring, &cqe); /* nothing should be there */
 	assert(ret == -EAGAIN);
-	close(pipes[0]);
-	close(pipes[1]);
+	close(fds[0]);
+	close(fds[1]);
 
 	ret = io_uring_wait_cqe(&ring, &cqe);
 	assert(!ret && cqe->user_data == 100);
@@ -312,7 +312,6 @@ static int test_buffers_empty_buffers(void)
 	return 0;
 }
 
-
 static int test_files(int ring_flags)
 {
 	struct io_uring_cqe *cqe = NULL;
@@ -408,6 +407,53 @@ static int test_notag(void)
 	return 0;
 }
 
+static char buffer[16];
+
+static int test_tagged_register_partial_fail(void)
+{
+	__u64 tags[2] = { 1, 2 };
+	int fds[2] = { pipes[0], -1 };
+	struct iovec iovec[2];
+	struct io_uring ring;
+	int ret;
+
+	iovec[0].iov_base = buffer;
+	iovec[0].iov_len = 1;
+	iovec[1].iov_base = (void *)1UL;
+	iovec[1].iov_len = 1;
+
+	ret = io_uring_queue_init(1, &ring, 0);
+	if (ret) {
+		printf("ring setup failed\n");
+		return 1;
+	}
+
+	ret = io_uring_register_buffers_tags(&ring, iovec, tags, 2);
+	if (ret >= 0) {
+		fprintf(stderr, "io_uring_register_buffers_tags returned %i\n", ret);
+		return -EFAULT;
+	}
+
+	if (!check_cq_empty(&ring)) {
+		fprintf(stderr, "stray buffer CQEs found\n");
+		return -EFAULT;
+	}
+
+	ret = io_uring_register_files_tags(&ring, fds, tags, 2);
+	if (ret >= 0) {
+		fprintf(stderr, "io_uring_register_files_tags returned %i\n", ret);
+		return -EFAULT;
+	}
+
+	if (!check_cq_empty(&ring)) {
+		fprintf(stderr, "stray file CQEs found\n");
+		return -EFAULT;
+	}
+
+	io_uring_queue_exit(&ring);
+	return 0;
+}
+
 int main(int argc, char *argv[])
 {
 	int ring_flags[] = {0, IORING_SETUP_IOPOLL, IORING_SETUP_SQPOLL,
@@ -415,21 +461,28 @@ int main(int argc, char *argv[])
 	int i, ret;
 
 	if (argc > 1)
-		return 0;
+		return T_EXIT_SKIP;
+
 	if (!has_rsrc_update()) {
 		fprintf(stderr, "doesn't support rsrc tags, skip\n");
-		return 0;
+		return T_EXIT_SKIP;
 	}
 
 	if (pipe(pipes) < 0) {
 		perror("pipe");
-		return 1;
+		return T_EXIT_FAIL;
+	}
+
+	ret = test_tagged_register_partial_fail();
+	if (ret) {
+		printf("test_tagged_register_partial_fail() failed\n");
+		return T_EXIT_FAIL;
 	}
 
 	ret = test_notag();
 	if (ret) {
 		printf("test_notag failed\n");
-		return ret;
+		return T_EXIT_FAIL;
 	}
 
 	for (i = 0; i < sizeof(ring_flags) / sizeof(ring_flags[0]); i++) {
@@ -441,21 +494,21 @@ int main(int argc, char *argv[])
 		ret = test_files(flag);
 		if (ret) {
 			printf("test_tag failed, type %i\n", i);
-			return ret;
+			return T_EXIT_FAIL;
 		}
 	}
 
 	ret = test_buffers_update();
 	if (ret) {
 		printf("test_buffers_update failed\n");
-		return ret;
+		return T_EXIT_FAIL;
 	}
 
 	ret = test_buffers_empty_buffers();
 	if (ret) {
 		printf("test_buffers_empty_buffers failed\n");
-		return ret;
+		return T_EXIT_FAIL;
 	}
 
-	return 0;
+	return T_EXIT_PASS;
 }

data/vendor/liburing/test/send-zerocopy.c

@@ -69,9 +69,11 @@ static size_t page_sz;
 static char *tx_buffer, *rx_buffer;
 static struct iovec buffers_iov[__BUF_NR];
 
+static bool has_regvec;
 static bool has_sendzc;
 static bool has_sendmsg;
 static bool hit_enomem;
+static bool try_hugepages = 1;
 
 static int probe_zc_support(void)
 {
@@ -95,6 +97,7 @@ static int probe_zc_support(void)
 
 	has_sendzc = p->ops_len > IORING_OP_SEND_ZC;
 	has_sendmsg = p->ops_len > IORING_OP_SENDMSG_ZC;
+	has_regvec = p->ops_len > IORING_OP_READV_FIXED;
 	io_uring_queue_exit(&ring);
 	free(p);
 	return 0;
@@ -255,117 +258,6 @@ static int test_send_faults(int sock_tx, int sock_rx)
 	return T_EXIT_PASS;
 }
 
-static int create_socketpair_ip(struct sockaddr_storage *addr,
-				int *sock_client, int *sock_server,
-				bool ipv6, bool client_connect,
-				bool msg_zc, bool tcp)
-{
-	socklen_t addr_size;
-	int family, sock, listen_sock = -1;
-	int ret;
-
-	memset(addr, 0, sizeof(*addr));
-	if (ipv6) {
-		struct sockaddr_in6 *saddr = (struct sockaddr_in6 *)addr;
-
-		family = AF_INET6;
-		saddr->sin6_family = family;
-		saddr->sin6_port = htons(0);
-		addr_size = sizeof(*saddr);
-	} else {
-		struct sockaddr_in *saddr = (struct sockaddr_in *)addr;
-
-		family = AF_INET;
-		saddr->sin_family = family;
-		saddr->sin_port = htons(0);
-		saddr->sin_addr.s_addr = htonl(INADDR_ANY);
-		addr_size = sizeof(*saddr);
-	}
-
-	/* server sock setup */
-	if (tcp) {
-		sock = listen_sock = socket(family, SOCK_STREAM, IPPROTO_TCP);
-	} else {
-		sock = *sock_server = socket(family, SOCK_DGRAM, 0);
-	}
-	if (sock < 0) {
-		perror("socket");
-		return 1;
-	}
-
-	ret = bind(sock, (struct sockaddr *)addr, addr_size);
-	if (ret < 0) {
-		perror("bind");
-		return 1;
-	}
-
-	ret = getsockname(sock, (struct sockaddr *)addr, &addr_size);
-	if (ret < 0) {
-		fprintf(stderr, "getsockname failed %i\n", errno);
-		return 1;
-	}
-
-	if (tcp) {
-		ret = listen(sock, 128);
-		assert(ret != -1);
-	}
-
-	if (ipv6) {
-		struct sockaddr_in6 *saddr = (struct sockaddr_in6 *)addr;
-
-		inet_pton(AF_INET6, HOSTV6, &(saddr->sin6_addr));
-	} else {
-		struct sockaddr_in *saddr = (struct sockaddr_in *)addr;
-
-		inet_pton(AF_INET, HOST, &saddr->sin_addr);
-	}
-
-	/* client sock setup */
-	if (tcp) {
-		*sock_client = socket(family, SOCK_STREAM, IPPROTO_TCP);
-		assert(client_connect);
-	} else {
-		*sock_client = socket(family, SOCK_DGRAM, 0);
-	}
-	if (*sock_client < 0) {
-		perror("socket");
-		return 1;
-	}
-	if (client_connect) {
-		ret = connect(*sock_client, (struct sockaddr *)addr, addr_size);
-		if (ret < 0) {
-			perror("connect");
-			return 1;
-		}
-	}
-	if (msg_zc) {
-#ifdef SO_ZEROCOPY
-		int val = 1;
-
-		/*
-		 * NOTE: apps must not set SO_ZEROCOPY when using io_uring zc.
-		 * It's only here to test interactions with MSG_ZEROCOPY.
-		 */
-		if (setsockopt(*sock_client, SOL_SOCKET, SO_ZEROCOPY, &val, sizeof(val))) {
-			perror("setsockopt zc");
-			return 1;
-		}
-#else
-		fprintf(stderr, "no SO_ZEROCOPY\n");
-		return 1;
-#endif
-	}
-	if (tcp) {
-		*sock_server = accept(listen_sock, NULL, NULL);
-		if (!*sock_server) {
-			fprintf(stderr, "can't accept\n");
-			return 1;
-		}
-		close(listen_sock);
-	}
-	return 0;
-}
-
 struct send_conf {
 	bool fixed_buf;
 	bool mix_register;
@@ -447,6 +339,11 @@ static int do_test_inet_send(struct io_uring *ring, int sock_client, int sock_se
 			else
 				io_uring_prep_sendmsg(sqe, sock_client, &msghdr[i], msg_flags);
 
+			if (real_fixed_buf) {
+				sqe->ioprio |= IORING_RECVSEND_FIXED_BUF;
+				sqe->buf_index = conf->buf_index;
+			}
+
 			if (!conf->iovec) {
 				io = &iov[i];
 				iov_len = 1;
@@ -566,6 +463,16 @@ static int do_test_inet_send(struct io_uring *ring, int sock_client, int sock_se
 	return 0;
 }
 
+static int create_socketpair_ip(struct sockaddr_storage *addr,
+				int *sock_client, int *sock_server,
+				bool ipv6, bool client_connect,
+				bool msg_zc, bool tcp)
+{
+	return t_create_socketpair_ip(addr, sock_client, sock_server, ipv6,
+					client_connect, msg_zc, tcp,
+					ipv6 ? HOSTV6 : HOST);
+}
+
 static int test_inet_send(struct io_uring *ring)
 {
 	struct send_conf conf;
@@ -590,7 +497,7 @@ static int test_inet_send(struct io_uring *ring)
 			continue;
 #endif
 		ret = create_socketpair_ip(&addr, &sock_client, &sock_server, ipv6,
-				 client_connect, msg_zc_set, tcp);
+					client_connect, msg_zc_set, tcp);
 		if (ret) {
 			fprintf(stderr, "sock prep failed %d\n", ret);
 			return 1;
@@ -618,7 +525,11 @@ static int test_inet_send(struct io_uring *ring)
 			conf.tcp = tcp;
 			regbuf = conf.mix_register || conf.fixed_buf;
 
-			if (conf.iovec && (!conf.use_sendmsg || regbuf || conf.cork))
+			if (!tcp && conf.long_iovec)
+				continue;
+			if (conf.use_sendmsg && regbuf && !has_regvec)
+				continue;
+			if (conf.iovec && (!conf.use_sendmsg || conf.cork))
 				continue;
 			if (!conf.zc) {
 				if (regbuf)
@@ -636,7 +547,7 @@ static int test_inet_send(struct io_uring *ring)
 				continue;
 			if (!client_connect && conf.addr == NULL)
 				continue;
-			if (conf.use_sendmsg && (regbuf || !has_sendmsg))
+			if (conf.use_sendmsg && !has_sendmsg)
 				continue;
 			if (msg_zc_set && !conf.zc)
 				continue;
@@ -900,6 +811,15 @@ static int run_basic_tests(void)
 	return 0;
 }
 
+static void free_buffers(void)
+{
+	if (tx_buffer)
+		free(tx_buffer);
+	if (rx_buffer)
+		free(rx_buffer);
+	tx_buffer = rx_buffer = NULL;
+}
+
 int main(int argc, char *argv[])
 {
 	size_t len;
@@ -920,27 +840,29 @@ int main(int argc, char *argv[])
 
 	page_sz = sysconf(_SC_PAGESIZE);
 
-	len = LARGE_BUF_SIZE;
-	tx_buffer = aligned_alloc(page_sz, len);
-	rx_buffer = aligned_alloc(page_sz, len);
-	if (tx_buffer && rx_buffer) {
-		buffers_iov[BUF_T_LARGE].iov_base = tx_buffer;
-		buffers_iov[BUF_T_LARGE].iov_len = len;
-	} else {
-		if (tx_buffer)
-			free(tx_buffer);
-		if (rx_buffer)
-			free(rx_buffer);
+	if (try_hugepages) {
+		len = LARGE_BUF_SIZE;
+		tx_buffer = aligned_alloc(page_sz, len);
+		rx_buffer = aligned_alloc(page_sz, len);
 
-		printf("skip large buffer tests, can't alloc\n");
+		if (tx_buffer && rx_buffer) {
+			buffers_iov[BUF_T_LARGE].iov_base = tx_buffer;
+			buffers_iov[BUF_T_LARGE].iov_len = len;
+		} else {
+			printf("skip large buffer tests, can't alloc\n");
+			free_buffers();
+		}
+	}
 
+	if (!tx_buffer) {
 		len = 2 * page_sz;
 		tx_buffer = aligned_alloc(page_sz, len);
 		rx_buffer = aligned_alloc(page_sz, len);
-	}
-	if (!tx_buffer || !rx_buffer) {
-		fprintf(stderr, "can't allocate buffers\n");
-		return T_EXIT_FAIL;
+
+		if (!tx_buffer || !rx_buffer) {
+			fprintf(stderr, "can't allocate buffers\n");
+			return T_EXIT_FAIL;
+		}
 	}
 
 	srand((unsigned)time(NULL));

data/vendor/liburing/test/sendmsg_iov_clean.c

@@ -0,0 +1,216 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Description: Test non-immediate sendmsg completion with non-static iovec
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <pthread.h>
+#include "liburing.h"
+#include "helpers.h"
+
+/* anything > 1 should be fine, do bigger than FAST_IOV to be sure */
+#define IOVS		16
+#define	INFLIGHT	256
+
+enum {
+	IS_ACCEPT = 0x89,
+	IS_SENDMSG = 0x91,
+};
+
+struct thread_data {
+	pthread_t thread;
+	pthread_barrier_t barrier;
+	int parent_pid;
+};
+
+static void *thread_fn(void *__data)
+{
+	struct thread_data *data = __data;
+	struct sockaddr_in saddr;
+	int sockfd, ret;
+	char msg[64];
+
+	memset(&saddr, 0, sizeof(saddr));
+	saddr.sin_family = AF_INET;
+	saddr.sin_port = htons(9999);
+	inet_pton(AF_INET, "127.0.0.1", &saddr.sin_addr);
+
+	sockfd = socket(AF_INET, SOCK_STREAM, 0);
+	if (sockfd < 0) {
+		perror("socket");
+		goto done;
+	}
+
+	ret = connect(sockfd, (struct sockaddr *) &saddr, sizeof(saddr));
+	if (ret < 0) {
+		perror("connect");
+		close(sockfd);
+		goto done;
+	}
+
+	pthread_barrier_wait(&data->barrier);
+	do {
+		usleep(100);
+		memset(msg, 0, sizeof(msg));
+		ret = recv(sockfd, msg, sizeof(msg), 0);
+	} while (ret > 0);
+
+	close(sockfd);
+done:
+	kill(data->parent_pid, SIGUSR1);
+	return NULL;
+}
+
+static int queue_sends(struct io_uring *ring, int send_fd, struct thread_data *td, struct msghdr *msghdr)
+{
+	struct io_uring_sqe *sqe;
+	char buf[64];
+	int i, ret, sbuf;
+	struct iovec *iovs = msghdr->msg_iov;
+
+	sbuf = 8 * 1024;
+	ret = setsockopt(send_fd, SOL_SOCKET, SO_SNDBUF, &sbuf, sizeof(sbuf));
+	if (ret < 0) {
+		perror("setsockopt");
+		return 1;
+	}
+
+	memset(buf, 0xaa, sizeof(buf));
+	for (i = 0; i < IOVS; i++) {
+		iovs[i].iov_base = buf;
+		iovs[i].iov_len = sizeof(buf);
+	}
+
+	/* fill send buffer */
+	for (i = 0;; i++) {
+		ret = sendmsg(send_fd, msghdr, MSG_DONTWAIT);
+		if (ret == -1) {
+			if (errno == EAGAIN)
+				break;
+			perror("sendmsg");
+			return 1;
+		}
+	}
+
+	/* kick receiver, start sendmsg */
+	msghdr->msg_iovlen = IOVS;
+	pthread_barrier_wait(&td->barrier);
+	for (i = 0; i < INFLIGHT; i++) {
+		sqe = io_uring_get_sqe(ring);
+		io_uring_prep_sendmsg(sqe, send_fd, msghdr, 0);
+		sqe->user_data = IS_SENDMSG;
+	}
+
+	return 0;
+}
+
+int main(int argc, char *argv[])
+{
+	struct io_uring ring;
+	struct io_uring_sqe *sqe;
+	struct io_uring_cqe *cqe;
+	struct sockaddr_in saddr;
+	int val, send_fd, ret, sockfd, seen_sends = 0;
+	struct thread_data td;
+	struct iovec iovs[IOVS];
+	struct msghdr msghdr = {
+		.msg_iov = iovs,
+		.msg_iovlen = 1,
+	};
+
+	if (argc > 1)
+		return T_EXIT_SKIP;
+
+	memset(&saddr, 0, sizeof(saddr));
+	saddr.sin_family = AF_INET;
+	saddr.sin_addr.s_addr = htonl(INADDR_ANY);
+	saddr.sin_port = htons(9999);
+
+	sockfd = socket(AF_INET, SOCK_STREAM, 0);
+	if (sockfd < 0) {
+		perror("socket");
+		return T_EXIT_FAIL;
+	}
+
+	val = 1;
+	setsockopt(sockfd, SOL_SOCKET, SO_REUSEPORT, &val, sizeof(val));
+	setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
+
+	ret = bind(sockfd, (struct sockaddr *)&saddr, sizeof(saddr));
+	if (ret < 0) {
+		perror("bind");
+		close(sockfd);
+		return T_EXIT_FAIL;
+	}
+
+	ret = listen(sockfd, 1);
+	if (ret < 0) {
+		perror("listen");
+		close(sockfd);
+		return T_EXIT_FAIL;
+	}
+
+	ret = io_uring_queue_init(INFLIGHT, &ring, IORING_SETUP_SINGLE_ISSUER |
+					    IORING_SETUP_DEFER_TASKRUN);
+	if (ret == -EINVAL) {
+		close(sockfd);
+		return T_EXIT_SKIP;
+	}
+
+	sqe = io_uring_get_sqe(&ring);
+	io_uring_prep_multishot_accept(sqe, sockfd, NULL, NULL, 0);
+	sqe->user_data = IS_ACCEPT;
+	io_uring_submit(&ring);
+
+	/* check for no multishot accept */
+	ret = io_uring_peek_cqe(&ring, &cqe);
+	if (!ret && cqe->res == -EINVAL) {
+		close(sockfd);
+		return T_EXIT_SKIP;
+	}
+
+	/* start receiver */
+	td.parent_pid = getpid();
+	pthread_barrier_init(&td.barrier, NULL, 2);
+	pthread_create(&td.thread, NULL, thread_fn, &td);
+
+	do {
+		ret = io_uring_submit_and_wait(&ring, 1);
+		if (ret < 0) {
+			fprintf(stderr, "submit: %d\n", ret);
+			break;
+		}
+		ret = io_uring_peek_cqe(&ring, &cqe);
+		if (ret) {
+			fprintf(stderr, "peek: %d\n", ret);
+			break;
+		}
+
+		switch (cqe->user_data) {
+		case IS_ACCEPT:
+			send_fd = cqe->res;
+			io_uring_cqe_seen(&ring, cqe);
+
+			ret = queue_sends(&ring, send_fd, &td, &msghdr);
+			if (ret)
+				exit(T_EXIT_FAIL);
+			break;
+		case IS_SENDMSG:
+			io_uring_cqe_seen(&ring, cqe);
+			seen_sends++;
+			if (seen_sends == INFLIGHT)
+				exit(0);
+			break;
+		default:
+			fprintf(stderr, "got unknown cqe\n");
+			return T_EXIT_FAIL;
+		}
+	} while (1);
+
+	return T_EXIT_FAIL;
+}