Merge pull request #46 from talex5/uring-2.1

Update to liburing 2.1

Author: talex5

lib/uring/dune

@@ -7,6 +7,7 @@
   (language c)
   (names uring_stubs)
   (include_dirs include)
+  (flags :standard "-D_GNU_SOURCE")
   (extra_deps include/liburing/compat.h)))
 
 (rule
@@ -29,7 +30,7 @@
        "%{ocaml-config:ocamlc_cflags}"
        (run make -j -C src))))
     (copy %{project_root}/vendor/liburing/src/liburing.a liburing.a)
-    (copy %{project_root}/vendor/liburing/src/liburing.so.2.0.0 dlluring.so)
+    (copy %{project_root}/vendor/liburing/src/liburing.so.2.1.0 dlluring.so)
     (copy %{project_root}/vendor/liburing/src/include/liburing.h liburing.h)
     (copy %{project_root}/vendor/liburing/src/include/liburing/io_uring.h
       io_uring.h)

lib/uring/uring_stubs.c

@@ -478,6 +478,7 @@ value ocaml_uring_wait_cqe_timeout(value v_timeout, value v_uring)
   int res;
   dprintf("cqe: waiting, timeout %fs\n", timeout);
   caml_enter_blocking_section();
+  io_uring_submit(ring);
   res = io_uring_wait_cqe_timeout(ring, &cqe, &t);
   caml_leave_blocking_section();
   if (res < 0) {
@@ -502,6 +503,7 @@ value ocaml_uring_wait_cqe(value v_uring)
   int res;
   dprintf("cqe: waiting\n");
   caml_enter_blocking_section();
+  io_uring_submit(ring);
   res = io_uring_wait_cqe(ring, &cqe);
   caml_leave_blocking_section();
   if (res < 0) {

vendor/liburing/.gitignore

@@ -45,6 +45,7 @@
 /test/defer
 /test/double-poll-crash
 /test/eeed8b54e0df-test
+/test/empty-eownerdead
 /test/eventfd
 /test/eventfd-disable
 /test/eventfd-ring
@@ -57,6 +58,7 @@
 /test/files-exit-hang-timeout
 /test/fixed-link
 /test/fsync
+/test/hardlink
 /test/io-cancel
 /test/io_uring_enter
 /test/io_uring_register
@@ -68,6 +70,7 @@
 /test/link-timeout
 /test/link_drain
 /test/madvise
+/test/mkdir
 /test/nop
 /test/nop-all-sizes
 /test/open-close
@@ -91,6 +94,7 @@
 /test/self
 /test/send_recv
 /test/send_recvmsg
+/test/sendmsg_fs_cve
 /test/shared-wq
 /test/short-read
 /test/shutdown
@@ -103,18 +107,28 @@
 /test/sq-poll-dup
 /test/sq-poll-kthread
 /test/sq-poll-share
+/test/sqpoll-disable-exit
+/test/sqpoll-exit-hang
 /test/sqpoll-sleep
 /test/sq-space_left
 /test/statx
 /test/stdout
 /test/submit-reuse
+/test/symlink
 /test/teardowns
 /test/thread-exit
 /test/timeout
 /test/timeout-new
 /test/timeout-overflow
 /test/unlink
 /test/wakeup-hang
+/test/multicqes_drain
+/test/poll-mshot-update
+/test/rsrc_tags
+/test/rw_merge_test
+/test/sqpoll-cancel-hang
+/test/testfile
+/test/submit-link-fail
 /test/*.dmesg
 
 config-host.h

vendor/liburing/Makefile

@@ -56,6 +56,8 @@ install: $(NAME).pc
 	$(INSTALL) -m 644 man/*.2 $(DESTDIR)$(mandir)/man2
 	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man3
 	$(INSTALL) -m 644 man/*.3 $(DESTDIR)$(mandir)/man3
+	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man7
+	$(INSTALL) -m 644 man/*.7 $(DESTDIR)$(mandir)/man7
 
 install-tests:
 	@$(MAKE) -C test install prefix=$(DESTDIR)$(prefix) datadir=$(DESTDIR)$(datadir)

vendor/liburing/configure

@@ -69,6 +69,8 @@ Options: [defaults in brackets after descriptions]
   --libdevdir=PATH         install development libraries in PATH [$libdevdir]
   --mandir=PATH            install man pages in PATH [$mandir]
   --datadir=PATH           install shared data in PATH [$datadir]
+  --cc=CMD                 use CMD as the C compiler
+  --cxx=CMD                use CMD as the C++ compiler
 EOF
 exit 0
 fi
@@ -191,6 +193,37 @@ print_and_output_mak "relativelibdir" "$relativelibdir"
 print_and_output_mak "mandir" "$mandir"
 print_and_output_mak "datadir" "$datadir"
 
+##########################################
+# check for compiler -Wstringop-overflow
+stringop_overflow="no"
+cat > $TMPC << EOF
+#include <linux/fs.h>
+int main(int argc, char **argv)
+{
+  return 0;
+}
+EOF
+if compile_prog "-Werror -Wstringop-overflow=0" "" "stringop_overflow"; then
+  stringop_overflow="yes"
+fi
+print_config "stringop_overflow" "$stringop_overflow"
+
+##########################################
+# check for compiler -Warryr-bounds
+array_bounds="no"
+cat > $TMPC << EOF
+#include <linux/fs.h>
+int main(int argc, char **argv)
+{
+  return 0;
+}
+EOF
+if compile_prog "-Werror -Warray-bounds=0" "" "array_bounds"; then
+  array_bounds="yes"
+fi
+print_config "array_bounds" "$array_bounds"
+
+
 ##########################################
 # check for __kernel_rwf_t
 __kernel_rwf_t="no"
@@ -296,6 +329,7 @@ int main(int argc, char **argv)
 {
   ucontext_t ctx;
   getcontext(&ctx);
+  makecontext(&ctx, 0, 0);
   return 0;
 }
 EOF
@@ -325,6 +359,12 @@ fi
 if test "$has_ucontext" = "yes"; then
   output_sym "CONFIG_HAVE_UCONTEXT"
 fi
+if test "$stringop_overflow" = "yes"; then
+  output_sym "CONFIG_HAVE_STRINGOP_OVERFLOW"
+fi
+if test "$array_bounds" = "yes"; then
+  output_sym "CONFIG_HAVE_ARRAY_BOUNDS"
+fi
 
 echo "CC=$cc" >> $config_host_mak
 print_config "CC" "$cc"

vendor/liburing/debian/rules

@@ -51,7 +51,7 @@ install-arch: check-arch
 	  DESTDIR=$(CURDIR)/debian/tmp \
 	  libdir=/lib/$(DEB_HOST_MULTIARCH) \
 	  libdevdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
-	  relativelibdir=/lib/$(DEB_HOST_MULTIARCH)
+	  relativelibdir=/lib/$(DEB_HOST_MULTIARCH)/
 
 binary: binary-indep binary-arch
 

vendor/liburing/examples/Makefile

@@ -2,7 +2,7 @@ CPPFLAGS ?=
 override CPPFLAGS += -D_GNU_SOURCE -I../src/include/
 CFLAGS ?= -g -O2
 XCFLAGS =
-override CFLAGS += -Wall -L../src/
+override CFLAGS += -D_GNU_SOURCE -Wall -L../src/
 
 include ../Makefile.quiet
 

vendor/liburing/examples/io_uring-cp.c

@@ -221,6 +221,25 @@ static int copy_file(struct io_uring *ring, off_t insize)
 		}
 	}
 
+	/* wait out pending writes */
+	while (writes) {
+		struct io_data *data;
+
+		ret = io_uring_wait_cqe(ring, &cqe);
+		if (ret) {
+			fprintf(stderr, "wait_cqe=%d\n", ret);
+			return 1;
+		}
+		if (cqe->res < 0) {
+			fprintf(stderr, "write res=%d\n", cqe->res);
+			return 1;
+		}
+		data = io_uring_cqe_get_data(cqe);
+		free(data);
+		writes--;
+		io_uring_cqe_seen(ring, cqe);
+	}
+
 	return 0;
 }
 

vendor/liburing/examples/link-cp.c

@@ -98,7 +98,7 @@ static int handle_cqe(struct io_uring *ring, struct io_uring_cqe *cqe)
 			queue_rw_pair(ring, BS, data->offset);
 			inflight += 2;
 		} else {
-			printf("cqe error: %s\n", strerror(cqe->res));
+			printf("cqe error: %s\n", strerror(-cqe->res));
 			ret = 1;
 		}
 	}
