polyphony 0.94 → 0.95

data/vendor/liburing/test/accept.c

@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <assert.h>
+#include <limits.h>
 
 #include <errno.h>
 #include <fcntl.h>
@@ -22,13 +23,43 @@
 #include "helpers.h"
 #include "liburing.h"
 
+#define MAX_FDS 32
+#define NOP_USER_DATA (1LLU << 50)
+#define INITIAL_USER_DATA 1000
+
 static int no_accept;
+static int no_accept_multi;
 
 struct data {
 	char buf[128];
 	struct iovec iov;
 };
 
+struct accept_test_args {
+	int accept_should_error;
+	bool fixed;
+	bool nonblock;
+	bool queue_accept_before_connect;
+	bool multishot;
+	int extra_loops;
+	bool overflow;
+};
+
+static void close_fds(int fds[], int nr)
+{
+	int i;
+
+	for (i = 0; i < nr; i++)
+		close(fds[i]);
+}
+
+static void close_sock_fds(int s_fd[], int c_fd[], int nr, bool fixed)
+{
+	if (!fixed)
+		close_fds(s_fd, nr);
+	close_fds(c_fd, nr);
+}
+
 static void queue_send(struct io_uring *ring, int fd)
 {
 	struct io_uring_sqe *sqe;
@@ -59,30 +90,83 @@ static void queue_recv(struct io_uring *ring, int fd, bool fixed)
 		sqe->flags |= IOSQE_FIXED_FILE;
 }
 
-static int accept_conn(struct io_uring *ring, int fd, bool fixed)
+static void queue_accept_multishot(struct io_uring *ring, int fd,
+				   int idx, bool fixed)
 {
-	struct io_uring_sqe *sqe;
-	struct io_uring_cqe *cqe;
-	int ret, fixed_idx = 0;
+	struct io_uring_sqe *sqe = io_uring_get_sqe(ring);
+	int ret;
 
-	sqe = io_uring_get_sqe(ring);
-	if (!fixed)
-		io_uring_prep_accept(sqe, fd, NULL, NULL, 0);
+	if (fixed)
+		io_uring_prep_multishot_accept_direct(sqe, fd,
+						NULL, NULL,
+						0);
 	else
-		io_uring_prep_accept_direct(sqe, fd, NULL, NULL, 0, fixed_idx);
+		io_uring_prep_multishot_accept(sqe, fd, NULL, NULL, 0);
 
+	io_uring_sqe_set_data64(sqe, idx);
 	ret = io_uring_submit(ring);
 	assert(ret != -1);
+}
 
