uringmachine 0.19.1 → 0.20.0

data/vendor/liburing/test/sqe-mixed-uring_cmd.c

@@ -0,0 +1,153 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Description: mixed sqes utilizing basic nop and io_uring passthrough commands
+ */
+#include <errno.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <sys/stat.h>
+
+#include "helpers.h"
+#include "liburing.h"
+#include "nvme.h"
+
+#define len 0x1000
+static unsigned char buf[len];
+static int seq;
+
+static int test_single_nop(struct io_uring *ring)
+{
+	struct io_uring_cqe *cqe;
+	struct io_uring_sqe *sqe;
+	int ret;
+
+	sqe = io_uring_get_sqe(ring);
+	if (!sqe) {
+		fprintf(stderr, "get sqe failed\n");
+		return T_EXIT_FAIL;
+	}
+
+	io_uring_prep_nop(sqe);
+	sqe->user_data = ++seq;
+
+	ret = io_uring_submit(ring);
+	if (ret <= 0) {
+		fprintf(stderr, "sqe submit failed: %d\n", ret);
+		return T_EXIT_FAIL;
+	}
+
+	ret = io_uring_wait_cqe(ring, &cqe);
+	if (ret < 0) {
+		fprintf(stderr, "wait completion %d\n", ret);
+	} else if (cqe->user_data != seq) {
+		fprintf(stderr, "Unexpected user_data: %ld\n", (long) cqe->user_data);
+	} else {
+		io_uring_cqe_seen(ring, cqe);
+		return T_EXIT_PASS;
+	}
+	return T_EXIT_FAIL;
+}
+
+static int test_single_nvme_read(struct io_uring *ring, int fd)
+{
+	struct nvme_uring_cmd *cmd;
+	struct io_uring_cqe *cqe;
+	struct io_uring_sqe *sqe;
+	int ret;
+
+	sqe = io_uring_get_sqe128(ring);
+	if (!sqe) {
+		fprintf(stderr, "get sqe failed\n");
+		return T_EXIT_FAIL;
+	}
+
+	io_uring_prep_uring_cmd128(sqe, NVME_URING_CMD_IO, fd);
+	sqe->user_data = ++seq;
+
+	cmd = (struct nvme_uring_cmd *)sqe->cmd;
+	memset(cmd, 0, sizeof(struct nvme_uring_cmd));
+	cmd->opcode = nvme_cmd_read;
+	cmd->cdw12 = (len >> lba_shift) - 1;
+	cmd->addr = (__u64)(uintptr_t)buf;
+	cmd->data_len = len;
+	cmd->nsid = nsid;
+
+	ret = io_uring_submit(ring);
+	if (ret <= 0) {
+		fprintf(stderr, "sqe submit failed: %d\n", ret);
+		return T_EXIT_FAIL;
+	}
+
+	ret = io_uring_wait_cqe(ring, &cqe);
+	if (ret < 0) {
+		fprintf(stderr, "wait completion %d\n", ret);
+	} else if (cqe->res != 0) {
+		fprintf(stderr, "cqe res %d, wanted 0\n", cqe->res);
+	} else if (cqe->user_data != seq) {
+		fprintf(stderr, "Unexpected user_data: %ld\n", (long) cqe->user_data);
+	} else {
+		io_uring_cqe_seen(ring, cqe);
+		return T_EXIT_PASS;
+	}
+	return T_EXIT_FAIL;
+}
+
+int main(int argc, char *argv[])
+{
+	struct io_uring ring;
+	struct stat sb;
+	int fd, ret, i;
+
+	if (argc < 2)
+		return T_EXIT_SKIP;
+
+	ret = nvme_get_info(argv[1]);
+	if (ret)
+		return T_EXIT_SKIP;
+
+	fd = open(argv[1], O_RDONLY);
+	if (fd < 0) {
+		if (errno == EACCES || errno == EPERM)
+			return T_EXIT_SKIP;
+		perror("file open");
+		return T_EXIT_FAIL;
+	}
+
+	if (fstat(fd, &sb) < 0) {
+		perror("fstat");
+		ret = T_EXIT_FAIL;
+		goto close;
+	}
+	if (!S_ISCHR(sb.st_mode)) {
+		ret = T_EXIT_SKIP;
+		goto close;
+	}
+
+	ret = io_uring_queue_init(8, &ring,
+		IORING_SETUP_CQE_MIXED | IORING_SETUP_SQE_MIXED);
+	if (ret) {
+		if (ret == -EINVAL) {
+			ret = T_EXIT_SKIP;
+		} else {
+			fprintf(stderr, "ring setup failed: %d\n", ret);
+			ret = T_EXIT_FAIL;
+		}
+		goto close;
+	}
+
+	for (i = 0; i < 32; i++) {
+		if (i & 1)
+			ret = test_single_nvme_read(&ring, fd);
+		else
+			ret = test_single_nop(&ring);
+
+		if (ret)
+			break;
+	}
+
+	io_uring_queue_exit(&ring);
+close:
+	close(fd);
+	return ret;
+}

