t/zbd: Combine write and read fio commands for test case #6

[fio.git] / t / io_uring.c

diff --git a/t/io_uring.c b/t/io_uring.c
index 55b75f6ed9664858a7cc6155ce0c159a146a4479..7fa84f99075bb8fb2f7c9ad0120edba911889a72 100644 (file)
--- a/t/io_uring.c
+++ b/t/io_uring.c
@@ -46,7 +46,6 @@ struct io_cq_ring {
 #define DEPTH                  128
 #define BATCH_SUBMIT           32
 #define BATCH_COMPLETE         32
-
 #define BS                     4096
 
 #define MAX_FDS                        16
@@ -63,7 +62,6 @@ struct file {
 struct submitter {
        pthread_t thread;
        int ring_fd;
-       struct drand48_data rand;
        struct io_sq_ring sq_ring;
        struct io_uring_sqe *sqes;
        struct io_cq_ring cq_ring;
@@ -87,6 +85,7 @@ static volatile int finish;
 static int depth = DEPTH;
 static int batch_submit = BATCH_SUBMIT;
 static int batch_complete = BATCH_COMPLETE;
+static int bs = BS;
 static int polled = 1;         /* use IO polling */
 static int fixedbufs = 1;      /* use fixed user buffers */
 static int register_files = 1; /* use fixed files */
@@ -170,8 +169,8 @@ static void init_io(struct submitter *s, unsigned index)
        }
        f->pending_ios++;
 
-       lrand48_r(&s->rand, &r);
-       offset = (r % (f->max_blocks - 1)) * BS;
+       r = lrand48();
+       offset = (r % (f->max_blocks - 1)) * bs;
 
        if (register_files) {
                sqe->flags = IOSQE_FIXED_FILE;
@@ -183,7 +182,7 @@ static void init_io(struct submitter *s, unsigned index)
        if (fixedbufs) {
                sqe->opcode = IORING_OP_READ_FIXED;
                sqe->addr = (unsigned long) s->iovecs[index].iov_base;
-               sqe->len = BS;
+               sqe->len = bs;
                sqe->buf_index = index;
        } else {
                sqe->opcode = IORING_OP_READV;
@@ -216,8 +215,6 @@ static int prep_more_ios(struct submitter *s, int max_ios)
        } while (prepped < max_ios);
 
        if (*ring->tail != tail) {
-               /* order tail store with writes to sqes above */
-               write_barrier();
                *ring->tail = tail;
                write_barrier();
        }
@@ -236,10 +233,10 @@ static int get_file_size(struct file *f)
                if (ioctl(f->real_fd, BLKGETSIZE64, &bytes) != 0)
                        return -1;
 
-               f->max_blocks = bytes / BS;
+               f->max_blocks = bytes / bs;
                return 0;
        } else if (S_ISREG(st.st_mode)) {
-               f->max_blocks = st.st_size / BS;
+               f->max_blocks = st.st_size / bs;
                return 0;
        }
 
@@ -263,7 +260,7 @@ static int reap_events(struct submitter *s)
                if (!do_nop) {
                        f = (struct file *) (uintptr_t) cqe->user_data;
                        f->pending_ios--;
-                       if (cqe->res != BS) {
+                       if (cqe->res != bs) {
                                printf("io: unexpected ret=%d\n", cqe->res);
                                if (polled && cqe->res == -EOPNOTSUPP)
                                        printf("Your filesystem/driver/kernel doesn't support polled IO\n");
@@ -288,7 +285,7 @@ static void *submitter_fn(void *data)
 
        printf("submitter=%d\n", gettid());
 
-       srand48_r(pthread_self(), &s->rand);
+       srand48(pthread_self());
 
        prepped = 0;
        do {
@@ -486,8 +483,10 @@ static void usage(char *argv)
        printf("%s [options] -- [filenames]\n"
                " -d <int> : IO Depth, default %d\n"
                " -s <int> : Batch submit, default %d\n"
-               " -c <int> : Batch complete, default %d\n",
-               argv, DEPTH, BATCH_SUBMIT, BATCH_COMPLETE);
+               " -c <int> : Batch complete, default %d\n"
+               " -b <int> : Block size, default %d\n"
+               " -p <bool> : Polled IO, default %d\n",
+               argv, DEPTH, BATCH_SUBMIT, BATCH_COMPLETE, BS, polled);
        exit(0);
 }
 
@@ -504,7 +503,7 @@ int main(int argc, char *argv[])
                return 1;
        }
 
-       while ((opt = getopt(argc, argv, "d:s:c:h?")) != -1) {
+       while ((opt = getopt(argc, argv, "d:s:c:b:p:h?")) != -1) {
                switch (opt) {
                case 'd':
                        depth = atoi(optarg);
@@ -515,6 +514,12 @@ int main(int argc, char *argv[])
                case 'c':
                        batch_complete = atoi(optarg);
                        break;
+               case 'b':
+                       bs = atoi(optarg);
+                       break;
+               case 'p':
+                       polled = !!atoi(optarg);
+                       break;
                case 'h':
                case '?':
                default:
@@ -578,12 +583,12 @@ int main(int argc, char *argv[])
        for (i = 0; i < depth; i++) {
                void *buf;
 
-               if (posix_memalign(&buf, BS, BS)) {
+               if (posix_memalign(&buf, bs, bs)) {
                        printf("failed alloc\n");
                        return 1;
                }
                s->iovecs[i].iov_base = buf;
-               s->iovecs[i].iov_len = BS;
+               s->iovecs[i].iov_len = bs;
        }
 
        err = setup_ring(s);