-	ret = io_uring_wait_cqe(ring, &cqe);
-	assert(!ret);
-	ret = cqe->res;
-	io_uring_cqe_seen(ring, cqe);
+static void queue_accept_conn(struct io_uring *ring, int fd,
+			      struct accept_test_args args)
+{
+	struct io_uring_sqe *sqe;
+	int ret;
+	int fixed_idx = args.fixed ? 0 : -1;
+	int count = 1 + args.extra_loops;
+
+	if (args.multishot) {
+		queue_accept_multishot(ring, fd, INITIAL_USER_DATA, args.fixed);
+		return;
+	}
 
-	if (fixed) {
+	while (count--) {
+		sqe = io_uring_get_sqe(ring);
+		if (fixed_idx < 0) {
+			io_uring_prep_accept(sqe, fd, NULL, NULL, 0);
+		} else {
+			io_uring_prep_accept_direct(sqe, fd, NULL, NULL,
+						    0, fixed_idx);
+		}
+		ret = io_uring_submit(ring);
+		assert(ret != -1);
+	}
+}
+
+static int accept_conn(struct io_uring *ring, int fixed_idx, int *multishot, int fd)
+{
+	struct io_uring_cqe *pcqe;
+	struct io_uring_cqe cqe;
+	int ret;
+
+	do {
+		ret = io_uring_wait_cqe(ring, &pcqe);
+		assert(!ret);
+		cqe = *pcqe;
+		io_uring_cqe_seen(ring, pcqe);
+	} while (cqe.user_data == NOP_USER_DATA);
+
+	if (*multishot) {
+		if (!(cqe.flags & IORING_CQE_F_MORE)) {
+			(*multishot)++;
+			queue_accept_multishot(ring, fd, *multishot, fixed_idx == 0);
+		} else {
+			if (cqe.user_data != *multishot) {
+				fprintf(stderr, "received multishot after told done!\n");
+				return -ECANCELED;
+			}
+		}
+	}
+
+	ret = cqe.res;
+
+	if (fixed_idx >= 0) {
 		if (ret > 0) {
-			close(ret);
-			return -EINVAL;
+			if (!multishot) {
+				close(ret);
+				return -EINVAL;
+			}
 		} else if (!ret) {
 			ret = fixed_idx;
 		}
@@ -90,11 +174,13 @@ static int accept_conn(struct io_uring *ring, int fd, bool fixed)
 	return ret;
 }
 
-static int start_accept_listen(struct sockaddr_in *addr, int port_off)
+static int start_accept_listen(struct sockaddr_in *addr, int port_off,
+			       int extra_flags)
 {
 	int fd, ret;
 
-	fd = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, IPPROTO_TCP);
+	fd = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC | extra_flags,
+		    IPPROTO_TCP);
 
 	int32_t val = 1;
 	ret = setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &val, sizeof(val));
@@ -108,69 +194,148 @@ static int start_accept_listen(struct sockaddr_in *addr, int port_off)
 		addr = &laddr;
 
 	addr->sin_family = AF_INET;
-	addr->sin_port = htons(0x1235 + port_off);
 	addr->sin_addr.s_addr = inet_addr("127.0.0.1");
-
-	ret = bind(fd, (struct sockaddr*)addr, sizeof(*addr));
-	assert(ret != -1);
+	assert(!t_bind_ephemeral_port(fd, addr));
 	ret = listen(fd, 128);
 	assert(ret != -1);
 
 	return fd;
 }
 
-static int test(struct io_uring *ring, int accept_should_error, bool fixed)
+static int set_client_fd(struct sockaddr_in *addr)
 {
-	struct io_uring_cqe *cqe;
-	struct sockaddr_in addr;
-	uint32_t head, count = 0;
-	int ret, p_fd[2], done = 0;
-
-	int32_t val, recv_s0 = start_accept_listen(&addr, 0);
+	int32_t val;
+	int fd, ret;
 
-	p_fd[1] = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, IPPROTO_TCP);
+	fd = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, IPPROTO_TCP);
 
 	val = 1;
-	ret = setsockopt(p_fd[1], IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val));
+	ret = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val));
 	assert(ret != -1);
 
-	int32_t flags = fcntl(p_fd[1], F_GETFL, 0);
+	int32_t flags = fcntl(fd, F_GETFL, 0);
 	assert(flags != -1);
 
 	flags |= O_NONBLOCK;
-	ret = fcntl(p_fd[1], F_SETFL, flags);
+	ret = fcntl(fd, F_SETFL, flags);
 	assert(ret != -1);
 
-	ret = connect(p_fd[1], (struct sockaddr*)&addr, sizeof(addr));
+	ret = connect(fd, (struct sockaddr *)addr, sizeof(*addr));
 	assert(ret == -1);
 
-	flags = fcntl(p_fd[1], F_GETFL, 0);
+	flags = fcntl(fd, F_GETFL, 0);
 	assert(flags != -1);
 
 	flags &= ~O_NONBLOCK;
-	ret = fcntl(p_fd[1], F_SETFL, flags);
+	ret = fcntl(fd, F_SETFL, flags);
 	assert(ret != -1);
 