@@ -145,7 +145,7 @@ static int copy_file(struct io_uring *ring, off_t insize)
 
 			ret = io_uring_wait_cqe(ring, &cqe);
 			if (ret < 0) {
-				printf("wait cqe: %s\n", strerror(ret));
+				printf("wait cqe: %s\n", strerror(-ret));
 				return 1;
 			}
 			if (handle_cqe(ring, cqe))

vendor/liburing/examples/ucontext-cp.c

@@ -28,7 +28,7 @@
 
 typedef struct {
 	struct io_uring *ring;
-	unsigned char stack_buf[SIGSTKSZ];
+	unsigned char *stack_buf;
 	ucontext_t ctx_main, ctx_fnew;
 } async_context;
 
@@ -115,8 +115,13 @@ static int setup_context(async_context *pctx, struct io_uring *ring)
 		perror("getcontext");
 		return -1;
 	}
-	pctx->ctx_fnew.uc_stack.ss_sp = &pctx->stack_buf;
-	pctx->ctx_fnew.uc_stack.ss_size = sizeof(pctx->stack_buf);
+	pctx->stack_buf = malloc(SIGSTKSZ);
+	if (!pctx->stack_buf) {
+		perror("malloc");
+		return -1;
+	}
+	pctx->ctx_fnew.uc_stack.ss_sp = pctx->stack_buf;
+	pctx->ctx_fnew.uc_stack.ss_size = SIGSTKSZ;
 	pctx->ctx_fnew.uc_link = &pctx->ctx_main;
 
 	return 0;
@@ -174,6 +179,7 @@ static void copy_file_wrapper(arguments_bundle *pbundle)
 	free(iov.iov_base);
 	close(pbundle->infd);
 	close(pbundle->outfd);
+	free(pbundle->pctx->stack_buf);
 	free(pbundle->pctx);
 	free(pbundle);