polyphony 0.94 → 0.95

data/vendor/liburing/test/send_recv.c

@@ -19,7 +19,7 @@ static char str[] = "This is a test of send and recv over io_uring!";
 
 #define MAX_MSG	128
 
-#define PORT	10200
+#define PORT	10202
 #define HOST	"127.0.0.1"
 
 static int recv_prep(struct io_uring *ring, struct iovec *iov, int *sock,
@@ -254,7 +254,48 @@ static int test(int use_sqthread, int regfiles)
 	pthread_mutex_lock(&rd.mutex);
 	do_send();
 	pthread_join(recv_thread, &retval);
-	return (int)(intptr_t)retval;
+	return (intptr_t)retval;
+}
+
+static int test_invalid(void)
+{
+	struct io_uring ring;
+	int ret, i;
+	int fds[2];
+	struct io_uring_cqe *cqe;
+	struct io_uring_sqe *sqe;
+
+	ret = t_create_ring(8, &ring, 0);
+	if (ret)
+		return ret;
+
+	ret = t_create_socket_pair(fds, true);
+	if (ret)
+		return ret;
+
+	sqe = io_uring_get_sqe(&ring);
+	io_uring_prep_sendmsg(sqe, fds[0], NULL, MSG_WAITALL);
+	sqe->flags |= IOSQE_ASYNC;
+
+	sqe = io_uring_get_sqe(&ring);
+	io_uring_prep_recvmsg(sqe, fds[1], NULL, 0);
+	sqe->flags |= IOSQE_ASYNC;
+
+	ret = io_uring_submit_and_wait(&ring, 2);
+	if (ret != 2)
+		return ret;
+
+	for (i = 0; i < 2; i++) {
+		ret = io_uring_peek_cqe(&ring, &cqe);
+		if (ret || cqe->res != -EFAULT)
+			return -1;
+		io_uring_cqe_seen(&ring, cqe);
+	}
+
+	io_uring_queue_exit(&ring);
+	close(fds[0]);
+	close(fds[1]);
+	return 0;
 }
 
 int main(int argc, char *argv[])
@@ -264,6 +305,12 @@ int main(int argc, char *argv[])
 	if (argc > 1)
 		return 0;
 