-	p_fd[0] = accept_conn(ring, recv_s0, fixed);
-	if (p_fd[0] == -EINVAL) {
-		if (accept_should_error)
+	return fd;
+}
+
+static void cause_overflow(struct io_uring *ring)
+{
+	int i, ret;
+
+	for (i = 0; i < ring->cq.ring_entries; i++) {
+		struct io_uring_sqe *sqe = io_uring_get_sqe(ring);
+
+		io_uring_prep_nop(sqe);
+		io_uring_sqe_set_data64(sqe, NOP_USER_DATA);
+		ret = io_uring_submit(ring);
+		assert(ret != -1);
+	}
+
+}
+
+static void clear_overflow(struct io_uring *ring)
+{
+	struct io_uring_cqe *cqe;
+
+	while (!io_uring_peek_cqe(ring, &cqe)) {
+		if (cqe->user_data != NOP_USER_DATA)
+			break;
+		io_uring_cqe_seen(ring, cqe);
+	}
+}
+
+static int test_loop(struct io_uring *ring,
+		     struct accept_test_args args,
+		     int recv_s0,
+		     struct sockaddr_in *addr)
+{
+	struct io_uring_cqe *cqe;
+	uint32_t head, count = 0;
+	int i, ret, s_fd[MAX_FDS], c_fd[MAX_FDS], done = 0;
+	bool fixed = args.fixed;
+	bool multishot = args.multishot;
+	uint32_t multishot_mask = 0;
+	int nr_fds = multishot ? MAX_FDS : 1;
+	int multishot_idx = multishot ? INITIAL_USER_DATA : 0;
+
+	if (args.overflow)
+		cause_overflow(ring);
+
+	for (i = 0; i < nr_fds; i++) {
+		c_fd[i] = set_client_fd(addr);
+		if (args.overflow && i == nr_fds / 2)
+			clear_overflow(ring);
+	}
+
+	if (!args.queue_accept_before_connect)
+		queue_accept_conn(ring, recv_s0, args);
+
+	for (i = 0; i < nr_fds; i++) {
+		s_fd[i] = accept_conn(ring, fixed ? 0 : -1, &multishot_idx, recv_s0);
+		if (s_fd[i] == -EINVAL) {
+			if (args.accept_should_error)
+				goto out;
+			fprintf(stdout,
+				"%s %s Accept not supported, skipping\n",
+				fixed ? "Fixed" : "",
+				multishot ? "Multishot" : "");
+			if (multishot)
+				no_accept_multi = 1;
+			else
+				no_accept = 1;
 			goto out;
-		if (fixed)
-			fprintf(stdout, "Fixed accept not supported, skipping\n");
-		else
-			fprintf(stdout, "Accept not supported, skipping\n");
-		no_accept = 1;
+		} else if (s_fd[i] < 0) {
+			if (args.accept_should_error &&
+			    (s_fd[i] == -EBADF || s_fd[i] == -EINVAL))
+				goto out;
+			fprintf(stderr, "%s %s Accept[%d] got %d\n",
+				fixed ? "Fixed" : "",
+				multishot ? "Multishot" : "",
+				i, s_fd[i]);
+			goto err;
+		}
+
+		if (multishot && fixed) {
+			if (s_fd[i] >= MAX_FDS) {
+				fprintf(stderr,
+					"Fixed Multishot Accept[%d] got outbound index: %d\n",
+					i, s_fd[i]);
+				goto err;
+			}
+			/*
+			 * for fixed multishot accept test, the file slots
+			 * allocated are [0, 32), this means we finally end up
+			 * with each bit of a u32 being 1.
+			 */
+			multishot_mask |= (1U << s_fd[i]);
+		}
+	}
+
+	if (multishot) {
+		if (fixed && (~multishot_mask != 0U)) {
+			fprintf(stderr, "Fixed Multishot Accept misses events\n");
+			goto err;
+		}
 		goto out;
-	} else if (p_fd[0] < 0) {
-		if (accept_should_error &&
-		    (p_fd[0] == -EBADF || p_fd[0] == -EINVAL))
-			goto out;
-		fprintf(stderr, "Accept got %d\n", p_fd[0]);
-		goto err;
 	}
 
-	queue_send(ring, p_fd[1]);
-	queue_recv(ring, p_fd[0], fixed);
+	queue_send(ring, c_fd[0]);
+	queue_recv(ring, s_fd[0], fixed);
 
 	ret = io_uring_submit_and_wait(ring, 2);
 	assert(ret != -1);
@@ -194,19 +359,32 @@ static int test(struct io_uring *ring, int accept_should_error, bool fixed)
 	}
 
 out:
-	if (!fixed)
-		close(p_fd[0]);
-	close(p_fd[1]);
-	close(recv_s0);
+	close_sock_fds(s_fd, c_fd, nr_fds, fixed);
 	return 0;
 err:
-	if (!fixed)
-		close(p_fd[0]);
-	close(p_fd[1]);
-	close(recv_s0);
+	close_sock_fds(s_fd, c_fd, nr_fds, fixed);
 	return 1;
 }
 
+static int test(struct io_uring *ring, struct accept_test_args args)
+{
+	struct sockaddr_in addr;
+	int ret = 0;
+	int loop;
+	int32_t recv_s0 = start_accept_listen(&addr, 0,
+					      args.nonblock ? O_NONBLOCK : 0);
+	if (args.queue_accept_before_connect)
+		queue_accept_conn(ring, recv_s0, args);
+	for (loop = 0; loop < 1 + args.extra_loops; loop++) {
+		ret = test_loop(ring, args, recv_s0, &addr);
+		if (ret)
+			break;
+	}
+
+	close(recv_s0);
+	return ret;
+}
+
 static void sig_alrm(int sig)
 {
 	exit(0);
@@ -222,7 +400,7 @@ static int test_accept_pending_on_exit(void)
 	ret = io_uring_queue_init(32, &m_io_uring, 0);
 	assert(ret >= 0);
 
-	fd = start_accept_listen(NULL, 0);
+	fd = start_accept_listen(NULL, 0, 0);
 
 	sqe = io_uring_get_sqe(&m_io_uring);
 	io_uring_prep_accept(sqe, fd, NULL, NULL, 0);
@@ -239,10 +417,17 @@ static int test_accept_pending_on_exit(void)
 	return 0;
 }
 
+struct test_accept_many_args {
+	unsigned int usecs;
+	bool nonblock;
+	bool single_sock;
+	bool close_fds;
+};
+
 /*
  * Test issue many accepts and see if we handle cancellation on exit
  */
