uringmachine 0.3 → 0.5

data/vendor/liburing/test/Makefile

@@ -27,6 +27,10 @@ ifdef CONFIG_HAVE_ARRAY_BOUNDS
 	XCFLAGS += -Warray-bounds=0
 endif
 
+ifeq ($(CONFIG_USE_SANITIZER),y)
+	XCFLAGS += -fsanitize=address,undefined -fno-omit-frame-pointer -fno-optimize-sibling-calls
+endif
+
 CXXFLAGS ?= $(CFLAGS)
 override CFLAGS += $(XCFLAGS) -DLIBURING_BUILD_TEST
 override CXXFLAGS += $(XCFLAGS) -std=c++11 -DLIBURING_BUILD_TEST
@@ -61,6 +65,7 @@ test_srcs := \
 	connect.c \
 	connect-rep.c \
 	coredump.c \
+	cmd-discard.c \
 	cq-full.c \
 	cq-overflow.c \
 	cq-peek-batch.c \
@@ -89,6 +94,8 @@ test_srcs := \
 	fd-install.c \
 	fd-pass.c \
 	fdinfo.c \
+	fifo-nonblock-read.c \
+	file-exit-unreg.c \
 	file-register.c \
 	files-exit-hang-poll.c \
 	files-exit-hang-timeout.c \
@@ -114,11 +121,13 @@ test_srcs := \
 	io_uring_passthrough.c \
 	io_uring_register.c \
 	io_uring_setup.c \
+	kallsyms.c \
 	lfs-openat.c \
 	lfs-openat-write.c \
 	link.c \
 	link_drain.c \
 	link-timeout.c \
+	linked-defer-close.c \
 	madvise.c \
 	min-timeout.c \
 	min-timeout-wait.c \
@@ -130,7 +139,6 @@ test_srcs := \
 	multicqes_drain.c \
 	napi-test.c \
 	no-mmap-inval.c \
-	nolibc.c \
 	nop-all-sizes.c \
 	nop.c \
 	ooo-file-unreg.c \
@@ -154,10 +162,12 @@ test_srcs := \
 	poll-race-mshot.c \
 	poll-ring.c \
 	poll-v-poll.c \
+	pollfree.c \
 	probe.c \
 	read-before-exit.c \
 	read-mshot.c \
 	read-mshot-empty.c \
+	read-mshot-stdin.c \
 	read-write.c \
 	recv-msgall.c \
 	recv-msgall-stream.c \
@@ -165,9 +175,12 @@ test_srcs := \
 	reg-fd-only.c \
 	reg-hint.c \
 	reg-reg-ring.c \
+	reg-wait.c \
+	regbuf-clone.c \
 	regbuf-merge.c \
 	register-restrictions.c \
 	rename.c \
+	resize-rings.c \
 	ringbuf-read.c \
 	ringbuf-status.c \
 	ring-leak2.c \
@@ -176,6 +189,7 @@ test_srcs := \
 	rw_merge_test.c \
 	self.c \
 	recvsend_bundle.c \
+	recvsend_bundle-inc.c \
 	send_recv.c \
 	send_recvmsg.c \
 	send-zerocopy.c \
@@ -202,6 +216,7 @@ test_srcs := \
 	sq-poll-share.c \
 	sqpoll-sleep.c \
 	sq-space_left.c \
+	sqwait.c \
 	stdout.c \
 	submit-and-wait.c \
 	submit-link-fail.c \
@@ -215,6 +230,7 @@ test_srcs := \
 	truncate.c \
 	tty-write-dpoll.c \
 	unlink.c \
+	uring_cmd_ublk.c \
 	version.c \
 	waitid.c \
 	wait-timeout.c \
@@ -223,9 +239,19 @@ test_srcs := \
 	xattr.c \
 	# EOL
 
+# Please keep this list sorted alphabetically.
+asan_test_srcs := \
+	xfail_prep_link_timeout_out_of_scope.c \
+	xfail_register_buffers_out_of_scope.c \
+	# EOL
+
 all_targets :=
 include ../Makefile.quiet
 
+ifeq ($(CONFIG_NOLIBC),y)
+	test_srcs += nolibc.c
+endif
+
 ifdef CONFIG_HAVE_STATX
 	test_srcs += statx.c
 else ifdef CONFIG_HAVE_GLIBC_STATX
@@ -246,7 +272,15 @@ test_targets := $(patsubst %,%.t,$(test_targets))
 all_targets += $(test_targets)
 helpers = helpers.o
 