data/vendor/liburing/test/timestamp.c

@@ -1,6 +1,5 @@
+#include <time.h>
 #include <arpa/inet.h>
-#include <error.h>
-#include <errno.h>
 #include <inttypes.h>
 #include <linux/errqueue.h>
 #include <linux/ipv6.h>
@@ -15,7 +14,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>
-#include <time.h>
 #include <unistd.h>
 #include <assert.h>
 
@@ -47,11 +45,14 @@ static struct sockaddr_in6 daddr6;
 static int saved_tskey = -1;
 static int saved_tskey_type = -1;
 
+static int listen_fd;
+
 struct ctx {
 	int family;
 	int proto;
 	int report_opt;
 	int num_pkts;
+	int cqe_mixed;
 };
 
 static int validate_key(int tskey, int tstype, struct ctx *ctx)
@@ -86,15 +87,15 @@ static int test_prep_sock(int family, int proto, unsigned report_opt)
 
 	fd = socket(family, proto, ipproto);
 	if (fd < 0)
-		error(1, errno, "socket");
+		t_error(1, errno, "socket");
 
 	if (proto == SOCK_STREAM) {
 		if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY,
 			       (char*) &val, sizeof(val)))
-			error(1, 0, "setsockopt no nagle");
+			t_error(1, 0, "setsockopt no nagle");
 
 		if (connect(fd, (void *) &daddr6, sizeof(daddr6)))
-			error(1, errno, "connect ipv6");
+			t_error(1, errno, "connect ipv6");
 	}
 
 	sock_opt = SOF_TIMESTAMPING_SOFTWARE |
@@ -105,7 +106,7 @@ static int test_prep_sock(int family, int proto, unsigned report_opt)
 
 	if (setsockopt(fd, SOL_SOCKET, SO_TIMESTAMPING,
 		       (char *) &sock_opt, sizeof(sock_opt)))
-		error(1, 0, "setsockopt timestamping");
+		t_error(1, 0, "setsockopt timestamping");
 
 	return fd;
 }
@@ -185,12 +186,18 @@ static int do_test(struct ctx *ctx)
 	int cqes_seen = 0;
 	int i, fd, ret;
 	int ts_expected = 0, ts_got = 0;
+	unsigned ring_flags;
 
 	ts_expected += !!(ctx->report_opt & SOF_TIMESTAMPING_TX_SCHED);
 	ts_expected += !!(ctx->report_opt & SOF_TIMESTAMPING_TX_SOFTWARE);
 	ts_expected += !!(ctx->report_opt & SOF_TIMESTAMPING_TX_ACK);
 
-	ret = t_create_ring(32, &ring, IORING_SETUP_CQE32);
+	if (ctx->cqe_mixed)
+		ring_flags = IORING_SETUP_CQE_MIXED;
+	else
+		ring_flags = IORING_SETUP_CQE32;
+
+	ret = t_create_ring(32, &ring, ring_flags);
 	if (ret == T_SETUP_SKIP)
 		return T_EXIT_SKIP;
 	else if (ret)
@@ -242,6 +249,13 @@ static int do_test(struct ctx *ctx)
 		bool hwts;
 
 		cqes_seen++;
+		if (cqe->flags & IORING_CQE_F_SKIP) {
+			if (!ctx->cqe_mixed) {
+				t_error(1, 0, "SKIP set for non-mixed");
+				break;
+			}
+			continue;
+		}
 
 		if (!(cqe->flags & IORING_CQE_F_MORE)) {
 			if (cqe->res == -EINVAL || cqe->res == -EOPNOTSUPP)
@@ -250,6 +264,11 @@ static int do_test(struct ctx *ctx)
 				t_error(1, 0, "failed cqe %i", cqe->res);
 			break;
 		}
+		if (ctx->cqe_mixed && !(cqe->flags & IORING_CQE_F_32)) {
+			t_error(1, 0, "CQE_F_32 not set");
+			break;
+		}
+		cqes_seen++;
 
 		ts = (void *)(cqe + 1);
 		tstype = cqe->flags >> IORING_TIMESTAMP_TYPE_SHIFT;
@@ -291,24 +310,22 @@ static void resolve_hostname(const char *name, int port)
 
 static void do_listen(int family, int type, void *addr, int alen)
 {
-	int fd;
+	listen_fd = socket(family, type, 0);
+	if (listen_fd == -1)
+		t_error(1, errno, "socket rx");
 
-	fd = socket(family, type, 0);
-	if (fd == -1)
-		error(1, errno, "socket rx");
+	if (bind(listen_fd, addr, alen))
+		t_error(1, errno, "bind rx");
 
-	if (bind(fd, addr, alen))
-		error(1, errno, "bind rx");
-
-	if (type == SOCK_STREAM && listen(fd, 10))
-		error(1, errno, "listen rx");
+	if (type == SOCK_STREAM && listen(listen_fd, 10))
+		t_error(1, errno, "listen rx");
 
 	/* leave fd open, will be closed on process exit.
 	 * this enables connect() to succeed and avoids icmp replies
 	 */
 }
 
