uringmachine 0.3 → 0.4

data/vendor/liburing/test/file-verify.c

@@ -90,6 +90,8 @@ static int test_truncate(struct io_uring *ring, const char *fname, int buffered,
 	else
 		fd = open(fname, O_DIRECT | O_RDWR);
 	if (fd < 0) {
+		if (!buffered && errno == EINVAL)
+			return T_EXIT_SKIP;
 		perror("open");
 		return 1;
 	}
@@ -346,6 +348,8 @@ static int test(struct io_uring *ring, const char *fname, int buffered,
 		flags |= O_DIRECT;
 	fd = open(fname, flags);
 	if (fd < 0) {
+		if (errno == EINVAL || errno == EPERM || errno == EACCES)
+			return T_EXIT_SKIP;
 		perror("open");
 		return 1;
 	}
@@ -505,6 +509,8 @@ static int fill_pattern(const char *fname)
 
 	fd = open(fname, O_WRONLY);
 	if (fd < 0) {
+		if (errno == EPERM || errno == EACCES)
+			return T_EXIT_SKIP;
 		perror("open");
 		return 1;
 	}
@@ -557,89 +563,94 @@ int main(int argc, char *argv[])
 		goto err;
 	}
 
-	if (fill_pattern(fname))
+	ret = fill_pattern(fname);
+	if (ret == T_EXIT_SKIP)
+		return T_EXIT_SKIP;
+	else if (ret)
 		goto err;
 
 	ret = test(&ring, fname, 1, 0, 0, 0, 0);
+	if (ret == T_EXIT_SKIP)
+		return T_EXIT_SKIP;
 	if (ret) {
 		fprintf(stderr, "Buffered novec test failed\n");
 		goto err;
 	}
 	ret = test(&ring, fname, 1, 0, 0, 1, 0);
-	if (ret) {
+	if (ret == T_EXIT_FAIL) {
 		fprintf(stderr, "Buffered novec reg test failed\n");
 		goto err;
 	}
 	ret = test(&ring, fname, 1, 0, 0, 0, 1);
-	if (ret) {
+	if (ret == T_EXIT_FAIL) {
 		fprintf(stderr, "Buffered novec provide test failed\n");
 		goto err;
 	}
 	ret = test(&ring, fname, 1, 1, 0, 0, 0);
-	if (ret) {
+	if (ret == T_EXIT_FAIL) {
 		fprintf(stderr, "Buffered vec test failed\n");
 		goto err;
 	}
 	ret = test(&ring, fname, 1, 1, 1, 0, 0);
-	if (ret) {
+	if (ret == T_EXIT_FAIL) {
 		fprintf(stderr, "Buffered small vec test failed\n");
 		goto err;
 	}
 
 	ret = test(&ring, fname, 0, 0, 0, 0, 0);
-	if (ret) {
+	if (ret == T_EXIT_FAIL) {
 		fprintf(stderr, "O_DIRECT novec test failed\n");
 		goto err;
 	}
 	ret = test(&ring, fname, 0, 0, 0, 1, 0);
-	if (ret) {
+	if (ret == T_EXIT_FAIL) {
 		fprintf(stderr, "O_DIRECT novec reg test failed\n");
 		goto err;
 	}
 	ret = test(&ring, fname, 0, 0, 0, 0, 1);
-	if (ret) {
+	if (ret == T_EXIT_FAIL) {
 		fprintf(stderr, "O_DIRECT novec provide test failed\n");
 		goto err;
 	}
 	ret = test(&ring, fname, 0, 1, 0, 0, 0);
-	if (ret) {
+	if (ret == T_EXIT_FAIL) {
 		fprintf(stderr, "O_DIRECT vec test failed\n");
 		goto err;
 	}
 	ret = test(&ring, fname, 0, 1, 1, 0, 0);
-	if (ret) {
+	if (ret == T_EXIT_FAIL) {
 		fprintf(stderr, "O_DIRECT small vec test failed\n");
 		goto err;
 	}
 
 	ret = test_truncate(&ring, fname, 1, 0, 0);
-	if (ret) {
+	if (ret == T_EXIT_FAIL) {
 		fprintf(stderr, "Buffered end truncate read failed\n");
 		goto err;
 	}
 	ret = test_truncate(&ring, fname, 1, 1, 0);
-	if (ret) {
+	if (ret == T_EXIT_FAIL) {
 		fprintf(stderr, "Buffered end truncate vec read failed\n");
 		goto err;
 	}
 	ret = test_truncate(&ring, fname, 1, 0, 1);
-	if (ret) {
+	if (ret == T_EXIT_FAIL) {
 		fprintf(stderr, "Buffered end truncate pbuf read failed\n");
 		goto err;
 	}
 
 	ret = test_truncate(&ring, fname, 0, 0, 0);
-	if (ret) {
+	if (ret == T_EXIT_FAIL) {
 		fprintf(stderr, "O_DIRECT end truncate read failed\n");
 		goto err;
 	}
 	ret = test_truncate(&ring, fname, 0, 1, 0);
-	if (ret) {
+	if (ret == T_EXIT_FAIL) {
 		fprintf(stderr, "O_DIRECT end truncate vec read failed\n");
 		goto err;
 	}
 	ret = test_truncate(&ring, fname, 0, 0, 1);
-	if (ret) {
+	if (ret == T_EXIT_FAIL) {
 		fprintf(stderr, "O_DIRECT end truncate pbuf read failed\n");
 		goto err;
 	}

data/vendor/liburing/test/files-exit-hang-timeout.c

@@ -43,13 +43,12 @@ static void add_accept(struct io_uring *ring, int fd)
 
 	sqe = io_uring_get_sqe(ring);
 	io_uring_prep_accept(sqe, fd, 0, 0, SOCK_NONBLOCK | SOCK_CLOEXEC);
-	sqe->flags |= IOSQE_IO_LINK;
 }
 
 static int setup_io_uring(void)
 {
 	int ret;
-       
+
 	ret = io_uring_queue_init(16, &ring, 0);
 	if (ret) {
 		fprintf(stderr, "Unable to setup io_uring: %s\n", strerror(-ret));

data/vendor/liburing/test/fixed-buf-iter.c

@@ -63,7 +63,7 @@ static int test(struct io_uring *ring)
 		return 1;
 	}
 
-	if (cqe->res < 0) { 
+	if (cqe->res < 0) {
 		fprintf(stderr, "Error in async operation: %s\n", strerror(-cqe->res));
 		return 1;
 	}
@@ -87,6 +87,8 @@ static int test(struct io_uring *ring)
 		return 1;
 	}
 	io_uring_cqe_seen(ring, cqe);
+	for (i = 0; i < BUFFERS; i++)
+		free(iov[i].iov_base);
 	return 0;
 }
 

data/vendor/liburing/test/fixed-hugepage.c

@@ -246,7 +246,8 @@ static int register_submit(struct io_uring *ring, struct iovec *iov,
 
 	ret = io_uring_register_buffers(ring, iov, nr_bufs);
 	if (ret) {
-		fprintf(stderr, "Error registering buffers: %s\n", strerror(-ret));
+		if (ret != -ENOMEM)
+			fprintf(stderr, "Error registering buffers: %s\n", strerror(-ret));
 		return ret;
 	}
 
@@ -282,6 +283,8 @@ static int test_one_hugepage(struct io_uring *ring, int fd_in, int fd_out)
 
 	ret = register_submit(ring, iov, NR_BUFS, fd_in, fd_out);
 	unmap(iov, NR_BUFS, 0);
+	if (ret == -ENOMEM)
+		return T_EXIT_SKIP;
 	return ret ? T_EXIT_FAIL : T_EXIT_PASS;
 }
 
@@ -296,6 +299,8 @@ static int test_multi_hugepages(struct io_uring *ring, int fd_in, int fd_out)
 
 	ret = register_submit(ring, iov, NR_BUFS, fd_in, fd_out);
 	unmap(iov, NR_BUFS, 0);
+	if (ret == -ENOMEM)
+		return T_EXIT_SKIP;
 	return ret ? T_EXIT_FAIL : T_EXIT_PASS;
 }
 
@@ -311,6 +316,8 @@ static int test_unaligned_hugepage(struct io_uring *ring, int fd_in, int fd_out)
 
 	ret = register_submit(ring, iov, NR_BUFS, fd_in, fd_out);
 	unmap(iov, NR_BUFS, offset);
+	if (ret == -ENOMEM)
+		return T_EXIT_SKIP;
 	return ret ? T_EXIT_FAIL : T_EXIT_PASS;
 }
 
@@ -326,6 +333,8 @@ static int test_multi_unaligned_mthps(struct io_uring *ring, int fd_in, int fd_o
 
 	ret = register_submit(ring, iov, NR_BUFS, fd_in, fd_out);
 	free_bufs(iov, NR_BUFS, offset);
+	if (ret == -ENOMEM)
+		return T_EXIT_SKIP;
 	return ret ? T_EXIT_FAIL : T_EXIT_PASS;
 }
 
@@ -341,6 +350,8 @@ static int test_page_mixture(struct io_uring *ring, int fd_in, int fd_out, int h
 
 	ret = register_submit(ring, iov, NR_BUFS, fd_in, fd_out);
 	unmap(iov, NR_BUFS, 0);
+	if (ret == -ENOMEM)
+		return T_EXIT_SKIP;
 	return ret ? T_EXIT_FAIL : T_EXIT_PASS;
 }
 

data/vendor/liburing/test/fsnotify.c

@@ -90,6 +90,7 @@ int main(int argc, char *argv[])
 		wait(&wstat);
 		if (!WEXITSTATUS(wstat))
 			err = T_EXIT_PASS;
+		free(buf);
 	} else {
 		struct fanotify_event_metadata m;
 		int fret;

data/vendor/liburing/test/futex.c

@@ -120,6 +120,7 @@ static int __test(struct io_uring *ring, int vectored, int async,
 
 		if (cqe->res == -EINVAL || cqe->res == -EOPNOTSUPP) {
 			no_futex = 1;
+			free(futex);
 			return 0;
 		}
 		io_uring_cqe_seen(ring, cqe);
@@ -134,6 +135,7 @@ static int __test(struct io_uring *ring, int vectored, int async,
 	for (i = 0; i < nfutex; i++)
 		pthread_join(threads[i], &tret);
 
+	free(futex);
 	return 0;
 }
 
@@ -145,7 +147,7 @@ static int test(int flags, int vectored)
 	ret = io_uring_queue_init(8, &ring, flags);
 	if (ret)
 		return ret;
-	
+
 	for (i = 0; i < LOOPS; i++) {
 		int async_cancel = (!i % 2);
 		int async_wait = !(i % 3);
@@ -166,7 +168,8 @@ static int test_order(int vectored, int async)
 {
 	struct io_uring_sqe *sqe;
 	struct io_uring_cqe *cqe;
-	struct futex_waitv fw;
+	struct futex_waitv fw = { };
+	struct io_uring_sync_cancel_reg reg = { };
 	struct io_uring ring;
 	unsigned int *futex;
 	int ret, i;
@@ -178,10 +181,8 @@ static int test_order(int vectored, int async)
 	futex = malloc(sizeof(*futex));
 	*futex = 0;
 
-	fw.val = 0;
 	fw.uaddr = (unsigned long) futex;
 	fw.flags = FUTEX2_SIZE_U32;
-	fw.__reserved = 0;
 
 	/*
 	 * Submit two futex waits
@@ -241,7 +242,15 @@ static int test_order(int vectored, int async)
 		return 1;
 	}
 
+	reg.addr = 2;
+	ret = io_uring_register_sync_cancel(&ring, &reg);
+	if (ret != 1) {
+		fprintf(stderr, "Failed to cancel pending futex wait: %d\n", ret);
+		return 1;
+	}
+
 	io_uring_queue_exit(&ring);
+	free(futex);
 	return 0;
 }
 
@@ -322,6 +331,7 @@ static int test_multi_wake(int vectored)
 	}
 
 	io_uring_queue_exit(&ring);
+	free(futex);
 	return 0;
 }
 
@@ -378,6 +388,7 @@ static int test_wake_zero(void)
 	}
 
 	io_uring_queue_exit(&ring);
+	free(futex);
 	return 0;
 }
 
@@ -459,6 +470,7 @@ static int test_invalid(void)
 	io_uring_cqe_seen(&ring, cqe);
 
 	io_uring_queue_exit(&ring);
+	free(futex);
 	return 0;
 }
 

data/vendor/liburing/test/helpers.c

@@ -316,3 +316,50 @@ void t_error(int status, int errnum, const char *format, ...)
 	va_end(args);
     	exit(status);
 }
+
+unsigned long long mtime_since(const struct timeval *s, const struct timeval *e)
+{
+	long long sec, usec;
+
+	sec = e->tv_sec - s->tv_sec;
+	usec = (e->tv_usec - s->tv_usec);
+	if (sec > 0 && usec < 0) {
+		sec--;
+		usec += 1000000;
+	}
+
+	sec *= 1000;
+	usec /= 1000;
+	return sec + usec;
+}
+
+unsigned long long mtime_since_now(struct timeval *tv)
+{
+	struct timeval end;
+
+	gettimeofday(&end, NULL);
+	return mtime_since(tv, &end);
+}
+
+unsigned long long utime_since(const struct timeval *s, const struct timeval *e)
+{
+	long long sec, usec;
+
+	sec = e->tv_sec - s->tv_sec;
+	usec = (e->tv_usec - s->tv_usec);
+	if (sec > 0 && usec < 0) {
+		sec--;
+		usec += 1000000;
+	}
+
+	sec *= 1000000;
+	return sec + usec;
+}
+
+unsigned long long utime_since_now(struct timeval *tv)
+{
+	struct timeval end;
+
+	gettimeofday(&end, NULL);
+	return utime_since(tv, &end);
+}

data/vendor/liburing/test/helpers.h

@@ -12,6 +12,7 @@ extern "C" {
 #include "liburing.h"
 #include "../src/setup.h"
 #include <arpa/inet.h>
+#include <sys/time.h>
 
 enum t_setup_ret {
 	T_SETUP_OK	= 0,
@@ -101,6 +102,11 @@ static inline int t_io_uring_init_sqarray(unsigned entries, struct io_uring *rin
 
 void t_error(int status, int errnum, const char *format, ...);
 
+unsigned long long mtime_since(const struct timeval *s, const struct timeval *e);
+unsigned long long mtime_since_now(struct timeval *tv);
+unsigned long long utime_since(const struct timeval *s, const struct timeval *e);
+unsigned long long utime_since_now(struct timeval *tv);
+
 #ifdef __cplusplus
 }
 #endif

data/vendor/liburing/test/init-mem.c

@@ -13,7 +13,6 @@
 #include <netinet/udp.h>
 #include <arpa/inet.h>
 #include <net/if.h>
-#include <error.h>
 
 #include "liburing.h"
 #include "helpers.h"
@@ -68,6 +67,7 @@ static int setup_ctx(struct ctx *ctx, struct q_entries *q)
 static void clean_ctx(struct ctx *ctx)
 {
 	io_uring_queue_exit(&ctx->ring);
+	free(ctx->mem);
 }
 
 static int check_red(struct ctx *ctx, unsigned long i)
@@ -94,10 +94,12 @@ static int test(struct q_entries *q)
 	int j, ret, batch;
 
 	ret = setup_ctx(&ctx, q);
-	if (ret == T_EXIT_SKIP)
+	if (ret == T_EXIT_SKIP) {
+		clean_ctx(&ctx);
 		return T_EXIT_SKIP;
-	else if (ret != T_EXIT_PASS)
+	} else if (ret != T_EXIT_PASS) {
 		return ret;
+	}
 
 	batch = 64;
 	if (batch > q->sqes)

data/vendor/liburing/test/io-cancel.c

@@ -22,30 +22,6 @@
 
 static struct iovec *vecs;
 
-static unsigned long long utime_since(const struct timeval *s,
-				      const struct timeval *e)
-{
-	long long sec, usec;
-
-	sec = e->tv_sec - s->tv_sec;
-	usec = (e->tv_usec - s->tv_usec);
-	if (sec > 0 && usec < 0) {
-		sec--;
-		usec += 1000000;
-	}
-
-	sec *= 1000000;
-	return sec + usec;
-}
-
-static unsigned long long utime_since_now(struct timeval *tv)
-{
-	struct timeval end;
-
-	gettimeofday(&end, NULL);
-	return utime_since(tv, &end);
-}
-
 static int start_io(struct io_uring *ring, int fd, int do_write)
 {
 	struct io_uring_sqe *sqe;

data/vendor/liburing/test/io_uring_passthrough.c

@@ -95,6 +95,8 @@ static int __test_io(const char *file, struct io_uring *ring, int tc, int read,
 
 	fd = open(file, open_flags);
 	if (fd < 0) {
+		if (errno == EACCES || errno == EPERM)
+			return T_EXIT_SKIP;
 		perror("file open");
 		goto err;
 	}

data/vendor/liburing/test/io_uring_register.c

@@ -21,6 +21,7 @@
 #include <linux/mman.h>
 #include <sys/time.h>
 #include <sys/resource.h>
+#include <sys/vfs.h>
 #include <limits.h>
 
 #include "helpers.h"
@@ -76,8 +77,13 @@ static int new_io_uring(int entries, struct io_uring_params *p)
 
 #define MAXFDS (UINT_MAX * sizeof(int))
 
+#define OFS_MAGIC	0x794c7630
+#define TMPFS_MAGIC	0x01021994
+#define RAMFS_MAGIC	0x858458f6
+
 static void *map_filebacked(size_t size)
 {
+	struct statfs buf;
 	int fd, ret;
 	void *addr;
 	char template[32] = "io_uring_register-test-XXXXXXXX";
@@ -87,8 +93,21 @@ static void *map_filebacked(size_t size)
 		perror("mkstemp");
 		return NULL;
 	}
+	if (statfs(template, &buf) < 0) {
+		perror("statfs");
+		unlink(template);
+		close(fd);
+		return NULL;
+	}
 	unlink(template);
 
+	/* virtual file systems may not present as file mapped */
+	if (buf.f_type == OFS_MAGIC || buf.f_type == RAMFS_MAGIC ||
+	    buf.f_type == TMPFS_MAGIC) {
+		close(fd);
+		return NULL;
+	}
+
 	ret = ftruncate(fd, size);
 	if (ret < 0) {
 		perror("ftruncate");
@@ -365,12 +384,12 @@ static int test_iovec_size(int fd)
 
 	/* file-backed buffers -- not supported */
 	buf = map_filebacked(2*1024*1024);
-	if (!buf)
-		status = 1;
-	iov.iov_base = buf;
-	iov.iov_len = 2*1024*1024;
-	status |= expect_fail(fd, IORING_REGISTER_BUFFERS, &iov, 1, -EFAULT, -EOPNOTSUPP);
-	munmap(buf, 2*1024*1024);
+	if (buf) {
+		iov.iov_base = buf;
+		iov.iov_len = 2*1024*1024;
+		status |= expect_fail(fd, IORING_REGISTER_BUFFERS, &iov, 1, -EFAULT, -EOPNOTSUPP);
+		munmap(buf, 2*1024*1024);
+	}
 
 	/* bump up against the soft limit and make sure we get EFAULT
 	 * or whatever we're supposed to get.  NOTE: this requires

data/vendor/liburing/test/iopoll-leak.c

@@ -26,6 +26,8 @@ static int do_iopoll(const char *fname)
 
 	fd = open(fname, O_RDONLY | O_DIRECT);
 	if (fd < 0) {
+		if (errno == EINVAL || errno == EPERM || errno == EACCES)
+			return T_EXIT_SKIP;
 		perror("open");
 		return T_EXIT_SKIP;
 	}
@@ -39,6 +41,8 @@ static int do_iopoll(const char *fname)
 	io_uring_submit(&ring);
 
 	close(fd);
+	free(iov->iov_base);
+	free(iov);
 	return T_EXIT_PASS;
 }
 

data/vendor/liburing/test/iopoll-overflow.c

@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
 
 	fd = open(fname, O_RDONLY | O_DIRECT);
 	if (fd < 0) {
-		if (errno == EINVAL) {
+		if (errno == EINVAL || errno == EACCES || errno == EPERM) {
 			if (fname != argv[1])
 				unlink(fname);
 			return T_EXIT_SKIP;

data/vendor/liburing/test/iopoll.c

@@ -87,7 +87,7 @@ static int __test_io(const char *file, struct io_uring *ring, int write, int sqt
 	}
 	fd = open(file, open_flags);
 	if (fd < 0) {
-		if (errno == EINVAL)
+		if (errno == EINVAL || errno == EPERM || errno == EACCES)
 			return 0;
 		perror("file open");
 		goto err;
@@ -230,7 +230,7 @@ static int test_io_uring_cqe_peek(const char *file)
 
 	fd = open(file, O_RDONLY | O_DIRECT);
 	if (fd < 0) {
-		if (errno == EINVAL) {
+		if (errno == EINVAL || errno == EPERM || errno == EACCES) {
 			io_uring_queue_exit(&ring);
 			return T_EXIT_SKIP;
 		}
@@ -302,7 +302,7 @@ static int test_io_uring_submit_enters(const char *file)
 	open_flags = O_WRONLY | O_DIRECT;
 	fd = open(file, open_flags);
 	if (fd < 0) {
-		if (errno == EINVAL)
+		if (errno == EINVAL || errno == EPERM || errno == EACCES)
 			return T_EXIT_SKIP;
 		perror("file open");
 		goto err;