-all: $(test_targets)
+ifeq ($(CONFIG_USE_SANITIZER),y)
+	asan_test_targets := $(patsubst %.c,%,$(asan_test_srcs))
+	asan_test_targets := $(patsubst %.cc,%,$(asan_test_targets))
+	asan_run_test_targets := $(patsubst %,%.run_test,$(asan_test_targets))
+	asan_test_targets := $(patsubst %,%.t,$(asan_test_targets))
+	all_targets += $(asan_test_targets)
+endif
+
+all: $(test_targets) $(asan_test_targets)
 
 helpers.o: helpers.c
 	$(QUIET_CC)$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
@@ -283,10 +317,10 @@ clean:
 	@rm -rf output/
 
 runtests: all
-	@./runtests.sh $(test_targets)
+	@./runtests.sh $(test_targets) $(asan_test_targets)
 
 runtests-loop: all
-	@./runtests-loop.sh $(test_targets)
+	@./runtests-loop.sh $(test_targets) $(asan_test_targets)
 
 %.run_test: %.t
 	@./runtests-quiet.sh $<

data/vendor/liburing/test/a0908ae19763.c

@@ -14,6 +14,7 @@
 #include "helpers.h"
 #include "../src/syscall.h"
 
+#ifndef CONFIG_USE_SANITIZER
 static uint64_t r[1] = {0xffffffffffffffff};
 
 int main(int argc, char *argv[])
@@ -57,3 +58,9 @@ int main(int argc, char *argv[])
   __sys_io_uring_register(r[0], 2, (const void *) 0x20000280, 1);
   return T_EXIT_PASS;
 }
+#else
+int main(int argc, char *argv[])
+{
+	return T_EXIT_SKIP;
+}
+#endif

data/vendor/liburing/test/a4c0b3decb33.c

@@ -24,6 +24,7 @@
 #include "helpers.h"
 #include "../src/syscall.h"
 
+#ifndef CONFIG_USE_SANITIZER
 static void sleep_ms(uint64_t ms)
 {
 	usleep(ms * 1000);
@@ -179,3 +180,9 @@ int main(int argc, char *argv[])
 	loop();
 	return T_EXIT_PASS;
 }
+#else
+int main(int argc, char *argv[])
+{
+	return T_EXIT_SKIP;
+}
+#endif

data/vendor/liburing/test/accept.c

@@ -60,7 +60,7 @@ static void close_sock_fds(int s_fd[], int c_fd[], int nr, bool fixed)
 	close_fds(c_fd, nr);
 }
 
-static void queue_send(struct io_uring *ring, int fd)
+static void *queue_send(struct io_uring *ring, int fd)
 {
 	struct io_uring_sqe *sqe;
 	struct data *d;
@@ -72,9 +72,11 @@ static void queue_send(struct io_uring *ring, int fd)
 	sqe = io_uring_get_sqe(ring);
 	io_uring_prep_writev(sqe, fd, &d->iov, 1, 0);
 	sqe->user_data = 1;
+
+	return d;
 }
 
