t/io_uring: only call setrlimit() for fixedbufs

[fio.git] / t / io_uring.c

diff --git a/t/io_uring.c b/t/io_uring.c
index 0c8058ba089ed997274005edb871e00e4324be90..71443404513e4e5a64efbb13d615dd663837dad5 100644 (file)
--- a/t/io_uring.c
+++ b/t/io_uring.c
@@ -22,7 +22,7 @@
 
 #include "../arch/arch.h"
 #include "../lib/types.h"
-#include "../os/io_uring.h"
+#include "../os/linux/io_uring.h"
 
 #define barrier()      __asm__ __volatile__("": : :"memory")
 
@@ -90,9 +90,11 @@ static volatile int finish;
 
 static int polled = 1;         /* use IO polling */
 static int fixedbufs = 1;      /* use fixed user buffers */
+static int register_files = 1; /* use fixed files */
 static int buffered = 0;       /* use buffered IO, not O_DIRECT */
 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 io_uring_register_buffers(struct submitter *s)
 {
@@ -101,6 +103,9 @@ static int io_uring_register_buffers(struct submitter *s)
                .nr_iovecs = DEPTH
        };
 
+       if (do_nop)
+               return 0;
+
        return syscall(__NR_sys_io_uring_register, s->ring_fd,
                        IORING_REGISTER_BUFFERS, &reg);
 }
@@ -110,6 +115,9 @@ static int io_uring_register_files(struct submitter *s)
        struct io_uring_register_files reg;
        int i;
 
+       if (do_nop)
+               return 0;
+
        s->fds = calloc(s->nr_files, sizeof(__s32));
        for (i = 0; i < s->nr_files; i++) {
                s->fds[i] = s->files[i].real_fd;
@@ -151,6 +159,11 @@ static void init_io(struct submitter *s, unsigned index)
        struct file *f;
        long r;
 
+       if (do_nop) {
+               sqe->opcode = IORING_OP_NOP;
+               return;
+       }
+
        if (s->nr_files == 1) {
                f = &s->files[0];
        } else {
@@ -166,7 +179,13 @@ static void init_io(struct submitter *s, unsigned index)
        lrand48_r(&s->rand, &r);
        offset = (r % (f->max_blocks - 1)) * BS;
 
-       sqe->flags = IOSQE_FIXED_FILE;
+       if (register_files) {
+               sqe->flags = IOSQE_FIXED_FILE;
+               sqe->fd = f->fixed_fd;
+       } else {
+               sqe->flags = 0;
+               sqe->fd = f->real_fd;
+       }
        if (fixedbufs) {
                sqe->opcode = IORING_OP_READ_FIXED;
                sqe->addr = s->iovecs[index].iov_base;
@@ -179,7 +198,6 @@ static void init_io(struct submitter *s, unsigned index)
                sqe->buf_index = 0;
        }
        sqe->ioprio = 0;
-       sqe->fd = f->fixed_fd;
        sqe->off = offset;
        sqe->user_data = (unsigned long) f;
 }
@@ -248,11 +266,13 @@ static int reap_events(struct submitter *s)
                if (head == *ring->tail)
                        break;
                cqe = &ring->cqes[head & cq_ring_mask];
-               f = (struct file *) cqe->user_data;
-               f->pending_ios--;
-               if (cqe->res != BS) {
-                       printf("io: unexpected ret=%d\n", cqe->res);
-                       return -1;
+               if (!do_nop) {
+                       f = (struct file *) (uintptr_t) cqe->user_data;
+                       f->pending_ios--;
+                       if (cqe->res != BS) {
+                               printf("io: unexpected ret=%d\n", cqe->res);
+                               return -1;
+                       }
                }
                if (cqe->flags & IOCQE_FLAG_CACHEHIT)
                        s->cachehit++;
@@ -300,8 +320,11 @@ submit:
                 * 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);
+                       unsigned flags = 0;
+
+                       if (to_wait)
+                               flags = IORING_ENTER_GETEVENTS;
+                       ret = io_uring_enter(s, to_submit, to_wait, flags);
                        s->calls++;
                }
 
@@ -386,8 +409,10 @@ static int setup_ring(struct submitter *s)
                p.flags |= IORING_SETUP_IOPOLL;
        if (sq_thread_poll) {
                p.flags |= IORING_SETUP_SQPOLL;
-               if (sq_thread_cpu != -1)
+               if (sq_thread_cpu != -1) {
                        p.flags |= IORING_SETUP_SQ_AFF;
+                       p.sq_thread_cpu = sq_thread_cpu;
+               }
        }
 
        fd = io_uring_setup(DEPTH, &p);
@@ -405,10 +430,12 @@ static int setup_ring(struct submitter *s)
                }
        }
 
-       ret = io_uring_register_files(s);
-       if (ret < 0) {
-               perror("io_uring_register_files");
-               return 1;
+       if (register_files) {
+               ret = io_uring_register_files(s);
+               if (ret < 0) {
+                       perror("io_uring_register_files");
+                       return 1;
+               }
        }
 
        ptr = mmap(0, p.sq_off.array + p.sq_entries * sizeof(__u32),
@@ -446,10 +473,9 @@ 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;
        void *ret;
 
-       if (argc < 2) {
+       if (!do_nop && argc < 2) {
                printf("%s: filename\n", argv[0]);
                return 1;
        }
@@ -459,7 +485,7 @@ int main(int argc, char *argv[])
                flags |= O_DIRECT;
 
        i = 1;
-       while (i < argc) {
+       while (!do_nop && i < argc) {
                struct file *f = &s->files[s->nr_files];
 
                fd = open(argv[i], flags);
@@ -483,11 +509,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();