t/zbd: Add ignore_zone_limit option to test with special max_open_zones

[fio.git] / t / io_uring.c

diff --git a/t/io_uring.c b/t/io_uring.c
index 175095cfbc975000956753989f444092449e3189..ff4c7a7c01807ed46bd73dca4da85de0e606158d 100644 (file)
--- a/t/io_uring.c
+++ b/t/io_uring.c
@@ -94,7 +94,7 @@ static int sq_thread_poll = 0;        /* use kernel submission/poller thread */
 static int sq_thread_cpu = -1; /* pin above thread to this CPU */
 static int do_nop = 0;         /* no-op SQ ring commands */
 
-static int read_op = IORING_OP_READV;
+static int vectored = 1;
 
 static int io_uring_register_buffers(struct submitter *s)
 {
@@ -145,7 +145,7 @@ static void io_uring_probe(int fd)
                goto out;
 
        if ((p->ops[IORING_OP_READ].flags & IO_URING_OP_SUPPORTED))
-               read_op = IORING_OP_READ;
+               vectored = 0;
 out:
        free(p);
 }
@@ -209,16 +209,16 @@ static void init_io(struct submitter *s, unsigned index)
                sqe->addr = (unsigned long) s->iovecs[index].iov_base;
                sqe->len = bs;
                sqe->buf_index = index;
-       } else if (read_op == IORING_OP_READV) {
-               sqe->opcode = IORING_OP_READV;
-               sqe->addr = (unsigned long) &s->iovecs[index];
-               sqe->len = 1;
-               sqe->buf_index = 0;
-       } else {
+       } else if (!vectored) {
                sqe->opcode = IORING_OP_READ;
                sqe->addr = (unsigned long) s->iovecs[index].iov_base;
                sqe->len = bs;
                sqe->buf_index = 0;
+       } else {
+               sqe->opcode = IORING_OP_READV;
+               sqe->addr = (unsigned long) &s->iovecs[index];
+               sqe->len = 1;
+               sqe->buf_index = 0;
        }
        sqe->ioprio = 0;
        sqe->off = offset;
@@ -233,8 +233,7 @@ static int prep_more_ios(struct submitter *s, int max_ios)
        next_tail = tail = *ring->tail;
        do {
                next_tail++;
-               read_barrier();
-               if (next_tail == *ring->head)
+               if (next_tail == atomic_load_acquire(ring->head))
                        break;
 
                index = tail & sq_ring_mask;
@@ -244,10 +243,8 @@ static int prep_more_ios(struct submitter *s, int max_ios)
                tail = next_tail;
        } while (prepped < max_ios);
 
-       if (*ring->tail != tail) {
-               *ring->tail = tail;
-               write_barrier();
-       }
+       if (prepped)
+               atomic_store_release(ring->tail, tail);
        return prepped;
 }
 
@@ -284,7 +281,7 @@ static int reap_events(struct submitter *s)
                struct file *f;
 
                read_barrier();
-               if (head == *ring->tail)
+               if (head == atomic_load_acquire(ring->tail))
                        break;
                cqe = &ring->cqes[head & cq_ring_mask];
                if (!do_nop) {
@@ -301,9 +298,10 @@ static int reap_events(struct submitter *s)
                head++;
        } while (1);
 
-       s->inflight -= reaped;
-       *ring->head = head;
-       write_barrier();
+       if (reaped) {
+               s->inflight -= reaped;
+               atomic_store_release(ring->head, head);
+       }
        return reaped;
 }
 
@@ -320,6 +318,7 @@ static void *submitter_fn(void *data)
        prepped = 0;
        do {
                int to_wait, to_submit, this_reap, to_prep;
+               unsigned ring_flags = 0;
 
                if (!prepped && s->inflight < depth) {
                        to_prep = min(depth - s->inflight, batch_submit);
@@ -338,15 +337,20 @@ submit:
                 * 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)) {
+               if (sq_thread_poll)
+                       ring_flags = atomic_load_acquire(ring->flags);
+               if (!sq_thread_poll || ring_flags & IORING_SQ_NEED_WAKEUP) {
                        unsigned flags = 0;
 
                        if (to_wait)
                                flags = IORING_ENTER_GETEVENTS;
-                       if ((*ring->flags & IORING_SQ_NEED_WAKEUP))
+                       if (ring_flags & IORING_SQ_NEED_WAKEUP)
                                flags |= IORING_ENTER_SQ_WAKEUP;
                        ret = io_uring_enter(s, to_submit, to_wait, flags);
                        s->calls++;
+               } else {
+                       /* for SQPOLL, we submitted it all effectively */
+                       ret = to_submit;
                }
 
                /*
@@ -535,7 +539,7 @@ int main(int argc, char *argv[])
                return 1;
        }
 
-       while ((opt = getopt(argc, argv, "d:s:c:b:p:h?")) != -1) {
+       while ((opt = getopt(argc, argv, "d:s:c:b:p:B:F:h?")) != -1) {
                switch (opt) {
                case 'd':
                        depth = atoi(optarg);
@@ -552,6 +556,12 @@ int main(int argc, char *argv[])
                case 'p':
                        polled = !!atoi(optarg);
                        break;
+               case 'B':
+                       fixedbufs = !!atoi(optarg);
+                       break;
+               case 'F':
+                       register_files = !!atoi(optarg);
+                       break;
                case 'h':
                case '?':
                default:
@@ -628,7 +638,7 @@ int main(int argc, char *argv[])
                printf("ring setup failed: %s, %d\n", strerror(errno), err);
                return 1;
        }
-       printf("polled=%d, fixedbufs=%d, buffered=%d", polled, fixedbufs, buffered);
+       printf("polled=%d, fixedbufs=%d, register_files=%d, buffered=%d", polled, fixedbufs, register_files, buffered);
        printf(" QD=%d, sq_ring=%d, cq_ring=%d\n", depth, *s->sq_ring.ring_entries, *s->cq_ring.ring_entries);
 
        pthread_create(&s->thread, NULL, submitter_fn, s);