uringmachine 0.3 → 0.4

data/vendor/liburing/test/runtests.sh

@@ -114,9 +114,12 @@ run_test()
 	elif [ "$status" -eq 77 ]; then
 		echo "Skipped"
 		SKIPPED+=("<$test_string>")
-	elif [ "$status" -ne 0 ]; then
+	elif [[ $test_string != xfail* ]] && [ "$status" -ne 0 ]; then
 		echo "Test $test_name failed with ret $status"
 		FAILED+=("<$test_string>")
+	elif [[ $test_string == xfail* ]] && [ "$status" -ne 1 ]; then
+		echo "Test $test_name expected fail status 1 but returned $status"
+		FAILED+=("<$test_string>")
 	elif ! _check_dmesg "$dmesg_marker" "$test_name"; then
 		echo "Test $test_name failed dmesg check"
 		FAILED+=("<$test_string>")
@@ -153,10 +156,22 @@ for tst in "${TESTS[@]}"; do
 	fi
 done
 
+if [ "$DO_KMSG" -eq "1" ]; then
+	for dmesg_file in *.dmesg; do
+		if [ -f "$dmesg_file" ]; then
+			echo "Found dmesg file $dmesg_file, outputting:"
+			cat "$dmesg_file"
+		fi
+	done
+fi
+
 if [ "${#TIMED_OUT[*]}" -ne 0 ]; then
 	echo "Tests timed out (${#TIMED_OUT[*]}): ${TIMED_OUT[*]}"
 fi
 
+KVER=$(uname -rv)
+echo "Test run complete, kernel: $KVER"
+
 if [ "${#FAILED[*]}" -ne 0 ]; then
 	echo "Tests failed (${#FAILED[*]}): ${FAILED[*]}"
 	exit 1

data/vendor/liburing/test/send-zerocopy.c

@@ -739,6 +739,59 @@ static int test_async_addr(struct io_uring *ring)
 	return 0;
 }
 
+static int test_sendzc_report(struct io_uring *ring)
+{
+	struct io_uring_sqe *sqe;
+	struct io_uring_cqe *cqe;
+	struct sockaddr_storage addr;
+	int sock_tx, sock_rx;
+	int ret;
+
+	ret = create_socketpair_ip(&addr, &sock_tx, &sock_rx, true, true, false, true);
+	if (ret) {
+		fprintf(stderr, "sock prep failed %d\n", ret);
+		return 1;
+	}
+
+	sqe = io_uring_get_sqe(ring);
+	io_uring_prep_send_zc(sqe, sock_tx, tx_buffer, 1, 0,
+				IORING_SEND_ZC_REPORT_USAGE);
+	ret = io_uring_submit(ring);
+	if (ret != 1) {
+		fprintf(stderr, "io_uring_submit failed %i\n", ret);
+		return 1;
+	}
+	ret = io_uring_wait_cqe(ring, &cqe);
+	if (ret) {
+		fprintf(stderr, "io_uring_wait_cqe failed %i\n", ret);
+		return 1;
+	}
+	if (cqe->res != 1 && cqe->res != -EINVAL) {
+		fprintf(stderr, "sendzc report failed %u\n", cqe->res);
+		return 1;
+	}
+	if (!(cqe->flags & IORING_CQE_F_MORE)) {
+		fprintf(stderr, "expected notification %i\n", cqe->res);
+		return 1;
+	}
+	io_uring_cqe_seen(ring, cqe);
+
+	ret = io_uring_wait_cqe(ring, &cqe);
+	if (ret) {
+		fprintf(stderr, "io_uring_wait_cqe failed %i\n", ret);
+		return 1;
+	}
+	if (cqe->flags & IORING_CQE_F_MORE) {
+		fprintf(stderr, "F_MORE after notification\n");
+		return 1;
+	}
+	io_uring_cqe_seen(ring, cqe);
+
+	close(sock_tx);
+	close(sock_rx);
+	return 0;
+}
+
 /* see also send_recv.c:test_invalid */
 static int test_invalid_zc(int fds[2])
 {
@@ -833,6 +886,12 @@ static int run_basic_tests(void)
 			return T_EXIT_FAIL;
 		}
 
