error out if ENOSPC during file layout

[fio.git] / t / io_uring.c

diff --git a/t/io_uring.c b/t/io_uring.c
index 175095cfbc975000956753989f444092449e3189..044f9195679566f802460672a3b9c6d96f33be07 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;
@@ -535,7 +535,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 +552,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 +634,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);