summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--debian/changelog7
-rw-r--r--debian/liburing1.symbols4
-rwxr-xr-xdebian/rules3
-rw-r--r--man/io_uring_enter.22
-rw-r--r--man/io_uring_setup.226
-rw-r--r--test/eeed8b54e0df-test.c2
-rw-r--r--test/nop-all-sizes.c1
8 files changed, 43 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 5faee05..00f7a86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,6 +63,7 @@
/test/link_drain
/test/madvise
/test/nop
+/test/nop-all-sizes
/test/open-close
/test/openat2
/test/personality
diff --git a/debian/changelog b/debian/changelog
index f01b3a4..f0032e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+liburing (0.7-1) stable; urgency=low
+
+ * Update to 0.7
+ * Fix library symlinks
+
+ -- Stefan Metzmacher <metze@samba.org> Thu, 23 Jul 2020 00:23:00 +0200
+
liburing (0.4-2) stable; urgency=low
* Fix /usr/lib/*/liburing.so symlink to /lib/*/liburing.so.1.0.4
diff --git a/debian/liburing1.symbols b/debian/liburing1.symbols
index cc4d504..29109f2 100644
--- a/debian/liburing1.symbols
+++ b/debian/liburing1.symbols
@@ -6,6 +6,7 @@ liburing.so.1 liburing1 #MINVER#
io_uring_queue_mmap@LIBURING_0.1 0.1-1
io_uring_register_buffers@LIBURING_0.1 0.1-1
io_uring_register_eventfd@LIBURING_0.1 0.1-1
+ io_uring_register_eventfd_async@LIBURING_0.6 0.6-1
io_uring_register_files@LIBURING_0.1 0.1-1
io_uring_submit@LIBURING_0.1 0.1-1
io_uring_submit_and_wait@LIBURING_0.1 0.1-1
@@ -20,6 +21,9 @@ liburing.so.1 liburing1 #MINVER#
io_uring_wait_cqes@LIBURING_0.2 0.2-1
(symver)LIBURING_0.3 0.3-1
(symver)LIBURING_0.4 0.4-1
+ (symver)LIBURING_0.5 0.5-1
+ (symver)LIBURING_0.6 0.6-1
+ (symver)LIBURING_0.7 0.7-1
io_uring_get_probe@LIBURING_0.4 0.4-1
io_uring_get_probe_ring@LIBURING_0.4 0.4-1
io_uring_register_personality@LIBURING_0.4 0.4-1
diff --git a/debian/rules b/debian/rules
index 283d464..385755c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,7 +50,8 @@ install-arch: check-arch
$(MAKE) install \
DESTDIR=$(CURDIR)/debian/tmp \
libdir=/lib/$(DEB_HOST_MULTIARCH) \
- libdevdir=/usr/lib/$(DEB_HOST_MULTIARCH)
+ libdevdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
+ relativelibdir=/lib/$(DEB_HOST_MULTIARCH)
binary: binary-indep binary-arch
diff --git a/man/io_uring_enter.2 b/man/io_uring_enter.2
index b4f5f5a..94c5dc4 100644
--- a/man/io_uring_enter.2
+++ b/man/io_uring_enter.2
@@ -468,7 +468,7 @@ must contain a pointer to the
argument,
.I open_flags
should contain any flags passed in, and
-.I mode
+.I len
is access mode of the file. See also
.BR openat(2)
for the general description of the related system call. Available since 5.6.
diff --git a/man/io_uring_setup.2 b/man/io_uring_setup.2
index c929cb7..ddf5f77 100644
--- a/man/io_uring_setup.2
+++ b/man/io_uring_setup.2
@@ -137,6 +137,32 @@ Create the completion queue with
entries. The value must be greater than
.IR entries ,
and may be rounded up to the next power-of-two.
+.TP
+.B IORING_SETUP_CLAMP
+If this flag is specified, and if
+.IR entries
+exceeds
+.B IORING_MAX_ENTRIES ,
+then
+.IR entries
+will be clamped at
+.B IORING_MAX_ENTRIES .
+If the flag
+.BR IORING_SETUP_SQPOLL
+is set, and if the value of
+.IR "struct io_uring_params.cq_entries"
+exceeds
+.B IORING_MAX_CQ_ENTRIES ,
+then it will be clamped at
+.B IORING_MAX_CQ_ENTRIES .
+.TP
+.B IORING_SETUP_ATTACH_WQ
+This flag should be set in conjunction with
+.IR "struct io_uring_params.wq_fd"
+being set to an existing io_uring ring file descriptor. When set, the
+io_uring instance being created will share the asynchronous worker
+thread backend of the specified io_uring ring, rather than create a new
+separate thread pool.
.PP
If no flags are specified, the io_uring instance is setup for
interrupt driven I/O. I/O may be submitted using
diff --git a/test/eeed8b54e0df-test.c b/test/eeed8b54e0df-test.c
index b2702d6..f0f122c 100644
--- a/test/eeed8b54e0df-test.c
+++ b/test/eeed8b54e0df-test.c
@@ -105,7 +105,7 @@ int main(int argc, char *argv[])
goto err;
}
- if (cqe->res != -EAGAIN) {
+ if (cqe->res != -EAGAIN && cqe->res != 4096) {
printf("cqe error: %d\n", cqe->res);
goto err;
}
diff --git a/test/nop-all-sizes.c b/test/nop-all-sizes.c
index aacd584..49b8642 100644
--- a/test/nop-all-sizes.c
+++ b/test/nop-all-sizes.c
@@ -100,6 +100,7 @@ int main(int argc, char *argv[])
return ret;
}
depth <<= 1;
+ io_uring_queue_exit(&ring);
}
return 0;