Merge branch 'issue25'
* issue25:
Add test case for commit 7ad0e4b2f83c
Fix flush/submit with internal timeout
Fixes: https://github.com/axboe/liburing/issues/25
Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/src/queue.c b/src/queue.c
index d4d876c..77d5b12 100644
--- a/src/queue.c
+++ b/src/queue.c
@@ -33,26 +33,30 @@
int __io_uring_get_cqe(struct io_uring *ring, struct io_uring_cqe **cqe_ptr,
unsigned submit, unsigned wait_nr, sigset_t *sigmask)
{
- int ret, err = 0;
+ int ret = 0, err;
do {
unsigned flags;
err = __io_uring_peek_cqe(ring, cqe_ptr);
- if (err || *cqe_ptr)
+ if (err)
break;
- if (!wait_nr) {
+ if (!*cqe_ptr && !wait_nr && !submit) {
err = -EAGAIN;
break;
}
- flags = IORING_ENTER_GETEVENTS;
+ if (wait_nr)
+ flags = IORING_ENTER_GETEVENTS;
if (submit)
sq_ring_needs_enter(ring, &flags);
- ret = __sys_io_uring_enter(ring->ring_fd, submit, wait_nr,
- flags, sigmask);
+ if (wait_nr || submit)
+ ret = __sys_io_uring_enter(ring->ring_fd, submit,
+ wait_nr, flags, sigmask);
if (ret < 0)
err = -errno;
submit -= ret;
+ if (*cqe_ptr)
+ break;
} while (!err);
return err;
@@ -88,14 +92,14 @@
/*
* Sync internal state with kernel ring state on the SQ side
*/
-static int __io_uring_flush_sq(struct io_uring *ring)
+static void __io_uring_flush_sq(struct io_uring *ring)
{
struct io_uring_sq *sq = &ring->sq;
const unsigned mask = *sq->kring_mask;
unsigned ktail, submitted, to_submit;
if (sq->sqe_head == sq->sqe_tail)
- return 0;
+ return;
/*
* Fill in sqes that we have queued up, adding them to the kernel ring
@@ -115,8 +119,6 @@
* update.
*/
io_uring_smp_store_release(sq->ktail, ktail);
-
- return submitted;
}
/*
@@ -135,8 +137,9 @@
sigset_t *sigmask)
{
unsigned to_submit = 0;
+ int ret;
- if (wait_nr && ts) {
+ if (ts) {
struct io_uring_sqe *sqe;
int ret;
@@ -152,10 +155,14 @@
}
io_uring_prep_timeout(sqe, ts, wait_nr, 0);
sqe->user_data = LIBURING_UDATA_TIMEOUT;
- to_submit = __io_uring_flush_sq(ring);
+ __io_uring_flush_sq(ring);
+ to_submit = *ring->sq.ktail - *ring->sq.khead;
}
- return __io_uring_get_cqe(ring, cqe_ptr, to_submit, wait_nr, sigmask);
+ ret = __io_uring_get_cqe(ring, cqe_ptr, to_submit, wait_nr, sigmask);
+ if (ret <= 0)
+ return ret;
+ return ret - to_submit;
}
/*
@@ -199,9 +206,8 @@
{
int submit;
- submit = __io_uring_flush_sq(ring);
- if (!submit)
- submit = *ring->sq.ktail - *ring->sq.khead;
+ __io_uring_flush_sq(ring);
+ submit = *ring->sq.ktail - *ring->sq.khead;
return __io_uring_submit(ring, submit, wait_nr);
}
diff --git a/test/7ad0e4b2f83c-test.c b/test/7ad0e4b2f83c-test.c
new file mode 100644
index 0000000..1abde44
--- /dev/null
+++ b/test/7ad0e4b2f83c-test.c
@@ -0,0 +1,89 @@
+#include <stdio.h>
+#include <time.h>
+#include <sys/time.h>
+#include "liburing.h"
+
+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);
+}
+
+int main(int argc, char *argv[])
+{
+ struct __kernel_timespec ts1, ts2;
+ struct io_uring_cqe *cqe;
+ struct io_uring_sqe *sqe;
+ struct io_uring ring;
+ unsigned long msec;
+ struct timeval tv;
+ int ret;
+
+ ret = io_uring_queue_init(32, &ring, 0);
+ if (ret) {
+ fprintf(stderr, "io_uring_queue_init=%d\n", ret);
+ return 1;
+ }
+
+ sqe = io_uring_get_sqe(&ring);
+ io_uring_prep_nop(sqe);
+ ret = io_uring_submit(&ring);
+ if (ret != 1) {
+ fprintf(stderr, "io_uring_submit1=%d\n", ret);
+ return 1;
+ }
+
+
+ ts1.tv_sec = 5,
+ ts1.tv_nsec = 0;
+ ret = io_uring_wait_cqe_timeout(&ring, &cqe, &ts1);
+ if (ret) {
+ fprintf(stderr, "io_uring_wait_cqe_timeout=%d\n", ret);
+ return 1;
+ }
+ io_uring_cqe_seen(&ring, cqe);
+ gettimeofday(&tv, NULL);
+
+ ts2.tv_sec = 1;
+ ts2.tv_nsec = 0;
+ sqe = io_uring_get_sqe(&ring);
+ io_uring_prep_timeout(sqe, &ts2, 0, 0);
+ sqe->user_data = 89;
+ ret = io_uring_submit(&ring);
+ if (ret != 1) {
+ fprintf(stderr, "io_uring_submit2=%d\n", ret);
+ return 1;
+ }
+
+ io_uring_wait_cqe(&ring, &cqe);
+ io_uring_cqe_seen(&ring, cqe);
+ msec = mtime_since_now(&tv);
+ if (msec >= 900 && msec <= 1100) {
+ io_uring_queue_exit(&ring);
+ return 0;
+ }
+
+ fprintf(stderr, "%s: Timeout seems wonky (got %lu)\n", __FUNCTION__,
+ msec);
+ io_uring_queue_exit(&ring);
+ return 1;
+}
diff --git a/test/Makefile b/test/Makefile
index eb83bc1..69ebdbf 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -17,7 +17,7 @@
link-timeout cq-overflow link_drain fc2a85cb02ef-test \
poll-link accept-link fixed-link poll-cancel-ton teardowns \
poll-many b5837bd5311d-test accept-test d77a67ed5f27-test \
- connect
+ connect 7ad0e4b2f83c-test
include ../Makefile.quiet
@@ -36,7 +36,8 @@
timeout-overflow.c defer.c read-write.c io-cancel.c link-timeout.c \
cq-overflow.c link_drain.c fc2a85cb02ef-test.c poll-link.c \
accept-link.c fixed-link.c poll-cancel-ton.c teardowns.c poll-many.c \
- b5837bd5311d-test.c accept-test.c d77a67ed5f27-test.c connect.c
+ b5837bd5311d-test.c accept-test.c d77a67ed5f27-test.c connect.c \
+ 7ad0e4b2f83c-test.c
test_objs := $(patsubst %.c,%.ol,$(test_srcs))