Per-command priority: Priority logging and libaio/io_uring cmdprio_percentage

[fio.git] / engines / libaio.c

diff --git a/engines/libaio.c b/engines/libaio.c
index cc6ca66b49af50c4ef95836010202c061f6f1d54..299798ae8a5a16de1e0b112d2bbf74323eae22b8 100644 (file)
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -16,15 +16,13 @@
 #include "../optgroup.h"
 #include "../lib/memalign.h"
 
-#ifndef IOCB_FLAG_HIPRI
-#define IOCB_FLAG_HIPRI        (1 << 2)
-#endif
-
-#ifndef IOCTX_FLAG_IOPOLL
-#define IOCTX_FLAG_IOPOLL      (1 << 0)
+/* Should be defined in newest aio_abi.h */
+#ifndef IOCB_FLAG_IOPRIO
+#define IOCB_FLAG_IOPRIO    (1 << 1)
 #endif
 
 static int fio_libaio_commit(struct thread_data *td);
+static int fio_libaio_init(struct thread_data *td);
 
 struct libaio_data {
        io_context_t aio_ctx;
@@ -52,7 +50,7 @@ struct libaio_data {
 struct libaio_options {
        void *pad;
        unsigned int userspace_reap;
-       unsigned int hipri;
+       unsigned int cmdprio_percentage;
 };
 
 static struct fio_option options[] = {
@@ -65,15 +63,26 @@ static struct fio_option options[] = {
                .category = FIO_OPT_C_ENGINE,
                .group  = FIO_OPT_G_LIBAIO,
        },
+#ifdef FIO_HAVE_IOPRIO_CLASS
        {
-               .name   = "hipri",
-               .lname  = "High Priority",
-               .type   = FIO_OPT_STR_SET,
-               .off1   = offsetof(struct libaio_options, hipri),
-               .help   = "Use polled IO completions",
+               .name   = "cmdprio_percentage",
+               .lname  = "high priority percentage",
+               .type   = FIO_OPT_INT,
+               .off1   = offsetof(struct libaio_options, cmdprio_percentage),
+               .minval = 1,
+               .maxval = 100,
+               .help   = "Send high priority I/O this percentage of the time",
                .category = FIO_OPT_C_ENGINE,
                .group  = FIO_OPT_G_LIBAIO,
        },
+#else
+       {
+               .name   = "cmdprio_percentage",
+               .lname  = "high priority percentage",
+               .type   = FIO_OPT_UNSUPPORTED,
+               .help   = "Your platform does not support I/O priority classes",
+       },
+#endif
        {
                .name   = NULL,
        },
@@ -91,25 +100,29 @@ static inline void ring_inc(struct libaio_data *ld, unsigned int *val,
 static int fio_libaio_prep(struct thread_data fio_unused *td, struct io_u *io_u)
 {
        struct fio_file *f = io_u->file;
-       struct libaio_options *o = td->eo;
-       struct iocb *iocb;
-
-       iocb = &io_u->iocb;
+       struct iocb *iocb = &io_u->iocb;
 
        if (io_u->ddir == DDIR_READ) {
                io_prep_pread(iocb, f->fd, io_u->xfer_buf, io_u->xfer_buflen, io_u->offset);
-               if (o->hipri)
-                       iocb->u.c.flags |= IOCB_FLAG_HIPRI;
        } else if (io_u->ddir == DDIR_WRITE) {
                io_prep_pwrite(iocb, f->fd, io_u->xfer_buf, io_u->xfer_buflen, io_u->offset);
-               if (o->hipri)
-                       iocb->u.c.flags |= IOCB_FLAG_HIPRI;
        } else if (ddir_sync(io_u->ddir))
                io_prep_fsync(iocb, f->fd);
 
        return 0;
 }
 
+static void fio_libaio_prio_prep(struct thread_data *td, struct io_u *io_u)
+{
+       struct libaio_options *o = td->eo;
+       if (rand_between(&td->prio_state, 0, 99) < o->cmdprio_percentage) {
+               io_u->iocb.aio_reqprio = IOPRIO_CLASS_RT << IOPRIO_CLASS_SHIFT;
+               io_u->iocb.u.c.flags |= IOCB_FLAG_IOPRIO;
+               io_u->flags |= IO_U_F_PRIORITY;
+       }
+       return;
+}
+
 static struct io_u *fio_libaio_event(struct thread_data *td, int event)
 {
        struct libaio_data *ld = td->io_ops_data;
@@ -213,6 +226,7 @@ static enum fio_q_status fio_libaio_queue(struct thread_data *td,
                                          struct io_u *io_u)
 {
        struct libaio_data *ld = td->io_ops_data;
+       struct libaio_options *o = td->eo;
 
        fio_ro_check(td, io_u);
 
@@ -243,6 +257,9 @@ static enum fio_q_status fio_libaio_queue(struct thread_data *td,
                return FIO_Q_COMPLETED;
        }
 
+       if (o->cmdprio_percentage)
+               fio_libaio_prio_prep(td, io_u);
+
        ld->iocbs[ld->head] = &io_u->iocb;
        ld->io_us[ld->head] = io_u;
        ring_inc(ld, &ld->head, 1);
@@ -366,42 +383,12 @@ static void fio_libaio_cleanup(struct thread_data *td)
        }
 }
 
-static int fio_libaio_old_queue_init(struct libaio_data *ld, unsigned int depth,
-                                    bool hipri)
-{
-       if (hipri) {
-               log_err("fio: polled aio not available on your platform\n");
-               return 1;
-       }
-
-       return io_queue_init(depth, &ld->aio_ctx);
-}
-
-static int fio_libaio_queue_init(struct libaio_data *ld, unsigned int depth,
-                                bool hipri)
-{
-#ifdef __NR_sys_io_setup2
-       int ret, flags = 0;
-
-       if (hipri)
-               flags |= IOCTX_FLAG_IOPOLL;
-
-       ret = syscall(__NR_sys_io_setup2, depth, flags, NULL, NULL,
-                       &ld->aio_ctx);
-       if (!ret)
-               return 0;
-       /* fall through to old syscall */
-#endif
-       return fio_libaio_old_queue_init(ld, depth, hipri);
-}
-
 static int fio_libaio_post_init(struct thread_data *td)
 {
        struct libaio_data *ld = td->io_ops_data;
-       struct libaio_options *o = td->eo;
-       int err = 0;
+       int err;
 
-       err = fio_libaio_queue_init(ld, td->o.iodepth, o->hipri);
+       err = io_queue_init(td->o.iodepth, &ld->aio_ctx);
        if (err) {
                td_verror(td, -err, "io_queue_init");
                return 1;
@@ -413,6 +400,8 @@ static int fio_libaio_post_init(struct thread_data *td)
 static int fio_libaio_init(struct thread_data *td)
 {
        struct libaio_data *ld;
+       struct thread_options *to = &td->o;
+       struct libaio_options *o = td->eo;
 
        ld = calloc(1, sizeof(*ld));
 
@@ -423,6 +412,16 @@ static int fio_libaio_init(struct thread_data *td)
        ld->io_us = calloc(ld->entries, sizeof(struct io_u *));
 
        td->io_ops_data = ld;
+       /*
+        * Check for option conflicts
+        */
+       if ((fio_option_is_set(to, ioprio) || fio_option_is_set(to, ioprio_class)) &&
+                       o->cmdprio_percentage != 0) {
+               log_err("%s: cmdprio_percentage option and mutually exclusive "
+                               "prio or prioclass option is set, exiting\n", to->name);
+               td_verror(td, EINVAL, "fio_libaio_init");
+               return 1;
+       }
        return 0;
 }