uringmachine 0.20.0 → 0.21.0

data/vendor/liburing/test/bind-listen.c

@@ -22,7 +22,7 @@ static void msec_to_ts(struct __kernel_timespec *ts, unsigned int msec)
 }
 
 static const char *magic = "Hello World!";
-static int use_port = 8000;
+static bool no_getsockname = false;
 
 enum {
 	SRV_INDEX = 0,
@@ -74,18 +74,82 @@ static int connect_client(struct io_uring *ring, unsigned short peer_port)
 	return T_SETUP_OK;
 }
 
-static int setup_srv(struct io_uring *ring, struct sockaddr_in *server_addr)
+/*
+ * getsockname was added to the kernel a few releases after bind/listen.
+ * In order to provide a backward-compatible test, fallback to
+ * non-io-uring if we are on an older kernel, allowing the test to
+ * continue.
+ */
+static int do_getsockname(struct io_uring *ring, int direct_socket,
+			  int peer, struct sockaddr *saddr,
+			  socklen_t *saddr_len)
+{
+	struct io_uring_sqe *sqe;
+	struct io_uring_cqe *cqe;
+	int res = 0, fd;
+
+	if (!no_getsockname) {
+		/* attempt io_uring. Command might not exist */
+		sqe = io_uring_get_sqe(ring);
+		io_uring_prep_cmd_getsockname(sqe, direct_socket,
+					      saddr, saddr_len, peer);
+		sqe->flags |= IOSQE_FIXED_FILE | IOSQE_IO_LINK;
+		io_uring_submit(ring);
+		io_uring_wait_cqe(ring, &cqe);
+		res = cqe->res;
+		io_uring_cqe_seen(ring, cqe);
+	}
+
+	if (no_getsockname || res == -ENOTSUP) {
+		/*
+		 * Older kernel.  install the fd and use the getsockname
+		 * syscall.
+		 */
+		no_getsockname = true;
+
+		sqe = io_uring_get_sqe(ring);
+		io_uring_prep_fixed_fd_install(sqe, direct_socket, 0);
+		io_uring_submit(ring);
+		io_uring_wait_cqe(ring, &cqe);
+		fd = cqe->res;
+		io_uring_cqe_seen(ring, cqe);
+
+		if (fd < 0) {
+			fprintf(stderr, "installing direct fd failed. %d\n",
+				cqe->res);
+			return T_EXIT_FAIL;
+		}
+		if (peer)
+			res = getpeername(fd, saddr, saddr_len);
+		else
+			res = getsockname(fd, saddr, saddr_len);
+
+		if (res) {
+			fprintf(stderr, "get%sname syscall failed. %d\n",
+				peer? "peer":"sock", errno);
+			return T_EXIT_FAIL;
+		}
+		close(fd);
+	} else if (res < 0) {
+		fprintf(stderr, "getsockname server failed. %d\n", cqe->res);
+		return T_EXIT_FAIL;
+	}
+	return 0;
+}
+
+static int setup_srv(struct io_uring *ring)
 {
+	struct sockaddr_in server_addr;
 	struct io_uring_sqe *sqe;
 	struct io_uring_cqe *cqe;
 	struct __kernel_timespec ts;
 	int ret, val, submitted;
 	unsigned head;
 
-	memset(server_addr, 0, sizeof(struct sockaddr_in));
-	server_addr->sin_family = AF_INET;
-	server_addr->sin_port = htons(use_port++);
-	server_addr->sin_addr.s_addr = htons(INADDR_ANY);
+	memset(&server_addr, 0, sizeof(struct sockaddr_in));
+	server_addr.sin_family = AF_INET;
+	server_addr.sin_port = htons(0);
+	server_addr.sin_addr.s_addr = htons(INADDR_ANY);
 
 	sqe = io_uring_get_sqe(ring);
 	io_uring_prep_socket_direct(sqe, AF_INET, SOCK_STREAM, 0, SRV_INDEX, 0);
@@ -98,7 +162,7 @@ static int setup_srv(struct io_uring *ring, struct sockaddr_in *server_addr)
 	sqe->flags |= IOSQE_FIXED_FILE | IOSQE_IO_LINK;
 
 	sqe = io_uring_get_sqe(ring);
-	io_uring_prep_bind(sqe, SRV_INDEX, (struct sockaddr *) server_addr,
+	io_uring_prep_bind(sqe, SRV_INDEX, (struct sockaddr *) &server_addr,
 			   sizeof(struct sockaddr_in));
 	sqe->flags |= IOSQE_FIXED_FILE | IOSQE_IO_LINK;
 
@@ -132,12 +196,13 @@ static int setup_srv(struct io_uring *ring, struct sockaddr_in *server_addr)
 
 static int test_good_server(unsigned int ring_flags)
 {
-	struct sockaddr_in server_addr;
+	struct sockaddr_in saddr = {};
+	socklen_t saddr_len = sizeof(saddr);
 	struct __kernel_timespec ts;
 	struct io_uring_sqe *sqe;
 	struct io_uring_cqe *cqe;
 	struct io_uring ring;
-	int ret;
+	int ret, port;
 	int fds[3];
 	char buf[1024];
 
@@ -155,18 +220,22 @@ static int test_good_server(unsigned int ring_flags)
 		return T_SETUP_SKIP;
 	}
 
-	ret = setup_srv(&ring, &server_addr);
+	ret = setup_srv(&ring);
 	if (ret != T_SETUP_OK) {
 		fprintf(stderr, "srv startup failed.\n");
 		return T_EXIT_FAIL;
 	}
 
-	if (connect_client(&ring, server_addr.sin_port) != T_SETUP_OK) {
+	if (do_getsockname(&ring, SRV_INDEX, 0, (struct sockaddr*) &saddr,
+			   &saddr_len))
+		return T_EXIT_FAIL;
+
+	if (connect_client(&ring, saddr.sin_port) != T_SETUP_OK) {
 		fprintf(stderr, "cli startup failed.\n");
 		return T_SETUP_SKIP;
 	}
 
-	/* Wait for a request */
+	/* Wait for a connection */
 	sqe = io_uring_get_sqe(&ring);
 	io_uring_prep_accept_direct(sqe, SRV_INDEX, NULL, NULL, 0, CONN_INDEX);
 	sqe->flags |= IOSQE_FIXED_FILE;
@@ -179,6 +248,22 @@ static int test_good_server(unsigned int ring_flags)
 	}
 	io_uring_cqe_seen(&ring, cqe);
 
+	/* Test that getsockname on the peer (getpeername) yields a
+	 * sane result.
+	 */
+	port = saddr.sin_port;
+	saddr.sin_port = 0;
+	if (do_getsockname(&ring, CLI_INDEX, 1,
+			   (struct sockaddr*)&saddr, &saddr_len))
+		return T_EXIT_FAIL;
+
+	if (saddr.sin_addr.s_addr != htonl(INADDR_LOOPBACK) ||
+	    saddr.sin_port != port) {
+		fprintf(stderr, "getsockname peer got wrong address: %s:%d\n",
+			inet_ntoa(saddr.sin_addr), saddr.sin_port);
+		return T_EXIT_FAIL;
+	}
+
 	sqe = io_uring_get_sqe(&ring);
 	io_uring_prep_recv(sqe, CONN_INDEX, buf, sizeof(buf), 0);
 	sqe->flags |= IOSQE_FIXED_FILE;
@@ -355,6 +440,77 @@ fail:
 	return ret;
 }
 
+static int test_bad_sockname(void)
+{
+	struct sockaddr_in saddr;
+	socklen_t saddr_len;
+	struct io_uring_sqe *sqe;
+	struct io_uring_cqe *cqe;
+	struct io_uring ring;
+	int sock = -1, err;
+	int ret = T_EXIT_FAIL;
+
+	memset(&saddr, 0, sizeof(struct sockaddr_in));
+	saddr.sin_family = AF_INET;
+	saddr.sin_port = htons(8001);
+	saddr.sin_addr.s_addr = htons(INADDR_ANY);
+
+	err = t_create_ring(1, &ring, 0);
+	if (err < 0) {
+		fprintf(stderr, "queue_init: %d\n", err);
+		return T_SETUP_SKIP;
+	}
+
+	sock = socket(AF_INET, SOCK_STREAM, 0);
+	if (sock < 0) {
+		perror("socket");
+		goto fail;
+	}
+
+	err = t_bind_ephemeral_port(sock, &saddr);
+	if (err) {
+		fprintf(stderr, "bind: %s\n", strerror(-err));
+		goto fail;
+	}
+
+	/* getsockname on a !socket fd.  with getsockname(2), this would
+	 * return -ENOTSOCK, but we can't do it in an io_uring_cmd.
+	 */
+	sqe = io_uring_get_sqe(&ring);
+	saddr_len = sizeof(saddr);
+	io_uring_prep_cmd_getsockname(sqe, 1, (struct sockaddr*)&saddr, &saddr_len, 0);
+	err = io_uring_submit(&ring);
+	if (err < 0)
+		goto fail;
+	err = io_uring_wait_cqe(&ring, &cqe);
+	if (err)
+		goto fail;
+	if (cqe->res != -ENOTSUP)
+		goto fail;
+	io_uring_cqe_seen(&ring, cqe);
+
+	/* getsockname with weird parameters */
+	sqe = io_uring_get_sqe(&ring);
+	io_uring_prep_cmd_getsockname(sqe, sock, (struct sockaddr*)&saddr,
+				      &saddr_len, 3);
+	err = io_uring_submit(&ring);
+	if (err < 0)
+		goto fail;
+	err = io_uring_wait_cqe(&ring, &cqe);
+	if (err)
+		goto fail;
+	if (cqe->res != -EINVAL)
+		goto fail;
+	io_uring_cqe_seen(&ring, cqe);
+
+	ret = T_EXIT_PASS;
+fail:
+	io_uring_queue_exit(&ring);
+	if (sock != -1)
+		close(sock);
+	return ret;
+}
+
 int main(int argc, char *argv[])
 {
 	struct io_uring_probe *probe;
@@ -403,6 +559,12 @@ int main(int argc, char *argv[])
 		fprintf(stderr, "bad listen failed\n");
 		return T_EXIT_FAIL;
 	}
-
+	if (!no_getsockname) {
+		ret = test_bad_sockname();
+		if (ret) {
+			fprintf(stderr, "bad sockname failed\n");
+			return T_EXIT_FAIL;
+		}
+	}
 	return T_EXIT_PASS;
 }