+		ret = test_sendzc_report(&ring);
+		if (ret) {
+			fprintf(stderr, "test_sendzc_report() failed\n");
+			return T_EXIT_FAIL;
+		}
+
 		io_uring_queue_exit(&ring);
 	}
 

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

@@ -71,5 +71,6 @@ int main(int argc, char *argv[])
 	}
 
 	io_uring_cqe_seen(&ring, cqe);
+	free(vec.iov_base);
 	return 0;
 }

data/vendor/liburing/test/socket.c

@@ -365,6 +365,43 @@ static int test(int use_sqthread, int regfiles, int socket_direct, int alloc)
 	return (intptr_t)retval;
 }
 
+static int test_bad_socket(void)
+{
+	struct io_uring ring;
+	struct io_uring_cqe *cqe;
+	struct io_uring_sqe *sqe;
+	int ret;
+
+	ret = io_uring_queue_init(1, &ring, 0);
+	if (ret) {
+		fprintf(stderr, "queue init failed: %d\n", ret);
+		return 1;
+	}
+
+	sqe = io_uring_get_sqe(&ring);
+	io_uring_prep_socket(sqe, -1, SOCK_DGRAM, 0, 0);
+	ret = io_uring_submit(&ring);
+	if (ret != 1) {
+		fprintf(stderr, "socket submit: %d\n", ret);
+		goto err;
+	}
+	ret = io_uring_wait_cqe(&ring, &cqe);
+	if (ret) {
+		fprintf(stderr, "wait_cqe: %d\n", ret);
+		goto err;
+	}
+	if (cqe->res != -EAFNOSUPPORT) {
+		fprintf(stderr, "socket res: %d\n", cqe->res);
+		goto err;
+	}
+	io_uring_cqe_seen(&ring, cqe);
+	io_uring_queue_exit(&ring);
+	return 0;
+err:
+	io_uring_queue_exit(&ring);
+	return 1;
+}
+
 int main(int argc, char *argv[])
 {
 	int ret;
@@ -404,5 +441,11 @@ int main(int argc, char *argv[])
 		return ret;
 	}
 
+	ret = test_bad_socket();
+	if (ret) {
+		fprintf(stderr, "test bad socket failed\n");
+		return 1;
+	}
+
 	return 0;
 }

data/vendor/liburing/test/splice.c

@@ -191,7 +191,7 @@ static int do_splice(struct io_uring *ring,
 			    IORING_OP_SPLICE);
 }
 