-static int do_main(int family, int proto)
+static int do_main(int family, int proto, int cqe_mixed)
 {
 	struct ctx ctx;
 	int ret;
@@ -316,6 +333,7 @@ static int do_main(int family, int proto)
 	ctx.num_pkts = 1;
 	ctx.family = family;
 	ctx.proto = proto;
+	ctx.cqe_mixed = cqe_mixed;
 
 	if (verbose)
 		fprintf(stderr, "test SND\n");
@@ -372,11 +390,30 @@ static int do_main(int family, int proto)
 int main(int argc, char **argv)
 {
 	const char *hostname = "::1";
+	int ret;
 
 	if (argc > 1)
 		return T_EXIT_SKIP;
 
 	resolve_hostname(hostname, dest_port);
 	do_listen(PF_INET6, SOCK_STREAM, &daddr6, sizeof(daddr6));
-	return do_main(PF_INET6, SOCK_STREAM);
+	ret = do_main(PF_INET6, SOCK_STREAM, 0);
+	if (ret == T_EXIT_SKIP) {
+		return T_EXIT_SKIP;
+	} else if (ret != T_EXIT_PASS) {
+		fprintf(stderr, "CQE32 test failed\n");
+		return ret;
+	}
+
+	close(listen_fd);
+	do_listen(PF_INET6, SOCK_STREAM, &daddr6, sizeof(daddr6));
+	ret = do_main(PF_INET6, SOCK_STREAM, 1);
+	if (ret == T_EXIT_SKIP) {
+		return T_EXIT_PASS;
+	} else if (ret != T_EXIT_PASS) {
+		fprintf(stderr, "CQE32 test failed\n");
+		return ret;
+	}
+
+	return T_EXIT_PASS;
 }

data/vendor/liburing/test/vec-regbuf.c

@@ -269,7 +269,7 @@ static int test_vec(struct buf_desc *bd, struct iovec *vecs, int nr_vec,
 	struct sockaddr_storage addr;
 	int sock_server, sock_client;
 	struct verify_data vd;
-	size_t total_len = 0;
+	size_t total_len;
 	int i, ret;
 	void *verify_res;
 	pthread_t th;
@@ -284,9 +284,7 @@ static int test_vec(struct buf_desc *bd, struct iovec *vecs, int nr_vec,
 	for (i = 0; i < bd->size; i++)
 		bd->buf_wr[i] = i;
 	memset(bd->buf_rd, 0, bd->size);
-
-	for (i = 0; i < nr_vec; i++)
-		total_len += vecs[i].iov_len;
+	total_len = t_iovec_data_length(vecs, nr_vec);
 
 	vd.bd = bd;
 	vd.vecs = vecs;

data/vendor/liburing/test/wq-aff.c

@@ -161,10 +161,17 @@ static int test_invalid_cpu(void)
 int main(int argc, char *argv[])
 {
 	int ret;
+	int nr_cpus;
 
 	if (argc > 1)
 		return T_EXIT_SKIP;
 
+	nr_cpus = sysconf(_SC_NPROCESSORS_ONLN);
+	if (nr_cpus < 2) {
+		fprintf(stderr, "Requires at least 2 CPUs, found %d\n", nr_cpus);
+		return T_EXIT_SKIP;
+	}
+
 	ret = test_invalid_cpu();
 	if (ret == T_EXIT_SKIP) {
 		return T_EXIT_SKIP;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uringmachine
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.20.0
 platform: ruby
 authors:
 - Sharon Rosner
@@ -83,7 +83,10 @@ files:
 - README.md
 - Rakefile
 - TODO.md
+- examples/bm_fileno.rb
 - examples/bm_http_parse.rb
+- examples/bm_mutex.rb
+- examples/bm_mutex_single.rb
 - examples/bm_queue.rb
 - examples/bm_send.rb
 - examples/bm_side_running.rb
@@ -93,9 +96,11 @@ files:
 - examples/dns_client.rb
 - examples/echo_server.rb
 - examples/fiber_scheduler_demo.rb
+- examples/fiber_scheduler_fork.rb
 - examples/http_server.rb
 - examples/inout.rb
 - examples/nc.rb
+- examples/nc_ssl.rb
 - examples/pg.rb
 - examples/server_client.rb
 - examples/snooze.rb
@@ -117,6 +122,8 @@ files:
 - ext/um/um_stream_class.c
 - ext/um/um_sync.c
 - ext/um/um_utils.c
+- grant-2025/journal.md
+- grant-2025/tasks.md
 - lib/uringmachine.rb
 - lib/uringmachine/actor.rb
 - lib/uringmachine/dns_resolver.rb
@@ -128,6 +135,7 @@ files:
 - test/test_actor.rb
 - test/test_async_op.rb
 - test/test_fiber.rb
+- test/test_fiber_scheduler.rb
 - test/test_stream.rb
 - test/test_um.rb
 - uringmachine.gemspec
@@ -345,6 +353,7 @@ files:
 - vendor/liburing/.github/actions/codespell/stopwords
 - vendor/liburing/.github/pull_request_template.md
 - vendor/liburing/.github/workflows/ci.yml
+- vendor/liburing/.github/workflows/test_build.c
 - vendor/liburing/.gitignore
 - vendor/liburing/CHANGELOG
 - vendor/liburing/CITATION.cff
@@ -409,6 +418,7 @@ files:
 - vendor/liburing/src/include/liburing.h
 - vendor/liburing/src/include/liburing/barrier.h
 - vendor/liburing/src/include/liburing/io_uring.h
+- vendor/liburing/src/include/liburing/io_uring/query.h
 - vendor/liburing/src/include/liburing/sanitize.h
 - vendor/liburing/src/int_flags.h
 - vendor/liburing/src/lib.h
@@ -448,6 +458,7 @@ files:
 - vendor/liburing/test/close-opath.c
 - vendor/liburing/test/cmd-discard.c
 - vendor/liburing/test/config
+- vendor/liburing/test/conn-unreach.c
 - vendor/liburing/test/connect-rep.c
 - vendor/liburing/test/connect.c
 - vendor/liburing/test/coredump.c
@@ -482,6 +493,7 @@ files:
 - vendor/liburing/test/fd-pass.c
 - vendor/liburing/test/fdinfo-sqpoll.c
 - vendor/liburing/test/fdinfo.c
+- vendor/liburing/test/fifo-futex-poll.c
 - vendor/liburing/test/fifo-nonblock-read.c
 - vendor/liburing/test/file-exit-unreg.c
 - vendor/liburing/test/file-register.c
@@ -525,6 +537,8 @@ files:
 - vendor/liburing/test/min-timeout-wait.c
 - vendor/liburing/test/min-timeout.c
 - vendor/liburing/test/mkdir.c
+- vendor/liburing/test/mock_file.c
+- vendor/liburing/test/mock_file.h
 - vendor/liburing/test/msg-ring-fd.c
 - vendor/liburing/test/msg-ring-flags.c
 - vendor/liburing/test/msg-ring-overflow.c
@@ -536,6 +550,8 @@ files:
 - vendor/liburing/test/nolibc.c
 - vendor/liburing/test/nop-all-sizes.c
 - vendor/liburing/test/nop.c
+- vendor/liburing/test/nop32-overflow.c
+- vendor/liburing/test/nop32.c
 - vendor/liburing/test/nvme.h
 - vendor/liburing/test/ooo-file-unreg.c
 - vendor/liburing/test/open-close.c
@@ -546,6 +562,7 @@ files:
 - vendor/liburing/test/pipe-bug.c
 - vendor/liburing/test/pipe-eof.c
 - vendor/liburing/test/pipe-reuse.c
+- vendor/liburing/test/pipe.c
 - vendor/liburing/test/poll-cancel-all.c
 - vendor/liburing/test/poll-cancel-ton.c
 - vendor/liburing/test/poll-cancel.c
@@ -585,6 +602,8 @@ files:
 - vendor/liburing/test/resize-rings.c
 - vendor/liburing/test/ring-leak.c
 - vendor/liburing/test/ring-leak2.c
+- vendor/liburing/test/ring-query.c
+- vendor/liburing/test/ringbuf-loop.c
 - vendor/liburing/test/ringbuf-read.c
 - vendor/liburing/test/ringbuf-status.c
 - vendor/liburing/test/rsrc_tags.c
@@ -617,6 +636,9 @@ files:
 - vendor/liburing/test/sq-poll-kthread.c
 - vendor/liburing/test/sq-poll-share.c
 - vendor/liburing/test/sq-space_left.c
+- vendor/liburing/test/sqe-mixed-bad-wrap.c
+- vendor/liburing/test/sqe-mixed-nop.c
+- vendor/liburing/test/sqe-mixed-uring_cmd.c
 - vendor/liburing/test/sqpoll-disable-exit.c
 - vendor/liburing/test/sqpoll-exec.c
 - vendor/liburing/test/sqpoll-exit-hang.c
@@ -675,7 +697,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.0.dev
+rubygems_version: 4.0.0.dev
 specification_version: 4
 summary: A lean, mean io_uring machine
 test_files: []