-static void queue_recv(struct io_uring *ring, int fd, bool fixed)
+static void *queue_recv(struct io_uring *ring, int fd, bool fixed)
 {
 	struct io_uring_sqe *sqe;
 	struct data *d;
@@ -88,6 +90,8 @@ static void queue_recv(struct io_uring *ring, int fd, bool fixed)
 	sqe->user_data = 2;
 	if (fixed)
 		sqe->flags |= IOSQE_FIXED_FILE;
+
+	return d;
 }
 
 static void queue_accept_multishot(struct io_uring *ring, int fd,
@@ -274,6 +278,8 @@ static int test_loop(struct io_uring *ring,
 	int nr_fds = multishot ? MAX_FDS : 1;
 	int multishot_idx = multishot ? INITIAL_USER_DATA : 0;
 	int err_ret = T_EXIT_FAIL;
+	void* send_d = 0;
+	void* recv_d = 0;
 
 	if (args.overflow)
 		cause_overflow(ring);
@@ -340,8 +346,8 @@ static int test_loop(struct io_uring *ring,
 		goto out;
 	}
 
-	queue_send(ring, c_fd[0]);
-	queue_recv(ring, s_fd[0], fixed);
+	send_d = queue_send(ring, c_fd[0]);
+	recv_d = queue_recv(ring, s_fd[0], fixed);
 
 	ret = io_uring_submit_and_wait(ring, 2);
 	assert(ret != -1);
@@ -365,9 +371,13 @@ static int test_loop(struct io_uring *ring,
 	}
 
 out:
+	free(send_d);
+	free(recv_d);
 	close_sock_fds(s_fd, c_fd, nr_fds, fixed);
 	return T_EXIT_PASS;
 err:
+	free(send_d);
+	free(recv_d);
 	close_sock_fds(s_fd, c_fd, nr_fds, fixed);
 	return err_ret;
 }

data/vendor/liburing/test/b19062a56726.c

@@ -14,6 +14,7 @@
 #include "helpers.h"
 #include "../src/syscall.h"
 
+#ifndef CONFIG_USE_SANITIZER
 int main(int argc, char *argv[])
 {
   if (argc > 1)
@@ -52,3 +53,9 @@ int main(int argc, char *argv[])
   __sys_io_uring_setup(0xc9f, (struct io_uring_params *) 0x20000200);
   return T_EXIT_PASS;
 }
+#else
+int main(int argc, char *argv[])
+{
+	return T_EXIT_SKIP;
+}
+#endif

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

@@ -54,7 +54,7 @@ static int connect_client(struct io_uring *ring, unsigned short peer_port)
 
 	sqe = io_uring_get_sqe(ring);
 	io_uring_prep_send(sqe, CLI_INDEX, magic, strlen(magic), 0);
-	sqe->flags |= IOSQE_FIXED_FILE | IOSQE_IO_LINK;
+	sqe->flags |= IOSQE_FIXED_FILE;
 
 	submitted = ret = io_uring_submit(ring);
 	if (ret < 0)
@@ -180,7 +180,7 @@ static int test_good_server(unsigned int ring_flags)
 	io_uring_cqe_seen(&ring, cqe);
 
 	sqe = io_uring_get_sqe(&ring);
-	io_uring_prep_recv(sqe, CONN_INDEX, buf, BUFSIZ, 0);
+	io_uring_prep_recv(sqe, CONN_INDEX, buf, sizeof(buf), 0);
 	sqe->flags |= IOSQE_FIXED_FILE;
 
 	io_uring_submit(&ring);

data/vendor/liburing/test/buf-ring-nommap.c

@@ -46,8 +46,10 @@ int main(int argc, char *argv[])
 	p.flags = IORING_SETUP_NO_MMAP;
 	ret = io_uring_queue_init_mem(1, &ring, &p, ring_mem, 16384);
 	if (ret < 0) {
-		if (ret == -EINVAL || ret == -ENOMEM)
+		if (ret == -EINVAL || ret == -ENOMEM) {
+			free(ring_mem);
 			return T_EXIT_SKIP;
+		}
 		fprintf(stderr, "queue init failed %d\n", ret);
 		return T_EXIT_FAIL;
 	}
@@ -62,8 +64,10 @@ int main(int argc, char *argv[])
 
 	ret = io_uring_register_buf_ring(&ring, &reg, 0);
 	if (ret) {
-		if (ret == -EINVAL)
+		if (ret == -EINVAL) {
+			free(ring_mem);
 			return T_EXIT_SKIP;
+		}
 		fprintf(stderr, "reg buf ring: %d\n", ret);
 		return T_EXIT_FAIL;
 	}
@@ -73,8 +77,10 @@ int main(int argc, char *argv[])
 	br = mmap(NULL, ring_size, PROT_READ | PROT_WRITE,
 				MAP_SHARED | MAP_POPULATE, ring.ring_fd, off);
 	if (br == MAP_FAILED) {
-		if (errno == ENOMEM)
+		if (errno == ENOMEM) {
+			free(ring_mem);
 			return T_EXIT_SKIP;
+		}
 		perror("mmap");
 		return T_EXIT_FAIL;
 	}
@@ -119,5 +125,6 @@ int main(int argc, char *argv[])
 	io_uring_cqe_seen(&ring, cqe);
 
 	io_uring_queue_exit(&ring);
+	free(ring_mem);
 	return T_EXIT_PASS;
 }

data/vendor/liburing/test/buf-ring.c

@@ -57,6 +57,7 @@ static int test_mixed_reg2(int bgid)
 
 	io_uring_free_buf_ring(&ring, br, 32, bgid);
 	io_uring_queue_exit(&ring);
+	free(bufs);
 	return 0;
 }
 
@@ -99,6 +100,7 @@ static int test_mixed_reg(int bgid)
 	}
 
 	io_uring_queue_exit(&ring);
+	free(bufs);
 	return 0;
 }