t/io_uring: stop when max number of files is reached

[fio.git] / t / io_uring.c

diff --git a/t/io_uring.c b/t/io_uring.c
index b9712622dc9848a084f6855f95d828db075e4930..c7139f8728249c4dae24831da1890299d439750e 100644 (file)
--- a/t/io_uring.c
+++ b/t/io_uring.c
@@ -24,8 +24,6 @@
 #include "../lib/types.h"
 #include "../os/linux/io_uring.h"
 
-#define barrier()      __asm__ __volatile__("": : :"memory")
-
 #define min(a, b)              ((a < b) ? (a) : (b))
 
 struct io_sq_ring {
@@ -47,8 +45,8 @@ struct io_cq_ring {
 
 #define DEPTH                  128
 
-#define BATCH_SUBMIT           64
-#define BATCH_COMPLETE         64
+#define BATCH_SUBMIT           32
+#define BATCH_COMPLETE         32
 
 #define BS                     4096
 
@@ -98,21 +96,15 @@ static int do_nop = 0;              /* no-op SQ ring commands */
 
 static int io_uring_register_buffers(struct submitter *s)
 {
-       struct io_uring_register_buffers reg = {
-               .iovecs = s->iovecs,
-               .nr_iovecs = DEPTH
-       };
-
        if (do_nop)
                return 0;
 
        return syscall(__NR_sys_io_uring_register, s->ring_fd,
-                       IORING_REGISTER_BUFFERS, &reg);
+                       IORING_REGISTER_BUFFERS, s->iovecs, DEPTH);
 }
 
 static int io_uring_register_files(struct submitter *s)
 {
-       struct io_uring_register_files reg;
        int i;
 
        if (do_nop)
@@ -123,11 +115,9 @@ static int io_uring_register_files(struct submitter *s)
                s->fds[i] = s->files[i].real_fd;
                s->files[i].fixed_fd = i;
        }
-       reg.fds = s->fds;
-       reg.nr_fds = s->nr_files;
 
        return syscall(__NR_sys_io_uring_register, s->ring_fd,
-                       IORING_REGISTER_FILES, &reg);
+                       IORING_REGISTER_FILES, s->fds, s->nr_files);
 }
 
 static int io_uring_setup(unsigned entries, struct io_uring_params *p)
@@ -139,7 +129,7 @@ static int io_uring_enter(struct submitter *s, unsigned int to_submit,
                          unsigned int min_complete, unsigned int flags)
 {
        return syscall(__NR_sys_io_uring_enter, s->ring_fd, to_submit,
-                       min_complete, flags);
+                       min_complete, flags, NULL, 0);
 }
 
 static int gettid(void)
@@ -172,6 +162,7 @@ static void init_io(struct submitter *s, unsigned index)
                        s->cur_file++;
                        if (s->cur_file == s->nr_files)
                                s->cur_file = 0;
+                       f = &s->files[s->cur_file];
                }
        }
        f->pending_ios++;
@@ -188,12 +179,12 @@ static void init_io(struct submitter *s, unsigned index)
        }
        if (fixedbufs) {
                sqe->opcode = IORING_OP_READ_FIXED;
-               sqe->addr = s->iovecs[index].iov_base;
+               sqe->addr = (unsigned long) s->iovecs[index].iov_base;
                sqe->len = BS;
                sqe->buf_index = index;
        } else {
                sqe->opcode = IORING_OP_READV;
-               sqe->addr = &s->iovecs[index];
+               sqe->addr = (unsigned long) &s->iovecs[index];
                sqe->len = 1;
                sqe->buf_index = 0;
        }
@@ -210,7 +201,7 @@ static int prep_more_ios(struct submitter *s, int max_ios)
        next_tail = tail = *ring->tail;
        do {
                next_tail++;
-               barrier();
+               read_barrier();
                if (next_tail == *ring->head)
                        break;
 
@@ -223,9 +214,9 @@ static int prep_more_ios(struct submitter *s, int max_ios)
 
        if (*ring->tail != tail) {
                /* order tail store with writes to sqes above */
-               barrier();
+               write_barrier();
                *ring->tail = tail;
-               barrier();
+               write_barrier();
        }
        return prepped;
 }
@@ -262,7 +253,7 @@ static int reap_events(struct submitter *s)
        do {
                struct file *f;
 
-               barrier();
+               read_barrier();
                if (head == *ring->tail)
                        break;
                cqe = &ring->cqes[head & cq_ring_mask];
@@ -271,6 +262,8 @@ static int reap_events(struct submitter *s)
                        f->pending_ios--;
                        if (cqe->res != BS) {
                                printf("io: unexpected ret=%d\n", cqe->res);
+                               if (polled && cqe->res == -EOPNOTSUPP)
+                                       printf("Your filesystem doesn't support poll\n");
                                return -1;
                        }
                }
@@ -284,7 +277,7 @@ static int reap_events(struct submitter *s)
 
        s->inflight -= reaped;
        *ring->head = head;
-       barrier();
+       write_barrier();
        return reaped;
 }
 
