uringmachine 0.3 → 0.5

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

@@ -13,9 +13,9 @@
 #include "liburing.h"
 #include "helpers.h"
 
-static int no_sync_cancel;
+static int no_sync_cancel, no_sync_cancel_op;
 
-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,9 +43,15 @@ 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);
+	/* earlier kernels had sync cancel, but not per-op */
+	if (ret == -EINVAL) {
+		no_sync_cancel_op = 1;
+		return 0;
+	}
 	if (async) {
 		/* we expect -ETIME here, but can race and get 0 */
 		if (ret != -ETIME && ret != 0) {
@@ -80,7 +86,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 +174,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 +182,84 @@ 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;
 	}
+	if (no_sync_cancel_op)
+		return T_EXIT_PASS;
 
-	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;
 }

data/vendor/liburing/test/timeout-new.c

@@ -8,6 +8,7 @@
 #include <unistd.h>
 #include <pthread.h>
 #include "liburing.h"
+#include "helpers.h"
 
 #define TIMEOUT_MSEC	200
 #define TIMEOUT_SEC	10
@@ -22,32 +23,6 @@ static void msec_to_ts(struct __kernel_timespec *ts, unsigned int msec)
 	ts->tv_nsec = (msec % 1000) * 1000000;
 }
 
-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_return_before_timeout(struct io_uring *ring)
 {
 	struct io_uring_cqe *cqe;

data/vendor/liburing/test/timeout.c

@@ -29,31 +29,6 @@ static void msec_to_ts(struct __kernel_timespec *ts, unsigned int msec)
 	ts->tv_nsec = (msec % 1000) * 1000000;
 }
 
-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);
-}
-
 /*
  * Test that we return to userspace if a timeout triggers, even if we
  * don't satisfy the number of events asked for.
@@ -980,6 +955,7 @@ static int test_update_timeout(struct io_uring *ring, unsigned long ms,
 	struct io_uring_cqe *cqe;
 	struct __kernel_timespec ts, ts_upd;
 	unsigned long long exp_ms, base_ms = 10000;
+	bool update_ealready = false;
 	struct timeval tv;
 	int ret, i, nr = 2;
 	__u32 mode = abs ? IORING_TIMEOUT_ABS : 0;
@@ -1042,6 +1018,16 @@ static int test_update_timeout(struct io_uring *ring, unsigned long ms,
 			}
 			break;
 		case 2:
+			/*
+			 * We should not be hitting this case, but for
+			 * a kernel with PREEMPT_RT, even an instant attempt
+			 * to remove a timer will return that the timer is
+			 * already running... Deal with it.
+			 */
+			if (cqe->res == -EALREADY) {
+				update_ealready = true;
+				break;
+			}
 			if (cqe->res != 0) {
 				fprintf(stderr, "%s: got %d, wanted %d\n",
 						__FUNCTION__, cqe->res,
@@ -1062,7 +1048,7 @@ static int test_update_timeout(struct io_uring *ring, unsigned long ms,
 	}
 
 	exp_ms = mtime_since_now(&tv);
-	if (exp_ms >= base_ms / 2) {
+	if (!update_ealready && exp_ms >= base_ms / 2) {
 		fprintf(stderr, "too long, timeout wasn't updated\n");
 		goto err;
 	}
@@ -1242,14 +1228,19 @@ static int test_timeout_link_cancel(void)
 		exit(0);
 	}
 
-	if (waitpid(p, &wstatus, 0) == (pid_t)-1) {
-		perror("waitpid()");
-		return 1;
-	}
-	if (!WIFEXITED(wstatus) || WEXITSTATUS(wstatus)) {
-		fprintf(stderr, "child failed %i\n", WEXITSTATUS(wstatus));
-		return 1;
-	}
+	do {
+		if (waitpid(p, &wstatus, 0) == (pid_t)-1) {
+			perror("waitpid()");
+			return 1;
+		}
+		if (!WIFEXITED(wstatus))
+			continue;
+		if (WEXITSTATUS(wstatus)) {
+			fprintf(stderr, "child failed %i\n", WEXITSTATUS(wstatus));
+			return 1;
+		}
+		break;
+	} while (1);
 
 	for (i = 0; i < 2; ++i) {
 		ret = io_uring_wait_cqe(&ring, &cqe);

data/vendor/liburing/test/unlink.c

@@ -13,6 +13,87 @@
 
 #include "liburing.h"
 
+static int test_rmdir(struct io_uring *ring)
+{
+	struct io_uring_cqe *cqe;
+	struct io_uring_sqe *sqe;
+	char buf[32];
+	int ret;
+
+	sprintf(buf, ".tmp.dir.%d", getpid());
+	if (mkdir(buf, 0755) < 0) {
+		perror("mkdir");
+		return 1;
+	}
+
+	sqe = io_uring_get_sqe(ring);
+	if (!sqe) {
+		fprintf(stderr, "get sqe failed\n");
+		goto err;
+	}
+	io_uring_prep_unlink(sqe, buf, AT_REMOVEDIR);
+
+	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) {
+		struct stat sb;
+
+		if (!stat(buf, &sb)) {
+			fprintf(stderr, "dir unlinked but still there\n");
+			goto err;
+		}
+	}
+	unlink(buf);
+	return ret;
+err:
+	unlink(buf);
+	return 1;
+}
+
+static int test_unlink_badaddr(struct io_uring *ring)
+{
+	const char *old = (const char *) (uintptr_t) 0x1234;
+	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");
+		goto err;
+	}
+	io_uring_prep_unlink(sqe, old, 0);
+
+	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);
+	return ret;
+err:
+	return 1;
+}
+
 static int test_unlink(struct io_uring *ring, const char *old)
 {
 	struct io_uring_cqe *cqe;
@@ -25,7 +106,7 @@ static int test_unlink(struct io_uring *ring, const char *old)
 		goto err;
 	}
 	io_uring_prep_unlink(sqe, old, 0);
-	
+
 	ret = io_uring_submit(ring);
 	if (ret <= 0) {
 		fprintf(stderr, "sqe submit failed: %d\n", ret);
@@ -105,6 +186,18 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 
+	ret = test_unlink_badaddr(&ring);
+	if (ret != -EFAULT) {
+		fprintf(stderr, "badaddr unlink got %s\n", strerror(-ret));
+		return 1;
+	}
+
+	ret = test_rmdir(&ring);
+	if (ret) {
+		fprintf(stderr, "rmdir failed: %s\n", strerror(-ret));
+		return 1;
+	}
+
 	return 0;
 err:
 	unlink(buf);