-static int test_accept_many(unsigned nr, unsigned usecs)
+static int test_accept_many(struct test_accept_many_args args)
 {
 	struct io_uring m_io_uring;
 	struct io_uring_cqe *cqe;
@@ -250,6 +435,8 @@ static int test_accept_many(unsigned nr, unsigned usecs)
 	unsigned long cur_lim;
 	struct rlimit rlim;
 	int *fds, i, ret;
+	unsigned int nr = 128;
+	int nr_socks = args.single_sock ? 1 : nr;
 
 	if (getrlimit(RLIMIT_NPROC, &rlim) < 0) {
 		perror("getrlimit");
@@ -267,31 +454,39 @@ static int test_accept_many(unsigned nr, unsigned usecs)
 	ret = io_uring_queue_init(2 * nr, &m_io_uring, 0);
 	assert(ret >= 0);
 
-	fds = t_calloc(nr, sizeof(int));
+	fds = t_calloc(nr_socks, sizeof(int));
 
-	for (i = 0; i < nr; i++)
-		fds[i] = start_accept_listen(NULL, i);
+	for (i = 0; i < nr_socks; i++)
+		fds[i] = start_accept_listen(NULL, i,
+					     args.nonblock ? O_NONBLOCK : 0);
 
 	for (i = 0; i < nr; i++) {
+		int sock_idx = args.single_sock ? 0 : i;
 		sqe = io_uring_get_sqe(&m_io_uring);
-		io_uring_prep_accept(sqe, fds[i], NULL, NULL, 0);
+		io_uring_prep_accept(sqe, fds[sock_idx], NULL, NULL, 0);
 		sqe->user_data = 1 + i;
 		ret = io_uring_submit(&m_io_uring);
 		assert(ret == 1);
 	}
 
-	if (usecs)
-		usleep(usecs);
+	if (args.usecs)
+		usleep(args.usecs);
+
+	if (args.close_fds)
+		for (i = 0; i < nr_socks; i++)
+			close(fds[i]);
 
 	for (i = 0; i < nr; i++) {
 		if (io_uring_peek_cqe(&m_io_uring, &cqe))
 			break;
 		if (cqe->res != -ECANCELED) {
-			fprintf(stderr, "Expected cqe to be cancelled\n");
-			goto err;
+			fprintf(stderr, "Expected cqe to be cancelled %d\n", cqe->res);
+			ret = 1;
+			goto out;
 		}
 		io_uring_cqe_seen(&m_io_uring, cqe);
 	}
+	ret = 0;
 out:
 	rlim.rlim_cur = cur_lim;
 	if (setrlimit(RLIMIT_NPROC, &rlim) < 0) {
@@ -301,40 +496,46 @@ out:
 
 	free(fds);
 	io_uring_queue_exit(&m_io_uring);
-	return 0;
-err:
-	ret = 1;
-	goto out;
+	return ret;
 }
 
-static int test_accept_cancel(unsigned usecs)
+static int test_accept_cancel(unsigned usecs, unsigned int nr, bool multishot)
 {
 	struct io_uring m_io_uring;
 	struct io_uring_cqe *cqe;
 	struct io_uring_sqe *sqe;
 	int fd, i, ret;
 
+	if (multishot && no_accept_multi)
+		return T_EXIT_SKIP;
+
 	ret = io_uring_queue_init(32, &m_io_uring, 0);
 	assert(ret >= 0);
 
-	fd = start_accept_listen(NULL, 0);
+	fd = start_accept_listen(NULL, 0, 0);
 
-	sqe = io_uring_get_sqe(&m_io_uring);
-	io_uring_prep_accept(sqe, fd, NULL, NULL, 0);
-	sqe->user_data = 1;
-	ret = io_uring_submit(&m_io_uring);
-	assert(ret == 1);
+	for (i = 1; i <= nr; i++) {
+		sqe = io_uring_get_sqe(&m_io_uring);
+		if (!multishot)
+			io_uring_prep_accept(sqe, fd, NULL, NULL, 0);
+		else
+			io_uring_prep_multishot_accept(sqe, fd, NULL, NULL, 0);
+		sqe->user_data = i;
+		ret = io_uring_submit(&m_io_uring);
+		assert(ret == 1);
+	}
 
 	if (usecs)
 		usleep(usecs);
 
-	sqe = io_uring_get_sqe(&m_io_uring);
-	io_uring_prep_cancel(sqe, 1, 0);
-	sqe->user_data = 2;
-	ret = io_uring_submit(&m_io_uring);
-	assert(ret == 1);
-
-	for (i = 0; i < 2; i++) {
+	for (i = 1; i <= nr; i++) {
+		sqe = io_uring_get_sqe(&m_io_uring);
+		io_uring_prep_cancel64(sqe, i, 0);
+		sqe->user_data = nr + i;
+		ret = io_uring_submit(&m_io_uring);
+		assert(ret == 1);
+	}
+	for (i = 0; i < nr * 2; i++) {
 		ret = io_uring_wait_cqe(&m_io_uring, &cqe);
 		assert(!ret);
 		/*
@@ -347,12 +548,15 @@ static int test_accept_cancel(unsigned usecs)
 		 *    should get '-EALREADY' for the cancel request and
 		 *    '-EINTR' for the accept request.
 		 */
-		if (cqe->user_data == 1) {
+		if (cqe->user_data == 0) {
+			fprintf(stderr, "unexpected 0 user data\n");
+			goto err;
+		} else if (cqe->user_data <= nr) {
 			if (cqe->res != -EINTR && cqe->res != -ECANCELED) {
 				fprintf(stderr, "Cancelled accept got %d\n", cqe->res);
 				goto err;
 			}
-		} else if (cqe->user_data == 2) {
+		} else if (cqe->user_data <= nr * 2) {
 			if (cqe->res != -EALREADY && cqe->res != 0) {
 				fprintf(stderr, "Cancel got %d\n", cqe->res);
 				goto err;
@@ -362,20 +566,101 @@ static int test_accept_cancel(unsigned usecs)
 	}
 
 	io_uring_queue_exit(&m_io_uring);
+	close(fd);
+	return 0;
+err:
+	io_uring_queue_exit(&m_io_uring);
+	close(fd);
+	return 1;
+}
+
+static int test_accept(int count, bool before)
+{
+	struct io_uring m_io_uring;
+	int ret;
+	struct accept_test_args args = {
+		.queue_accept_before_connect = before,
+		.extra_loops = count - 1
+	};
+
+	ret = io_uring_queue_init(32, &m_io_uring, 0);
+	assert(ret >= 0);
+	ret = test(&m_io_uring, args);
+	io_uring_queue_exit(&m_io_uring);
+	return ret;
+}
+
+static int test_multishot_accept(int count, bool before, bool overflow)
+{
+	struct io_uring m_io_uring;
+	int ret;
+	struct accept_test_args args = {
+		.queue_accept_before_connect = before,
+		.multishot = true,
+		.extra_loops = count - 1,
+		.overflow = overflow
+	};
+
+	if (no_accept_multi)
+		return T_EXIT_SKIP;
+
+	ret = io_uring_queue_init(MAX_FDS + 10, &m_io_uring, 0);
+	assert(ret >= 0);
+	ret = test(&m_io_uring, args);
+	io_uring_queue_exit(&m_io_uring);
+	return ret;
+}
+
+static int test_accept_multishot_wrong_arg()
+{
+	struct io_uring m_io_uring;
+	struct io_uring_cqe *cqe;
+	struct io_uring_sqe *sqe;
+	int fd, ret;
+
+	ret = io_uring_queue_init(4, &m_io_uring, 0);
+	assert(ret >= 0);
+
+	fd = start_accept_listen(NULL, 0, 0);
+
+	sqe = io_uring_get_sqe(&m_io_uring);
+	io_uring_prep_multishot_accept_direct(sqe, fd, NULL, NULL, 0);
+	sqe->file_index = 1;
+	ret = io_uring_submit(&m_io_uring);
+	assert(ret == 1);
+
+	ret = io_uring_wait_cqe(&m_io_uring, &cqe);
+	assert(!ret);
+	if (cqe->res != -EINVAL) {
+		fprintf(stderr, "file index should be IORING_FILE_INDEX_ALLOC \
+				if its accept in multishot direct mode\n");
+		goto err;
+	}
+	io_uring_cqe_seen(&m_io_uring, cqe);
+
+	io_uring_queue_exit(&m_io_uring);
+	close(fd);
 	return 0;
 err:
 	io_uring_queue_exit(&m_io_uring);
+	close(fd);
 	return 1;
 }
 
-static int test_accept(void)
+
+static int test_accept_nonblock(bool queue_before_connect, int count)
 {
 	struct io_uring m_io_uring;
 	int ret;
+	struct accept_test_args args = {
+		.nonblock = true,
+		.queue_accept_before_connect = queue_before_connect,
+		.extra_loops = count - 1
+	};
 
 	ret = io_uring_queue_init(32, &m_io_uring, 0);
 	assert(ret >= 0);
-	ret = test(&m_io_uring, 0, false);
+	ret = test(&m_io_uring, args);
 	io_uring_queue_exit(&m_io_uring);
 	return ret;
 }
@@ -384,12 +669,37 @@ static int test_accept_fixed(void)
 {
 	struct io_uring m_io_uring;
 	int ret, fd = -1;
+	struct accept_test_args args = {
+		.fixed = true
+	};
 
 	ret = io_uring_queue_init(32, &m_io_uring, 0);
 	assert(ret >= 0);
 	ret = io_uring_register_files(&m_io_uring, &fd, 1);
 	assert(ret == 0);
-	ret = test(&m_io_uring, 0, true);
+	ret = test(&m_io_uring, args);
+	io_uring_queue_exit(&m_io_uring);
+	return ret;
+}
+
+static int test_multishot_fixed_accept(void)
+{
+	struct io_uring m_io_uring;
+	int ret, fd[MAX_FDS];
+	struct accept_test_args args = {
+		.fixed = true,
+		.multishot = true
+	};
+
+	if (no_accept_multi)
+		return T_EXIT_SKIP;
+
+	memset(fd, -1, sizeof(fd));
+	ret = io_uring_queue_init(MAX_FDS + 10, &m_io_uring, 0);
+	assert(ret >= 0);
+	ret = io_uring_register_files(&m_io_uring, fd, MAX_FDS);
+	assert(ret == 0);
+	ret = test(&m_io_uring, args);
 	io_uring_queue_exit(&m_io_uring);
 	return ret;
 }
@@ -398,7 +708,8 @@ static int test_accept_sqpoll(void)
 {
 	struct io_uring m_io_uring;
 	struct io_uring_params p = { };
-	int ret, should_fail;
+	int ret;
+	struct accept_test_args args = { };
 
 	p.flags = IORING_SETUP_SQPOLL;
 	ret = t_create_ring_params(32, &m_io_uring, &p);
@@ -407,11 +718,11 @@ static int test_accept_sqpoll(void)
 	else if (ret < 0)
 		return ret;
 
-	should_fail = 1;
+	args.accept_should_error = 1;
 	if (p.features & IORING_FEAT_SQPOLL_NONFIXED)
-		should_fail = 0;
+		args.accept_should_error = 0;
 
-	ret = test(&m_io_uring, should_fail, false);
+	ret = test(&m_io_uring, args);
 	io_uring_queue_exit(&m_io_uring);
 	return ret;
 }
@@ -421,15 +732,44 @@ int main(int argc, char *argv[])
 	int ret;
 
 	if (argc > 1)
-		return 0;
-
-	ret = test_accept();
+		return T_EXIT_SKIP;
+	ret = test_accept(1, false);
 	if (ret) {
 		fprintf(stderr, "test_accept failed\n");
 		return ret;
 	}
 	if (no_accept)
-		return 0;
+		return T_EXIT_SKIP;
+
+	ret = test_accept(2, false);
+	if (ret) {
+		fprintf(stderr, "test_accept(2) failed\n");
+		return ret;
+	}
+
+	ret = test_accept(2, true);
+	if (ret) {
+		fprintf(stderr, "test_accept(2, true) failed\n");
+		return ret;
+	}
+
+	ret = test_accept_nonblock(false, 1);
+	if (ret) {
+		fprintf(stderr, "test_accept_nonblock failed\n");
+		return ret;
+	}
+
+	ret = test_accept_nonblock(true, 1);
+	if (ret) {
+		fprintf(stderr, "test_accept_nonblock(before, 1) failed\n");
+		return ret;
+	}
+
+	ret = test_accept_nonblock(true, 3);
+	if (ret) {
+		fprintf(stderr, "test_accept_nonblock(before,3) failed\n");
+		return ret;
+	}
 
 	ret = test_accept_fixed();
 	if (ret) {
@@ -437,41 +777,123 @@ int main(int argc, char *argv[])
 		return ret;
 	}
 
+	ret = test_multishot_fixed_accept();
+	if (ret) {
+		fprintf(stderr, "test_multishot_fixed_accept failed\n");
+		return ret;
+	}
+
+	ret = test_accept_multishot_wrong_arg();
+	if (ret) {
+		fprintf(stderr, "test_accept_multishot_wrong_arg failed\n");
+		return ret;
+	}
+
 	ret = test_accept_sqpoll();
 	if (ret) {
 		fprintf(stderr, "test_accept_sqpoll failed\n");
 		return ret;
 	}
 
-	ret = test_accept_cancel(0);
+	ret = test_accept_cancel(0, 1, false);
 	if (ret) {
 		fprintf(stderr, "test_accept_cancel nodelay failed\n");
 		return ret;
 	}
 
-	ret = test_accept_cancel(10000);
+	ret = test_accept_cancel(10000, 1, false);
 	if (ret) {
 		fprintf(stderr, "test_accept_cancel delay failed\n");
 		return ret;
 	}
 
-	ret = test_accept_many(128, 0);
+	ret = test_accept_cancel(0, 4, false);
 	if (ret) {
-		fprintf(stderr, "test_accept_many failed\n");
+		fprintf(stderr, "test_accept_cancel nodelay failed\n");
+		return ret;
+	}
+
+	ret = test_accept_cancel(10000, 4, false);
+	if (ret) {
+		fprintf(stderr, "test_accept_cancel delay failed\n");
+		return ret;
+	}
+
+	ret = test_accept_cancel(0, 1, true);
+	if (ret) {
+		fprintf(stderr, "test_accept_cancel multishot nodelay failed\n");
+		return ret;
+	}
+
+	ret = test_accept_cancel(10000, 1, true);
+	if (ret) {
+		fprintf(stderr, "test_accept_cancel multishot delay failed\n");
+		return ret;
+	}
+
+	ret = test_accept_cancel(0, 4, true);
+	if (ret) {
+		fprintf(stderr, "test_accept_cancel multishot nodelay failed\n");
 		return ret;
 	}
 
-	ret = test_accept_many(128, 100000);
+	ret = test_accept_cancel(10000, 4, true);
+	if (ret) {
+		fprintf(stderr, "test_accept_cancel multishot delay failed\n");
+		return ret;
+	}
+
+	ret = test_multishot_accept(1, true, true);
+	if (ret) {
+		fprintf(stderr, "test_multishot_accept(1, false, true) failed\n");
+		return ret;
+	}
+
+	ret = test_multishot_accept(1, false, false);
+	if (ret) {
+		fprintf(stderr, "test_multishot_accept(1, false, false) failed\n");
+		return ret;
+	}
+
+	ret = test_multishot_accept(1, true, false);
+	if (ret) {
+		fprintf(stderr, "test_multishot_accept(1, true, false) failed\n");
+		return ret;
+	}
+
+	ret = test_accept_many((struct test_accept_many_args) {});
 	if (ret) {
 		fprintf(stderr, "test_accept_many failed\n");
 		return ret;
 	}
 
+	ret = test_accept_many((struct test_accept_many_args) {
+				.usecs = 100000 });
+	if (ret) {
+		fprintf(stderr, "test_accept_many(sleep) failed\n");
+		return ret;
+	}
+
+	ret = test_accept_many((struct test_accept_many_args) {
+				.nonblock = true });
+	if (ret) {
+		fprintf(stderr, "test_accept_many(nonblock) failed\n");
+		return ret;
+	}
+
+	ret = test_accept_many((struct test_accept_many_args) {
+				.nonblock = true,
+				.single_sock = true,
+				.close_fds = true });
+	if (ret) {
+		fprintf(stderr, "test_accept_many(nonblock,close) failed\n");
+		return ret;
+	}
+
 	ret = test_accept_pending_on_exit();
 	if (ret) {
 		fprintf(stderr, "test_accept_pending_on_exit failed\n");
 		return ret;
 	}
-
-	return 0;
+	return T_EXIT_PASS;
 }