@@ -310,7 +303,7 @@ static void *submitter_fn(void *data)
 submit_more:
                to_submit = prepped;
 submit:
-               if (s->inflight + BATCH_SUBMIT < DEPTH)
+               if (to_submit && (s->inflight + to_submit <= DEPTH))
                        to_wait = 0;
                else
                        to_wait = min(s->inflight + to_submit, BATCH_COMPLETE);
@@ -324,6 +317,8 @@ submit:
 
                        if (to_wait)
                                flags = IORING_ENTER_GETEVENTS;
+                       if ((*ring->flags & IORING_SQ_NEED_WAKEUP))
+                               flags |= IORING_ENTER_SQ_WAKEUP;
                        ret = io_uring_enter(s, to_submit, to_wait, flags);
                        s->calls++;
                }
@@ -337,9 +332,10 @@ submit:
                do {
                        int r;
                        r = reap_events(s);
-                       if (r == -1)
+                       if (r == -1) {
+                               s->finish = 1;
                                break;
-                       else if (r > 0)
+                       } else if (r > 0)
                                this_reap += r;
                } while (sq_thread_poll && this_reap < to_wait);
                s->reaps += this_reap;
@@ -405,7 +401,7 @@ static int setup_ring(struct submitter *s)
 
        memset(&p, 0, sizeof(p));
 
-       if (polled)
+       if (polled && !do_nop)
                p.flags |= IORING_SETUP_IOPOLL;
        if (sq_thread_poll) {
                p.flags |= IORING_SETUP_SQPOLL;
@@ -468,12 +464,30 @@ static int setup_ring(struct submitter *s)
        return 0;
 }
 
+static void file_depths(char *buf)
+{
+       struct submitter *s = &submitters[0];
+       char *p;
+       int i;
+
+       buf[0] = '\0';
+       p = buf;
+       for (i = 0; i < s->nr_files; i++) {
+               struct file *f = &s->files[i];
+
+               if (i + 1 == s->nr_files)
+                       p += sprintf(p, "%d", f->pending_ios);
+               else
+                       p += sprintf(p, "%d, ", f->pending_ios);
+       }
+}
+
 int main(int argc, char *argv[])
 {
        struct submitter *s = &submitters[0];
        unsigned long done, calls, reap, cache_hit, cache_miss;
        int err, i, flags, fd;
-       struct rlimit rlim;
+       char *fdepths;
        void *ret;
 
        if (!do_nop && argc < 2) {
@@ -487,13 +501,19 @@ int main(int argc, char *argv[])
 
        i = 1;
        while (!do_nop && i < argc) {
-               struct file *f = &s->files[s->nr_files];
+               struct file *f;
 
+               if (s->nr_files == MAX_FDS) {
+                       printf("Max number of files (%d) reached\n", MAX_FDS);
+                       break;
+               }
                fd = open(argv[i], flags);
                if (fd < 0) {
                        perror("open");
                        return 1;
                }
+
+               f = &s->files[s->nr_files];
                f->real_fd = fd;
                if (get_file_size(f)) {
                        printf("failed getting size of device/file\n");
@@ -510,11 +530,15 @@ int main(int argc, char *argv[])
                i++;
        }
 
-       rlim.rlim_cur = RLIM_INFINITY;
-       rlim.rlim_max = RLIM_INFINITY;
-       if (setrlimit(RLIMIT_MEMLOCK, &rlim) < 0) {
-               perror("setrlimit");
-               return 1;
+       if (fixedbufs) {
+               struct rlimit rlim;
+
+               rlim.rlim_cur = RLIM_INFINITY;
+               rlim.rlim_max = RLIM_INFINITY;
+               if (setrlimit(RLIMIT_MEMLOCK, &rlim) < 0) {
+                       perror("setrlimit");
+                       return 1;
+               }
        }
 
        arm_sig_int();
@@ -540,6 +564,7 @@ int main(int argc, char *argv[])
 
        pthread_create(&s->thread, NULL, submitter_fn, s);
 
+       fdepths = malloc(8 * s->nr_files);
        cache_hit = cache_miss = reap = calls = done = 0;
        do {
                unsigned long this_done = 0;
@@ -569,9 +594,10 @@ int main(int argc, char *argv[])
                        ipc = (this_reap - reap) / (this_call - calls);
                } else
                        rpc = ipc = -1;
-               printf("IOPS=%lu, IOS/call=%ld/%ld, inflight=%u (head=%u tail=%u), Cachehit=%0.2f%%\n",
+               file_depths(fdepths);
+               printf("IOPS=%lu, IOS/call=%ld/%ld, inflight=%u (%s), Cachehit=%0.2f%%\n",
                                this_done - done, rpc, ipc, s->inflight,
-                               *s->cq_ring.head, *s->cq_ring.tail, hit);
+                               fdepths, hit);
                done = this_done;
                calls = this_call;
                reap = this_reap;
@@ -581,5 +607,6 @@ int main(int argc, char *argv[])
 
        pthread_join(s->thread, &ret);
        close(s->ring_fd);
+       free(fdepths);
        return 0;
 }