t/io_uring: make submits/reaps per-second reflected with sq thread poll

[fio.git] / t / io_uring.c

diff --git a/t/io_uring.c b/t/io_uring.c
index 1c0d1535ef041facbd511a72b752a493a1cdf205..976d4046bedd8349f1cb8eee9028dc3110c4589e 100644 (file)
--- a/t/io_uring.c
+++ b/t/io_uring.c
@@ -33,6 +33,7 @@ struct io_sq_ring {
        unsigned *tail;
        unsigned *ring_mask;
        unsigned *ring_entries;
+       unsigned *flags;
        unsigned *array;
 };
 
@@ -250,6 +251,7 @@ static int reap_events(struct submitter *s)
 static void *submitter_fn(void *data)
 {
        struct submitter *s = data;
+       struct io_sq_ring *ring = &s->sq_ring;
        int ret, prepped;
 
        printf("submitter=%d\n", gettid());
@@ -273,13 +275,30 @@ submit:
                else
                        to_wait = min(s->inflight + to_submit, BATCH_COMPLETE);
 
-               ret = io_uring_enter(s, to_submit, to_wait,
-                                       IORING_ENTER_GETEVENTS);
-               s->calls++;
+               /*
+                * Only need to call io_uring_enter if we're not using SQ thread
+                * poll, or if IORING_SQ_NEED_WAKEUP is set.
+                */
+               if (!sq_thread_poll || (*ring->flags & IORING_SQ_NEED_WAKEUP)) {
+                       ret = io_uring_enter(s, to_submit, to_wait,
+                                               IORING_ENTER_GETEVENTS);
+                       s->calls++;
+               }
 
-               this_reap = reap_events(s);
-               if (this_reap == -1)
-                       break;
+               /*
+                * For non SQ thread poll, we already got the events we needed
+                * through the io_uring_enter() above. For SQ thread poll, we
+                * need to loop here until we find enough events.
+                */
+               this_reap = 0;
+               do {
+                       int r;
+                       r = reap_events(s);
+                       if (r == -1)
+                               break;
+                       else if (r > 0)
+                               this_reap += r;
+               } while (sq_thread_poll && this_reap < to_wait);
                s->reaps += this_reap;
 
                if (ret >= 0) {
@@ -374,6 +393,7 @@ static int setup_ring(struct submitter *s)
        sring->tail = ptr + p.sq_off.tail;
        sring->ring_mask = ptr + p.sq_off.ring_mask;
        sring->ring_entries = ptr + p.sq_off.ring_entries;
+       sring->flags = ptr + p.sq_off.flags;
        sring->array = ptr + p.sq_off.array;
        sq_ring_mask = *sring->ring_mask;
 
@@ -494,8 +514,9 @@ int main(int argc, char *argv[])
                if (this_call - calls) {
                        rpc = (this_done - done) / (this_call - calls);
                        ipc = (this_reap - reap) / (this_call - calls);
-               }
-               printf("IOPS=%lu, IOS/call=%lu/%lu, inflight=%u (head=%u tail=%u), Cachehit=%0.2f%%\n",
+               } else
+                       rpc = ipc = -1;
+               printf("IOPS=%lu, IOS/call=%ld/%ld, inflight=%u (head=%u tail=%u), Cachehit=%0.2f%%\n",
                                this_done - done, rpc, ipc, s->inflight,
                                *s->cq_ring.head, *s->cq_ring.tail, hit);
                done = this_done;