data/vendor/liburing/test/read-write.c

@@ -462,7 +462,7 @@ static int test_buf_select_short(const char *filename, int nonvec)
 	}
 
 	exp_len = 0;
-	for (i = 0; i < BUFFERS; i++) {
+	for (i = 0; i < 2 * BUFFERS; i++) {
 		sqe = io_uring_get_sqe(&ring);
 		io_uring_prep_provide_buffers(sqe, vecs[i].iov_base,
 						vecs[i].iov_len / 2, 1, 1, i);
@@ -471,12 +471,12 @@ static int test_buf_select_short(const char *filename, int nonvec)
 	}
 
 	ret = io_uring_submit(&ring);
-	if (ret != BUFFERS) {
+	if (ret != BUFFERS * 2) {
 		fprintf(stderr, "submit: %d\n", ret);
 		return -1;
 	}
 
-	for (i = 0; i < BUFFERS; i++) {
+	for (i = 0; i < BUFFERS * 2; i++) {
 		ret = io_uring_wait_cqe(&ring, &cqe);
 		if (cqe->res < 0) {
 			fprintf(stderr, "cqe->res=%d\n", cqe->res);
@@ -935,7 +935,7 @@ int main(int argc, char *argv[])
 
 	signal(SIGXFSZ, SIG_IGN);
 
-	vecs = t_create_buffers(BUFFERS, BS);
+	vecs = t_create_buffers(2 * BUFFERS, BS);
 
 	/* if we don't have nonvec read, skip testing that */
 	nr = has_nonvec_read() ? 64 : 32;

data/vendor/liburing/test/ringbuf-read.c

@@ -14,7 +14,7 @@
 #include "helpers.h"
 
 #define BUF_SIZE	4096
-#define NR_BUFS		64
+#define NR_BUFS		128
 #define FSIZE		(BUF_SIZE * NR_BUFS)
 
 #define BR_MASK		(NR_BUFS - 1)
@@ -87,7 +87,7 @@ static int test(const char *filename, int dio, int async)
 	}
 	io_uring_buf_ring_advance(br, NR_BUFS);
 
-	for (i = 0; i < NR_BUFS; i++) {
+	for (i = 0; i < NR_BUFS / 2; i++) {
 		sqe = io_uring_get_sqe(&ring);
 		io_uring_prep_read(sqe, fd, NULL, BUF_SIZE, i * BUF_SIZE);
 		sqe->buf_group = 1;
@@ -98,12 +98,12 @@ static int test(const char *filename, int dio, int async)
 	}
 
 	ret = io_uring_submit(&ring);
-	if (ret != NR_BUFS) {
+	if (ret != NR_BUFS / 2) {
 		fprintf(stderr, "submit: %d\n", ret);
 		return 1;
 	}
 
-	for (i = 0; i < NR_BUFS; i++) {
+	for (i = 0; i < NR_BUFS / 2; i++) {
 		int bid, ud;
 
 		ret = io_uring_wait_cqe(&ring, &cqe);

data/vendor/liburing/test/send_recv.c

@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <inttypes.h>
 #include <arpa/inet.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -17,7 +18,7 @@
 
 #define MAX_MSG	4096
 
-static unsigned long str[MAX_MSG / sizeof(unsigned long)];
+static uint64_t str[MAX_MSG / sizeof(uint64_t)];
 
 #define PORT	10202
 #define HOST	"127.0.0.1"
@@ -88,7 +89,7 @@ err:
 static int do_recv(struct io_uring *ring, struct iovec *iov, int enobufs)
 {
 	struct io_uring_cqe *cqe;
-	unsigned long *ptr;
+	uint64_t *ptr;
 	int i, ret;
 
 	ret = io_uring_wait_cqe(ring, &cqe);
@@ -118,10 +119,10 @@ static int do_recv(struct io_uring *ring, struct iovec *iov, int enobufs)
 	}
 
 	ptr = iov->iov_base;
-	for (i = 0; i < MAX_MSG / sizeof(unsigned long); i++) {
+	for (i = 0; i < MAX_MSG / sizeof(uint64_t); i++) {
 		if (ptr[i] == str[i])
 			continue;
-		fprintf(stderr, "data mismatch at %d: %lu\n", i, ptr[i]);
+		fprintf(stderr, "data mismatch at %d: %llu\n", i, (unsigned long long) ptr[i]);
 		goto err;
 	}
 
@@ -224,7 +225,7 @@ retry:
 	sqe = io_uring_get_sqe(&ring);
 	if (vec) {
 		size_t total = MAX_MSG;
-		unsigned long *ptr = str;
+		uint64_t *ptr = str;
 		int i, nvecs;
 
 		if (!big_vec) {
@@ -239,7 +240,7 @@ retry:
 			for (i = 0; i < 32; i++) {
 				vecs[i].iov_base = ptr;
 				vecs[i].iov_len = total;
-				ptr += total / sizeof(unsigned long);
+				ptr += total / sizeof(uint64_t);
 			}
 			nvecs = 32;
 		}
@@ -371,7 +372,7 @@ int main(int argc, char *argv[])
 	if (argc > 1)
 		return T_EXIT_SKIP;
 
-	for (i = 0; i < MAX_MSG / sizeof(unsigned long); i++)
+	for (i = 0; i < MAX_MSG / sizeof(uint64_t); i++)
 		str[i] = i + 1;
 
 	ret = test_invalid();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uringmachine
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Sharon Rosner
@@ -13,56 +13,56 @@ dependencies:
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.9
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.9
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.25.4
+        version: 5.26.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.25.4
+        version: 5.26.2
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
 email: sharon@noteflakes.com
@@ -690,14 +690,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.4'
+      version: '3.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.0.dev
+rubygems_version: 4.0.0
 specification_version: 4
 summary: A lean, mean io_uring machine
 test_files: []