+	ret = test_invalid();
+	if (ret) {
+		fprintf(stderr, "test_invalid failed\n");
+		return ret;
+	}
+
 	ret = test(0, 0);
 	if (ret) {
 		fprintf(stderr, "test sqthread=0 failed\n");

data/vendor/liburing/test/send_recvmsg.c

@@ -17,9 +17,11 @@
 
 static char str[] = "This is a test of sendmsg and recvmsg over io_uring!";
 
+static int ud;
+
 #define MAX_MSG	128
 
-#define PORT	10200
+#define PORT	10203
 #define HOST	"127.0.0.1"
 
 #define BUF_BGID	10
@@ -27,31 +29,32 @@ static char str[] = "This is a test of sendmsg and recvmsg over io_uring!";
 
 #define MAX_IOV_COUNT	10
 
-static int recv_prep(struct io_uring *ring, struct iovec iov[], int iov_count,
-		     int bgid)
+static int no_pbuf_ring;
+
+static int recv_prep(struct io_uring *ring, int *sockfd, struct iovec iov[],
+		     int iov_count, int bgid, int async)
 {
 	struct sockaddr_in saddr;
 	struct msghdr msg;
 	struct io_uring_sqe *sqe;
-	int sockfd, ret;
-	int val = 1;
+	int ret, val = 1;
 
 	memset(&saddr, 0, sizeof(saddr));
 	saddr.sin_family = AF_INET;
 	saddr.sin_addr.s_addr = htonl(INADDR_ANY);
 	saddr.sin_port = htons(PORT);
 
-	sockfd = socket(AF_INET, SOCK_DGRAM, 0);
-	if (sockfd < 0) {
+	*sockfd = socket(AF_INET, SOCK_DGRAM, 0);
+	if (*sockfd < 0) {
 		perror("socket");
 		return 1;
 	}
 
 	val = 1;
-	setsockopt(sockfd, SOL_SOCKET, SO_REUSEPORT, &val, sizeof(val));
-	setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
+	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));
+	ret = bind(*sockfd, (struct sockaddr *)&saddr, sizeof(saddr));
 	if (ret < 0) {
 		perror("bind");
 		goto err;
@@ -63,13 +66,16 @@ static int recv_prep(struct io_uring *ring, struct iovec iov[], int iov_count,
 		return 1;
 	}
 
-	io_uring_prep_recvmsg(sqe, sockfd, &msg, 0);
+	io_uring_prep_recvmsg(sqe, *sockfd, &msg, 0);
 	if (bgid) {
 		iov->iov_base = NULL;
 		sqe->flags |= IOSQE_BUFFER_SELECT;
 		sqe->buf_group = bgid;
 		iov_count = 1;
 	}
+	sqe->user_data = ++ud;
+	if (async)
+		sqe->flags |= IOSQE_ASYNC;
 	memset(&msg, 0, sizeof(msg));
 	msg.msg_namelen = sizeof(struct sockaddr_in);
 	msg.msg_iov = iov;
@@ -81,18 +87,19 @@ static int recv_prep(struct io_uring *ring, struct iovec iov[], int iov_count,
 		goto err;
 	}
 
-	close(sockfd);
 	return 0;
 err:
-	close(sockfd);
+	close(*sockfd);
 	return 1;
 }
 
 struct recv_data {
 	pthread_mutex_t *mutex;
 	int buf_select;
+	int buf_ring;
 	int no_buf_add;
 	int iov_count;
+	int async;
 };
 
 static int do_recvmsg(struct io_uring *ring, char buf[MAX_MSG + 1],
@@ -107,18 +114,18 @@ static int do_recvmsg(struct io_uring *ring, char buf[MAX_MSG + 1],
 		goto err;
 	}
 	if (cqe->res < 0) {
-		if (rd->no_buf_add && rd->buf_select)
+		if (rd->no_buf_add && (rd->buf_select || rd->buf_ring))
 			return 0;
 		fprintf(stderr, "%s: failed cqe: %d\n", __FUNCTION__, cqe->res);
 		goto err;
 	}
-	if (cqe->flags) {
+	if (cqe->flags & IORING_CQE_F_BUFFER) {
 		int bid = cqe->flags >> 16;
 		if (bid != BUF_BID)
 			fprintf(stderr, "Buffer ID mismatch %d\n", bid);
 	}
 
-	if (rd->no_buf_add && rd->buf_select) {
+	if (rd->no_buf_add && (rd->buf_ring || rd->buf_select)) {
 		fprintf(stderr, "Expected -ENOBUFS: %d\n", cqe->res);
 		goto err;
 	}
@@ -158,12 +165,14 @@ static void *recv_fn(void *data)
 {
 	struct recv_data *rd = data;
 	pthread_mutex_t *mutex = rd->mutex;
+	struct io_uring_buf_ring *br = NULL;
 	char buf[MAX_MSG + 1];
 	struct iovec iov[MAX_IOV_COUNT];
-	struct io_uring_sqe *sqe;
-	struct io_uring_cqe *cqe;
 	struct io_uring ring;
-	int ret;
+	int ret, sockfd;
+
+	if (rd->buf_ring && no_pbuf_ring)
+		goto out_no_ring;
 
 	init_iov(iov, rd->iov_count, buf);
 
@@ -173,34 +182,61 @@ static void *recv_fn(void *data)
 		goto err;
 	}
 
-	if (rd->buf_select && !rd->no_buf_add) {
-		sqe = io_uring_get_sqe(&ring);
-		io_uring_prep_provide_buffers(sqe, buf, sizeof(buf) -1, 1,
-						BUF_BGID, BUF_BID);
-		ret = io_uring_submit(&ring);
-		if (ret != 1) {
-			fprintf(stderr, "submit ret=%d\n", ret);
-			goto err;
-		}
-
-		ret = io_uring_wait_cqe(&ring, &cqe);
-		if (ret) {
-			fprintf(stderr, "wait_cqe=%d\n", ret);
-			goto err;
-		}
-		ret = cqe->res;
-		io_uring_cqe_seen(&ring, cqe);
-		if (ret == -EINVAL) {
-			fprintf(stdout, "PROVIDE_BUFFERS not supported, skip\n");
-			goto out;
-			goto err;
-		} else if (ret < 0) {
-			fprintf(stderr, "PROVIDER_BUFFERS %d\n", ret);
-			goto err;
+	if ((rd->buf_ring || rd->buf_select) && !rd->no_buf_add) {
+		if (rd->buf_ring) {
+			struct io_uring_buf_reg reg = { };
+			void *ptr;
+
+			if (posix_memalign(&ptr, 4096, 4096))
+				goto err;
+
+			reg.ring_addr = (unsigned long) ptr;
+			reg.ring_entries = 1;
+			reg.bgid = BUF_BGID;
+			if (io_uring_register_buf_ring(&ring, &reg, 0)) {
+				no_pbuf_ring = 1;
+				goto out;
+			}
+
+			br = ptr;
+			io_uring_buf_ring_init(br);
+			io_uring_buf_ring_add(br, buf, sizeof(buf), BUF_BID,
+					      io_uring_buf_ring_mask(1), 0);
+			io_uring_buf_ring_advance(br, 1);
+		} else {
+			struct io_uring_sqe *sqe;
+			struct io_uring_cqe *cqe;
+
+			sqe = io_uring_get_sqe(&ring);
+			io_uring_prep_provide_buffers(sqe, buf, sizeof(buf) -1,
+							1, BUF_BGID, BUF_BID);
+			sqe->user_data = ++ud;
+			ret = io_uring_submit(&ring);
+			if (ret != 1) {
+				fprintf(stderr, "submit ret=%d\n", ret);
+				goto err;
+			}
+
+			ret = io_uring_wait_cqe(&ring, &cqe);
+			if (ret) {
+				fprintf(stderr, "wait_cqe=%d\n", ret);
+				goto err;
+			}
+			ret = cqe->res;
+			io_uring_cqe_seen(&ring, cqe);
+			if (ret == -EINVAL) {
+				fprintf(stdout, "PROVIDE_BUFFERS not supported, skip\n");
+				goto out;
+			} else if (ret < 0) {
+				fprintf(stderr, "PROVIDER_BUFFERS %d\n", ret);
+				goto err;
+			}
 		}
 	}
 
-	ret = recv_prep(&ring, iov, rd->iov_count, rd->buf_select ? BUF_BGID : 0);
+	ret = recv_prep(&ring, &sockfd, iov, rd->iov_count,
+			(rd->buf_ring || rd->buf_select) ? BUF_BGID : 0,
+			rd->async);
 	if (ret) {
 		fprintf(stderr, "recv_prep failed: %d\n", ret);
 		goto err;
@@ -208,14 +244,19 @@ static void *recv_fn(void *data)
 
 	pthread_mutex_unlock(mutex);
 	ret = do_recvmsg(&ring, buf, rd);
+	close(sockfd);
 
 	io_uring_queue_exit(&ring);
-
+	if (br)
+		free(br);
 err:
 	return (void *)(intptr_t)ret;
 out:
-	pthread_mutex_unlock(mutex);
 	io_uring_queue_exit(&ring);
+out_no_ring:
+	pthread_mutex_unlock(mutex);
+	if (br)
+		free(br);
 	return NULL;
 }
 
@@ -255,8 +296,11 @@ static int do_sendmsg(void)
 		return 1;
 	}
 
+	usleep(10000);
+
 	sqe = io_uring_get_sqe(&ring);
 	io_uring_prep_sendmsg(sqe, sockfd, &msg, 0);
+	sqe->user_data = ++ud;
 
 	ret = io_uring_submit(&ring);
 	if (ret <= 0) {
@@ -277,7 +321,8 @@ err:
 	return 1;
 }
 
-static int test(int buf_select, int no_buf_add, int iov_count)
+static int test(int buf_select, int buf_ring, int no_buf_add, int iov_count,
+		int async)
 {
 	struct recv_data rd;
 	pthread_mutexattr_t attr;
@@ -286,6 +331,9 @@ static int test(int buf_select, int no_buf_add, int iov_count)
 	int ret;
 	void *retval;
 
+	if (buf_select || buf_ring)
+		assert(iov_count == 1);
+
 	pthread_mutexattr_init(&attr);
 	pthread_mutexattr_setpshared(&attr, 1);
 	pthread_mutex_init(&mutex, &attr);
@@ -293,8 +341,10 @@ static int test(int buf_select, int no_buf_add, int iov_count)
 
 	rd.mutex = &mutex;
 	rd.buf_select = buf_select;
+	rd.buf_ring = buf_ring;
 	rd.no_buf_add = no_buf_add;
 	rd.iov_count = iov_count;
+	rd.async = async;
 	ret = pthread_create(&recv_thread, NULL, recv_fn, &rd);
 	if (ret) {
 		pthread_mutex_unlock(&mutex);
@@ -305,7 +355,7 @@ static int test(int buf_select, int no_buf_add, int iov_count)
 	pthread_mutex_lock(&mutex);
 	do_sendmsg();
 	pthread_join(recv_thread, &retval);
-	ret = (int)(intptr_t)retval;
+	ret = (intptr_t)retval;
 
 	return ret;
 }
@@ -317,27 +367,87 @@ int main(int argc, char *argv[])
 	if (argc > 1)
 		return 0;
 
-	ret = test(0, 0, 1);
+	ret = test(0, 0, 0, 1, 0);
 	if (ret) {
-		fprintf(stderr, "send_recvmsg 0 failed\n");
+		fprintf(stderr, "send_recvmsg 0 0 0 1 0 failed\n");
 		return 1;
 	}
 
-	ret = test(0, 0, 10);
+	ret = test(0, 0, 0, 10, 0);
 	if (ret) {
 		fprintf(stderr, "send_recvmsg multi iov failed\n");
 		return 1;
 	}
 
-	ret = test(1, 0, 1);
+	ret = test(1, 0, 0, 1, 0);
+	if (ret) {
+		fprintf(stderr, "send_recvmsg 1 0 0 1 0 failed\n");
+		return 1;
+	}
+
+	ret = test(1, 0, 1, 1, 0);
+	if (ret) {
+		fprintf(stderr, "send_recvmsg 1 0 1 1 0 failed\n");
+		return 1;
+	}
+
+	ret = test(0, 1, 0, 1, 0);
+	if (ret) {
+		fprintf(stderr, "send_recvmsg 0 1 0 1 0 failed\n");
+		return 1;
+	}
+
+	ret = test(1, 1, 0, 1, 0);
+	if (ret) {
+		fprintf(stderr, "send_recvmsg 1 1 0 1 0 failed\n");
+		return 1;
+	}
+
+	ret = test(1, 1, 1, 1, 0);
+	if (ret) {
+		fprintf(stderr, "send_recvmsg 1 1 1 1 0 failed\n");
+		return 1;
+	}
+
+	ret = test(0, 0, 0, 1, 1);
+	if (ret) {
+		fprintf(stderr, "send_recvmsg async 0 0 0 1 1 failed\n");
+		return 1;
+	}
+
+	ret = test(0, 0, 0, 10, 1);
+	if (ret) {
+		fprintf(stderr, "send_recvmsg async multi iov failed\n");
+		return 1;
+	}
+
+	ret = test(1, 0, 0, 1, 1);
+	if (ret) {
+		fprintf(stderr, "send_recvmsg async 1 0 0 1 1 failed\n");
+		return 1;
+	}
+
+	ret = test(1, 0, 1, 1, 1);
+	if (ret) {
+		fprintf(stderr, "send_recvmsg async 1 0 1 1 1 failed\n");
+		return 1;
+	}
+
+	ret = test(0, 1, 0, 1, 1);
+	if (ret) {
+		fprintf(stderr, "send_recvmsg async 0 1 0 1 1 failed\n");
+		return 1;
+	}
+
+	ret = test(1, 1, 0, 1, 1);
 	if (ret) {
-		fprintf(stderr, "send_recvmsg 1 0 failed\n");
+		fprintf(stderr, "send_recvmsg async 1 1 0 1 1 failed\n");
 		return 1;
 	}
 
-	ret = test(1, 1, 1);
+	ret = test(1, 1, 1, 1, 1);
 	if (ret) {
-		fprintf(stderr, "send_recvmsg 1 1 failed\n");
+		fprintf(stderr, "send_recvmsg async 1 1 1 1 1 failed\n");
 		return 1;
 	}
 

data/vendor/liburing/test/shutdown.c

@@ -19,6 +19,7 @@
 #include <arpa/inet.h>
 
 #include "liburing.h"
+#include "helpers.h"
 
 static void sig_pipe(int sig)
 {
@@ -29,7 +30,7 @@ int main(int argc, char *argv[])
 	int p_fd[2], ret;
 	int32_t recv_s0;
 	int32_t val = 1;
-	struct sockaddr_in addr;
+	struct sockaddr_in addr = { };
 
 	if (argc > 1)
 		return 0;
@@ -44,11 +45,9 @@ int main(int argc, char *argv[])
 	assert(ret != -1);
 
 	addr.sin_family = AF_INET;
-	addr.sin_port = htons((rand() % 61440) + 4096);
 	addr.sin_addr.s_addr = inet_addr("127.0.0.1");
 
-	ret = bind(recv_s0, (struct sockaddr*)&addr, sizeof(addr));
-	assert(ret != -1);
+	assert(!t_bind_ephemeral_port(recv_s0, &addr));
 	ret = listen(recv_s0, 128);
 	assert(ret != -1);
 

data/vendor/liburing/test/sigfd-deadlock.c

@@ -11,6 +11,7 @@
 #include <poll.h>
 #include <stdio.h>
 #include "liburing.h"
+#include "helpers.h"
 
 static int setup_signal(void)
 {
@@ -34,22 +35,35 @@ static int test_uring(int sfd)
 	struct io_uring ring;
 	int ret;
 
-	io_uring_queue_init(32, &ring, 0);
+	ret = io_uring_queue_init(32, &ring, 0);
+	if (ret)
+		return T_EXIT_FAIL;
 
 	sqe = io_uring_get_sqe(&ring);
 	io_uring_prep_poll_add(sqe, sfd, POLLIN);
-	io_uring_submit(&ring);
+	ret = io_uring_submit(&ring);
+	if (ret < 0) {
+		ret = T_EXIT_FAIL;
+		goto err_exit;
+	}
 
 	kill(getpid(), SIGINT);
 
 	io_uring_wait_cqe(&ring, &cqe);
-	if (cqe->res & POLLIN) {
-		ret = 0;
+	if (cqe->res == -EOPNOTSUPP) {
+		fprintf(stderr, "signalfd poll not supported\n");
+		ret = T_EXIT_SKIP;
+	} else if (cqe->res < 0) {
+		fprintf(stderr, "poll failed: %d\n", cqe->res);
+		ret = T_EXIT_FAIL;
+	} else if (cqe->res & POLLIN) {
+		ret = T_EXIT_PASS;
 	} else {
 		fprintf(stderr, "Unexpected poll mask %x\n", cqe->res);
-		ret = 1;
+		ret = T_EXIT_FAIL;
 	}
 	io_uring_cqe_seen(&ring, cqe);
+err_exit:
 	io_uring_queue_exit(&ring);
 	return ret;
 }
@@ -59,14 +73,14 @@ int main(int argc, char *argv[])
 	int sfd, ret;
 
 	if (argc > 1)
-		return 0;
+		return T_EXIT_PASS;
 
 	sfd = setup_signal();
 	if (sfd < 0)
-		return 1;
+		return T_EXIT_FAIL;
 
 	ret = test_uring(sfd);
-	if (ret)
+	if (ret == T_EXIT_FAIL)
 		fprintf(stderr, "test_uring signalfd failed\n");
 
 	close(sfd);