-static int do_tee(struct io_uring *ring, int fd_in, int fd_out, 
+static int do_tee(struct io_uring *ring, int fd_in, int fd_out,
 		  unsigned int len)
 {
 	return do_splice_op(ring, fd_in, 0, fd_out, 0, len, IORING_OP_TEE);
@@ -504,6 +504,8 @@ int main(int argc, char *argv[])
 	splice_flags = SPLICE_F_FD_IN_FIXED;
 	sqe_flags = IOSQE_FIXED_FILE;
 	ret = test_splice(&ring, &ctx);
+	free(ctx.buf_in);
+	free(ctx.buf_out);
 	if (ret) {
 		fprintf(stderr, "registered fds splice tests failed\n");
 		return ret;

data/vendor/liburing/test/sq-poll-dup.c

@@ -177,7 +177,7 @@ int main(int argc, char *argv[])
 		if (fname != argv[1])
 			unlink(fname);
 
-		if (__e == EINVAL)
+		if (__e == EINVAL || __e == EPERM || __e == EACCES)
 			return T_EXIT_SKIP;
 		perror("open");
 		return -1;

data/vendor/liburing/test/sq-poll-share.c

@@ -90,6 +90,8 @@ int main(int argc, char *argv[])
 
 	fd = open(fname, O_RDONLY | O_DIRECT);
 	if (fd < 0) {
+		if (errno == EPERM || errno == EACCES || errno == EINVAL)
+			return T_EXIT_SKIP;
 		perror("open");
 		return -1;
 	}

data/vendor/liburing/test/sqpoll-disable-exit.c

@@ -22,8 +22,10 @@
 #include <unistd.h>
 
 #include "liburing.h"
+#include "helpers.h"
 #include "../src/syscall.h"
 
+#ifndef CONFIG_USE_SANITIZER
 static void sleep_ms(uint64_t ms)
 {
   usleep(ms * 1000);
@@ -194,3 +196,9 @@ int main(void)
   loop();
   return 0;
 }
+#else
+int main(int argc, char *argv[])
+{
+	return T_EXIT_SKIP;
+}
+#endif

data/vendor/liburing/test/sqpoll-exit-hang.c

@@ -10,31 +10,7 @@
 #include <sys/time.h>
 #include <poll.h>
 #include "liburing.h"
-
-static 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;
-}
-
-static unsigned long long mtime_since_now(struct timeval *tv)
-{
-	struct timeval end;
-
-	gettimeofday(&end, NULL);
-	return mtime_since(tv, &end);
-}
+#include "helpers.h"
 
 int main(int argc, char *argv[])
 {

data/vendor/liburing/test/sqpoll-sleep.c

@@ -9,31 +9,7 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include "liburing.h"
-
-static 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;
-}
-
-static unsigned long long mtime_since_now(struct timeval *tv)
-{
-	struct timeval end;
-
-	gettimeofday(&end, NULL);
-	return mtime_since(tv, &end);
-}
+#include "helpers.h"
 
 int main(int argc, char *argv[])
 {

data/vendor/liburing/test/statx.c

@@ -36,6 +36,81 @@ static int statx_syscall_supported(void)
 	return errno == ENOSYS ? 0 : -1;
 }
 
+static int test_statx_invalid_buf(struct io_uring *ring, const char *path)
+{
+	struct io_uring_cqe *cqe;
+	struct io_uring_sqe *sqe;
+	struct statx *x = (struct statx *) (uintptr_t) 0x1234;
+	int ret;
+
+	sqe = io_uring_get_sqe(ring);
+	if (!sqe) {
+		fprintf(stderr, "get sqe failed\n");
+		goto err;
+	}
+	io_uring_prep_statx(sqe, -1, path, 0, STATX_ALL, x);
+
+	ret = io_uring_submit(ring);
+	if (ret <= 0) {
+		fprintf(stderr, "sqe submit failed: %d\n", ret);
+		goto err;
+	}
+
+	ret = io_uring_wait_cqe(ring, &cqe);
+	if (ret < 0) {
+		fprintf(stderr, "wait completion %d\n", ret);
+		goto err;
+	}
+	ret = cqe->res;
+	io_uring_cqe_seen(ring, cqe);
+	if (ret != -EFAULT) {
+		fprintf(stderr, "Invalid address didn't fail\n");
+		goto err;
+	}
+
+	return 0;
+err:
+	return -1;
+}
+
+static int test_statx_invalid_path(struct io_uring *ring)
+{
+	const char *path = (const char *) (uintptr_t) 0x1234;
+	struct io_uring_cqe *cqe;
+	struct io_uring_sqe *sqe;
+	struct statx x1 = { };
+	int ret;
+
+	sqe = io_uring_get_sqe(ring);
+	if (!sqe) {
+		fprintf(stderr, "get sqe failed\n");
+		goto err;
+	}
+	io_uring_prep_statx(sqe, -1, path, 0, STATX_ALL, &x1);
+
+	ret = io_uring_submit(ring);
+	if (ret <= 0) {
+		fprintf(stderr, "sqe submit failed: %d\n", ret);
+		goto err;
+	}
+
+	ret = io_uring_wait_cqe(ring, &cqe);
+	if (ret < 0) {
+		fprintf(stderr, "wait completion %d\n", ret);
+		goto err;
+	}
+	ret = cqe->res;
+	io_uring_cqe_seen(ring, cqe);
+	if (ret != -EFAULT) {
+		fprintf(stderr, "Invalid address didn't fail\n");
+		goto err;
+	}
+
+	return 0;
+err:
+	return -1;
+}
+
 static int test_statx(struct io_uring *ring, const char *path)
 {
 	struct io_uring_cqe *cqe;
@@ -86,6 +161,8 @@ static int test_statx_fd(struct io_uring *ring, const char *path)
 
 	fd = open(path, O_RDONLY);
 	if (fd < 0) {
+		if (errno == EPERM || errno == EACCES)
+			return 0;
 		perror("open");
 		return 1;
 	}
@@ -156,6 +233,18 @@ int main(int argc, char *argv[])
 		goto err;
 	}
 
+	ret = test_statx_invalid_path(&ring);
+	if (ret) {
+		fprintf(stderr, "test_statx_invalid_path failed: %d\n", ret);
+		goto err;
+	}
+
+	ret = test_statx_invalid_buf(&ring, fname);
+	if (ret) {
+		fprintf(stderr, "test_statx_invalid_buf failed: %d\n", ret);
+		goto err;
+	}
+
 	ret = test_statx_fd(&ring, fname);
 	if (ret) {
 		fprintf(stderr, "test_statx_fd failed: %d\n", ret);

data/vendor/liburing/test/stdout.c

@@ -89,6 +89,7 @@ static int test_pipe_io_fixed(struct io_uring *ring)
 		io_uring_cqe_seen(ring, cqe);
 	}
 	io_uring_unregister_buffers(ring);
+	free(vecs[0].iov_base);
 	return 0;
 err:
 	return 1;
@@ -143,6 +144,7 @@ static int test_stdout_io_fixed(struct io_uring *ring)
 	}
 	io_uring_cqe_seen(ring, cqe);
 	io_uring_unregister_buffers(ring);
+	free(vecs.iov_base);
 	return 0;
 err:
 	return 1;

data/vendor/liburing/test/submit-and-wait.c

@@ -13,33 +13,9 @@
 #include <sys/time.h>
 
 #include "liburing.h"
+#include "helpers.h"
 #include "test.h"
 
-static 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;
-}
-
-static unsigned long long mtime_since_now(struct timeval *tv)
-{
-	struct timeval end;
-
-	gettimeofday(&end, NULL);
-	return mtime_since(tv, &end);
-}
-
 static int test(struct io_uring *ring)
 {
 	struct io_uring_cqe *cqe;

data/vendor/liburing/test/submit-reuse.c

@@ -102,31 +102,6 @@ static int wait_nr(int nr)
 	return 0;
 }
 
