Update contrib/libs/liburing to 2.9

commit_hash:88f21b0567edce8f03258355bcc0e4029ea2085b

Author: robot-piglet

contrib/libs/liburing/.yandex_meta/devtools.licenses.report

@@ -52,21 +52,21 @@ BELONGS ya.make
         Match type      : REFERENCE
         Links           : https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/unknown-license-reference.LICENSE
     Files with this license:
-        README [103:103]
+        README [108:108]
     Scancode info:
         Original SPDX id: GPL-1.0-or-later
         Score           : 50.00
         Match type      : REFERENCE
         Links           : http://www.gnu.org/licenses/old-licenses/gpl-1.0-standalone.html, https://spdx.org/licenses/GPL-1.0-or-later
     Files with this license:
-        README [103:103]
+        README [108:108]
     Scancode info:
         Original SPDX id: Linux-syscall-note
         Score           : 50.00
         Match type      : REFERENCE
         Links           : https://spdx.org/licenses/Linux-syscall-note
     Files with this license:
-        README [103:103]
+        README [108:108]
 
 KEEP     MIT                  1eaf467c6d00edd4a5876ad437b67edf
 BELONGS ya.make
@@ -151,6 +151,7 @@ BELONGS ya.make
         test/fd-pass.c [2:2]
         test/fdinfo.c [2:2]
         test/fifo-nonblock-read.c [2:2]
+        test/file-exit-unreg.c [2:2]
         test/file-register.c [2:2]
         test/file-update.c [2:2]
         test/file-verify.c [2:2]
@@ -221,6 +222,7 @@ BELONGS ya.make
         test/pollfree.c [2:2]
         test/probe.c [2:2]
         test/read-before-exit.c [2:2]
+        test/read-inc-file.c [2:2]
         test/read-mshot-empty.c [2:2]
         test/read-mshot-stdin.c [2:2]
         test/read-mshot.c [2:2]
@@ -232,10 +234,12 @@ BELONGS ya.make
         test/reg-fd-only.c [2:2]
         test/reg-hint.c [2:2]
         test/reg-reg-ring.c [2:2]
+        test/reg-wait.c [2:2]
         test/regbuf-clone.c [2:2]
         test/regbuf-merge.c [2:2]
         test/register-restrictions.c [2:2]
         test/rename.c [2:2]
+        test/resize-rings.c [2:2]
         test/ring-leak.c [2:2]
         test/ring-leak2.c [2:2]
         test/ringbuf-read.c [2:2]
@@ -254,6 +258,7 @@ BELONGS ya.make
         test/skip-cqe.c [2:2]
         test/socket-getsetsock-cmd.c [2:2]
         test/socket-io-cmd.c [2:2]
+        test/socket-nb.c [2:2]
         test/socket-rw-eagain.c [2:2]
         test/socket-rw-offset.c [2:2]
         test/socket-rw.c [2:2]
@@ -364,7 +369,7 @@ BELONGS ya.make
 
 KEEP     "(GPL-2.0-only WITH Linux-syscall-note OR MIT)" 9566044df50ee1c37e39ed99e7926750
 BELONGS ya.make
-FILE_INCLUDE COPYING.GPL found in files: README at line 104
+FILE_INCLUDE COPYING.GPL found in files: README at line 109
     License text:
         COPYING.GPL and <https://spdx.org/licenses/Linux-syscall-note.html>.
     Scancode info:
@@ -373,14 +378,14 @@ FILE_INCLUDE COPYING.GPL found in files: README at line 104
         Match type      : REFERENCE
         Links           : http://www.gnu.org/licenses/old-licenses/gpl-1.0-standalone.html, https://spdx.org/licenses/GPL-1.0-or-later
     Files with this license:
-        README [104:104]
+        README [109:109]
     Scancode info:
         Original SPDX id: Linux-syscall-note
         Score           : 95.00
         Match type      : REFERENCE
         Links           : https://spdx.org/licenses/Linux-syscall-note
     Files with this license:
-        README [104:104]
+        README [109:109]
 
 KEEP     "(LGPL-2.1-only OR MIT)" 9d1d95673c01a94e06648bf72ecda12d
 BELONGS ya.make
@@ -409,11 +414,11 @@ BELONGS ya.make
         Match type      : REFERENCE
         Links           : https://github.com/nexB/scancode-toolkit/tree/develop/src/licensedcode/data/licenses/unknown-license-reference.LICENSE
     Files with this license:
-        README [101:101]
+        README [106:106]
     Scancode info:
         Original SPDX id: LGPL-2.0-or-later
         Score           : 75.00
         Match type      : REFERENCE
         Links           : http://www.gnu.org/licenses/old-licenses/lgpl-2.0-standalone.html, http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html, https://spdx.org/licenses/LGPL-2.0-or-later
     Files with this license:
-        README [101:101]
+        README [106:106]

contrib/libs/liburing/.yandex_meta/override.nix

@@ -1,12 +1,12 @@
 pkgs: attrs: with pkgs; with attrs; rec {
   name = "liburing";
-  version = "2.8";
+  version = "2.9";
 
   src = fetchFromGitHub {
     owner = "axboe";
     repo = "liburing";
     rev    = "liburing-${version}";
-    hash = "sha256-10zmoMDzO41oNRVXE/6FzDGPVRVJTJTARVUmc1b7f+o=";
+    hash = "sha256-zOC53i52YJsH3AQIy4afjTGlX/IvVnW2QnYOppFxKiI=";
   };
 
   buildPhase = ''

contrib/libs/liburing/CHANGELOG

@@ -1,4 +1,14 @@
+liburing-2.9 release
+
+- Add support for ring resizing
+- Add support for registered waits
+- Test additions and improvements
+- Fix bug with certain ring setups with SQE128 set not fully closing
+  the ring after io_uring_queue_exit(3) had been called.
+- Various man page fixes and updates
+
 liburing-2.8 release
+
 - Add support for incrementally/partially consumed provided buffers,
   usable with the provided buffer ring support.
 - Add support for foo_and_wait_min_timeout(), where it's possible to

contrib/libs/liburing/README

@@ -63,6 +63,11 @@ Building liburing
     #
     make -j$(nproc);
 
+    #
+    # Build liburing.pc
+    #
+    make liburing.pc
+
     #
     # Install liburing (headers, shared/static libs, and manpage).
     #

contrib/libs/liburing/src/include/liburing.h

@@ -196,7 +196,16 @@ int io_uring_submit_and_wait_min_timeout(struct io_uring *ring,
 					 struct __kernel_timespec *ts,
 					 unsigned min_wait,
 					 sigset_t *sigmask);
-
+int io_uring_submit_and_wait_reg(struct io_uring *ring,
+				 struct io_uring_cqe **cqe_ptr, unsigned wait_nr,
+				 int reg_index);
+
+int io_uring_register_wait_reg(struct io_uring *ring,
+			       struct io_uring_reg_wait *reg, int nr);
+int io_uring_resize_rings(struct io_uring *ring, struct io_uring_params *p);
+int io_uring_clone_buffers_offset(struct io_uring *dst, struct io_uring *src,
+				  unsigned int dst_off, unsigned int src_off,
+				  unsigned int nr, unsigned int flags);
 int io_uring_clone_buffers(struct io_uring *dst, struct io_uring *src);
 int io_uring_register_buffers(struct io_uring *ring, const struct iovec *iovecs,
 			      unsigned nr_iovecs);
@@ -275,6 +284,12 @@ int io_uring_setup(unsigned int entries, struct io_uring_params *p);
 int io_uring_register(unsigned int fd, unsigned int opcode, const void *arg,
 		      unsigned int nr_args);
 
+/*
+ * Mapped/registered regions
+ */
+int io_uring_register_region(struct io_uring *ring,
+			     struct io_uring_mem_region_reg *reg);
+
 /*
  * Mapped buffer ring alloc/register + unregister/free helpers
  */
@@ -394,6 +409,12 @@ IOURINGINLINE void io_uring_sqe_set_flags(struct io_uring_sqe *sqe,
 	sqe->flags = (__u8) flags;
 }
 
+IOURINGINLINE void io_uring_sqe_set_buf_group(struct io_uring_sqe *sqe,
+					      int bgid)
+{
+	sqe->buf_group = (__u16) bgid;
+}
+
 IOURINGINLINE void __io_uring_set_target_fixed_file(struct io_uring_sqe *sqe,
 						    unsigned int file_index)
 {

contrib/libs/liburing/src/include/liburing/io_uring.h

@@ -200,6 +200,9 @@ enum io_uring_sqe_flags_bit {
  */
 #define IORING_SETUP_NO_SQARRAY		(1U << 16)
 
+/* Use hybrid poll in iopoll process */
+#define IORING_SETUP_HYBRID_IOPOLL      (1U << 17)
+
 enum io_uring_op {
 	IORING_OP_NOP,
 	IORING_OP_READV,
@@ -518,6 +521,7 @@ struct io_cqring_offsets {
 #define IORING_ENTER_EXT_ARG		(1U << 3)
 #define IORING_ENTER_REGISTERED_RING	(1U << 4)
 #define IORING_ENTER_ABS_TIMER		(1U << 5)
+#define IORING_ENTER_EXT_ARG_REG	(1U << 6)
 
 /*
  * Passed in for io_uring_setup(2). Copied back with updated info on success
@@ -612,6 +616,10 @@ enum io_uring_register_op {
 	/* clone registered buffers from source ring to current ring */
 	IORING_REGISTER_CLONE_BUFFERS		= 30,
 
+	IORING_REGISTER_RESIZE_RINGS		= 33,
+
+	IORING_REGISTER_MEM_REGION		= 34,
+
 	/* this goes last */
 	IORING_REGISTER_LAST,
 
@@ -632,6 +640,31 @@ struct io_uring_files_update {
 	__aligned_u64 /* __s32 * */ fds;
 };
 
+enum {
+	/* initialise with user provided memory pointed by user_addr */
+	IORING_MEM_REGION_TYPE_USER		= 1,
+};
+
+struct io_uring_region_desc {
+	__u64 user_addr;
+	__u64 size;
+	__u32 flags;
+	__u32 id;
+	__u64 mmap_offset;
+	__u64 __resv[4];
+};
+
+enum {
+	/* expose the region as registered wait arguments */
+	IORING_MEM_REGION_REG_WAIT_ARG		= 1,
+};
+
+struct io_uring_mem_region_reg {
+	__u64 region_uptr; /* struct io_uring_region_desc * */
+	__u64 flags;
+	__u64 __resv[2];
+};
+
 /*
  * Register a fully sparse file space, rather than pass in an array of all
  * -1 file descriptors.
@@ -698,13 +731,17 @@ struct io_uring_clock_register {
 };
 
 enum {
-	IORING_REGISTER_SRC_REGISTERED = 1,
+	IORING_REGISTER_SRC_REGISTERED	= (1U << 0),
+	IORING_REGISTER_DST_REPLACE	= (1U << 1),
 };
 
 struct io_uring_clone_buffers {
 	__u32	src_fd;
 	__u32	flags;
-	__u32	pad[6];
+	__u32	src_off;
+	__u32	dst_off;
+	__u32	nr;
+	__u32	pad[3];
 };
 
 struct io_uring_buf {
@@ -795,6 +832,43 @@ enum io_uring_register_restriction_op {
 	IORING_RESTRICTION_LAST
 };
 
+enum {
+	IORING_REG_WAIT_TS		= (1U << 0),
+};
+
+/*
+ * Argument for IORING_REGISTER_CQWAIT_REG, registering a region of
+ * struct io_uring_reg_wait that can be indexed when io_uring_enter(2) is
+ * called rather than pass in a wait argument structure separately.
+ */
+struct io_uring_cqwait_reg_arg {
+	__u32		flags;
+	__u32		struct_size;
+	__u32		nr_entries;
+	__u32		pad;
+	__u64		user_addr;
+	__u64		pad2[3];
+};
+
+/*
+ * Argument for io_uring_enter(2) with
+ * IORING_GETEVENTS | IORING_ENTER_EXT_ARG_REG set, where the actual argument
+ * is an index into a previously registered fixed wait region described by
+ * the below structure.
+ */
+struct io_uring_reg_wait {
+	struct __kernel_timespec	ts;
+	__u32				min_wait_usec;
+	__u32				flags;
+	__u64				sigmask;
+	__u32				sigmask_sz;
+	__u32				pad[3];
+	__u64				pad2[2];
+};
+
+/*
+ * Argument for io_uring_enter(2) with IORING_GETEVENTS | IORING_ENTER_EXT_ARG
+ */
 struct io_uring_getevents_arg {
 	__u64	sigmask;
 	__u32	sigmask_sz;

contrib/libs/liburing/src/include/liburing/io_uring_version.h

@@ -3,6 +3,6 @@
 #define LIBURING_VERSION_H
 
 #define IO_URING_VERSION_MAJOR 2
-#define IO_URING_VERSION_MINOR 8
+#define IO_URING_VERSION_MINOR 9
 
 #endif