-static 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;
-}
-
-static unsigned long long mtime_since_now(struct timeval *tv)
-{
-	struct timeval end;
-
-	gettimeofday(&end, NULL);
-	return mtime_since(tv, &end);
-}
-
 static int test_reuse(int argc, char *argv[], int split, int async)
 {
 	struct thread_data data;
@@ -162,6 +137,8 @@ static int test_reuse(int argc, char *argv[], int split, int async)
 	if (do_unlink)
 		unlink(fname1);
 	if (fd1 < 0) {
+		if (errno == EPERM || errno == EACCES)
+			return T_EXIT_SKIP;
 		perror("open fname1");
 		goto err;
 	}
@@ -211,7 +188,6 @@ static int test_reuse(int argc, char *argv[], int split, int async)
 err:
 	io_uring_queue_exit(&ring);
 	return 1;
-
 }
 
 int main(int argc, char *argv[])
@@ -225,6 +201,8 @@ int main(int argc, char *argv[])
 		async = (i & 2) != 0;
 
 		ret = test_reuse(argc, argv, split, async);
+		if (ret == T_EXIT_SKIP)
+			continue;
 		if (ret) {
 			fprintf(stderr, "test_reuse %d %d failed\n", split, async);
 			return ret;

data/vendor/liburing/test/symlink.c

@@ -11,7 +11,6 @@
 
 #include "liburing.h"
 
-
 static int do_symlinkat(struct io_uring *ring, const char *oldname, const char *newname)
 {
 	int ret;
@@ -105,6 +104,18 @@ int main(int argc, char *argv[])
 		goto err1;
 	}
 
+	ret = do_symlinkat(&ring, target, (const char *) (uintptr_t) 0x1234);
+	if (ret != -EFAULT) {
+		fprintf(stderr, "test_symlinkat bad target failed: %d\n", ret);
+		goto err1;
+	}
+
+	ret = do_symlinkat(&ring, (const char *) (uintptr_t) 0x1234, target);
+	if (ret != -EFAULT) {
+		fprintf(stderr, "test_symlinkat bad source failed: %d\n", ret);
+		goto err1;
+	}
+
 out:
 	unlinkat(AT_FDCWD, linkname, 0);
 	io_uring_queue_exit(&ring);

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

@@ -15,7 +15,7 @@
 
 static int no_sync_cancel;
 
-static int test_sync_cancel_timeout(struct io_uring *ring, int async)
+static int test_sync_cancel_timeout(struct io_uring *ring, int async, int by_op)
 {
 	struct io_uring_sync_cancel_reg reg = { };
 	struct io_uring_sqe *sqe;
@@ -43,7 +43,8 @@ static int test_sync_cancel_timeout(struct io_uring *ring, int async)
 
 	usleep(10000);
 
-	reg.addr = 0x89;
+	reg.flags = IORING_ASYNC_CANCEL_OP;
+	reg.opcode = IORING_OP_READ;
 	reg.timeout.tv_nsec = 1;
 	ret = io_uring_register_sync_cancel(ring, &reg);
 	if (async) {
@@ -80,7 +81,7 @@ static int test_sync_cancel_timeout(struct io_uring *ring, int async)
 }
 
 static int test_sync_cancel(struct io_uring *ring, int async, int nr_all,
-			    int use_fd)
+			    int use_fd, int by_op)
 {
 	struct io_uring_sync_cancel_reg reg = { };
 	struct io_uring_sqe *sqe;
@@ -168,7 +169,7 @@ int main(int argc, char *argv[])
 	else if (ret != T_SETUP_OK)
 		return ret;
 
-	ret = test_sync_cancel(&ring, 0, 0, 0);
+	ret = test_sync_cancel(&ring, 0, 0, 0, 0);
 	if (ret) {
 		fprintf(stderr, "test_sync_cancel 0 0 0 failed\n");
 		return T_EXIT_FAIL;
@@ -176,56 +177,82 @@ int main(int argc, char *argv[])
 	if (no_sync_cancel)
 		return T_EXIT_SKIP;
 
-	ret = test_sync_cancel(&ring, 1, 0, 0);
+	ret = test_sync_cancel(&ring, 0, 0, 0, 1);
 	if (ret) {
-		fprintf(stderr, "test_sync_cancel 1 0 0 failed\n");
+		fprintf(stderr, "test_sync_cancel 0 0 1 failed\n");
 		return T_EXIT_FAIL;
 	}
 
-	ret = test_sync_cancel(&ring, 0, 1, 0);
+	ret = test_sync_cancel(&ring, 1, 0, 0, 0);
 	if (ret) {
-		fprintf(stderr, "test_sync_cancel 0 1 0 failed\n");
+		fprintf(stderr, "test_sync_cancel 1 0 0 0 failed\n");
 		return T_EXIT_FAIL;
 	}
 
-	ret = test_sync_cancel(&ring, 1, 1, 0);
+	ret = test_sync_cancel(&ring, 1, 0, 0, 1);
 	if (ret) {
-		fprintf(stderr, "test_sync_cancel 1 1 0 failed\n");
+		fprintf(stderr, "test_sync_cancel 1 0 0 1 failed\n");
 		return T_EXIT_FAIL;
 	}
 
-	ret = test_sync_cancel(&ring, 0, 0, 1);
+
+	ret = test_sync_cancel(&ring, 0, 1, 0, 0);
 	if (ret) {
-		fprintf(stderr, "test_sync_cancel 0 0 1 failed\n");
+		fprintf(stderr, "test_sync_cancel 0 1 0 0 failed\n");
+		return T_EXIT_FAIL;
+	}
+
+	ret = test_sync_cancel(&ring, 0, 1, 0, 1);
+	if (ret) {
+		fprintf(stderr, "test_sync_cancel 0 1 0 1 failed\n");
+		return T_EXIT_FAIL;
+	}
+
+
+	ret = test_sync_cancel(&ring, 1, 1, 0, 0);
+	if (ret) {
+		fprintf(stderr, "test_sync_cancel 1 1 0 0 failed\n");
+		return T_EXIT_FAIL;
+	}
+
+	ret = test_sync_cancel(&ring, 0, 0, 1, 0);
+	if (ret) {
+		fprintf(stderr, "test_sync_cancel 0 0 1 0 failed\n");
+		return T_EXIT_FAIL;
+	}
+
+	ret = test_sync_cancel(&ring, 1, 0, 1, 0);
+	if (ret) {
+		fprintf(stderr, "test_sync_cancel 1 0 1 0 failed\n");
 		return T_EXIT_FAIL;
 	}
 
-	ret = test_sync_cancel(&ring, 1, 0, 1);
+	ret = test_sync_cancel(&ring, 0, 1, 1, 0);
 	if (ret) {
-		fprintf(stderr, "test_sync_cancel 1 0 1 failed\n");
+		fprintf(stderr, "test_sync_cancel 0 1 1 0 failed\n");
 		return T_EXIT_FAIL;
 	}
 
-	ret = test_sync_cancel(&ring, 0, 1, 1);
+	ret = test_sync_cancel(&ring, 1, 1, 1, 0);
 	if (ret) {
-		fprintf(stderr, "test_sync_cancel 0 1 1 failed\n");
+		fprintf(stderr, "test_sync_cancel 1 1 1 0 failed\n");
 		return T_EXIT_FAIL;
 	}
 
-	ret = test_sync_cancel(&ring, 1, 1, 1);
+	ret = test_sync_cancel_timeout(&ring, 0, 0);
 	if (ret) {
-		fprintf(stderr, "test_sync_cancel 1 1 1 failed\n");
+		fprintf(stderr, "test_sync_cancel_timeout 0 0\n");
 		return T_EXIT_FAIL;
 	}
 
-	ret = test_sync_cancel_timeout(&ring, 0);
+	ret = test_sync_cancel_timeout(&ring, 0, 1);
 	if (ret) {
-		fprintf(stderr, "test_sync_cancel_timeout 0\n");
+		fprintf(stderr, "test_sync_cancel_timeout 0 1\n");
 		return T_EXIT_FAIL;
 	}
 
 	/* must be last, leaves request */
-	ret = test_sync_cancel_timeout(&ring, 1);
+	ret = test_sync_cancel_timeout(&ring, 1, 0);
 	if (ret) {
 		fprintf(stderr, "test_sync_cancel_timeout 1\n");
 		return T_EXIT_FAIL;

data/vendor/liburing/test/thread-exit.c

@@ -102,6 +102,8 @@ int main(int argc, char *argv[])
 	if (do_unlink)
 		unlink(fname);
 	if (fd < 0) {
+		if (errno == EPERM || errno == EACCES)
+			goto skip;
 		perror("open");
 		return 1;
 	}
@@ -140,4 +142,7 @@ int main(int argc, char *argv[])
 err:
 	free_g_buf();
 	return 1;
+skip:
+	free_g_buf();
+	return T_EXIT_SKIP;
 }