gfio: improve option edit

[fio.git] / engines / libaio.c

diff --git a/engines/libaio.c b/engines/libaio.c
index c837ab6bb9e4e9af10553bff980cc318e7274821..2b8c6dac533c8bf2c9f1cdd0cc02e7ba7a599b72 100644 (file)
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -24,6 +24,25 @@ struct libaio_data {
        int iocbs_nr;
 };
 
+struct libaio_options {
+       struct thread_data *td;
+       unsigned int userspace_reap;
+};
+
+static struct fio_option options[] = {
+       {
+               .name   = "userspace_reap",
+               .lname  = "Libaio userspace reaping",
+               .type   = FIO_OPT_STR_SET,
+               .off1   = offsetof(struct libaio_options, userspace_reap),
+               .help   = "Use alternative user-space reap implementation",
+               .category = FIO_OPT_C_IO,
+       },
+       {
+               .name   = NULL,
+       },
+};
+
 static int fio_libaio_prep(struct thread_data fio_unused *td, struct io_u *io_u)
 {
        struct fio_file *f = io_u->file;
@@ -58,15 +77,66 @@ static struct io_u *fio_libaio_event(struct thread_data *td, int event)
        return io_u;
 }
 
+struct aio_ring {
+       unsigned id;             /** kernel internal index number */
+       unsigned nr;             /** number of io_events */
+       unsigned head;
+       unsigned tail;
+
+       unsigned magic;
+       unsigned compat_features;
+       unsigned incompat_features;
+       unsigned header_length; /** size of aio_ring */
+
+       struct io_event events[0];
+};
+
+#define AIO_RING_MAGIC 0xa10a10a1
+
+static int user_io_getevents(io_context_t aio_ctx, unsigned int max,
+                            struct io_event *events)
+{
+       long i = 0;
+       unsigned head;
+       struct aio_ring *ring = (struct aio_ring*) aio_ctx;
+
+       while (i < max) {
+               head = ring->head;
+
+               if (head == ring->tail) {
+                       /* There are no more completions */
+                       break;
+               } else {
+                       /* There is another completion to reap */
+                       events[i] = ring->events[head];
+                       read_barrier();
+                       ring->head = (head + 1) % ring->nr;
+                       i++;
+               }
+       }
+
+       return i;
+}
+
 static int fio_libaio_getevents(struct thread_data *td, unsigned int min,
                                unsigned int max, struct timespec *t)
 {
        struct libaio_data *ld = td->io_ops->data;
+       struct libaio_options *o = td->eo;
        unsigned actual_min = td->o.iodepth_batch_complete == 0 ? 0 : min;
        int r, events = 0;
 
        do {
-               r = io_getevents(ld->aio_ctx, actual_min, max, ld->aio_events + events, t);
+               if (o->userspace_reap == 1
+                   && actual_min == 0
+                   && ((struct aio_ring *)(ld->aio_ctx))->magic
+                               == AIO_RING_MAGIC) {
+                       r = user_io_getevents(ld->aio_ctx, max,
+                               ld->aio_events + events);
+               } else {
+                       r = io_getevents(ld->aio_ctx, actual_min,
+                               max, ld->aio_events + events, t);
+               }
                if (r >= 0)
                        events += r;
                else if (r == -EAGAIN)
@@ -212,19 +282,21 @@ static int fio_libaio_init(struct thread_data *td)
 }
 
 static struct ioengine_ops ioengine = {
-       .name           = "libaio",
-       .version        = FIO_IOOPS_VERSION,
-       .init           = fio_libaio_init,
-       .prep           = fio_libaio_prep,
-       .queue          = fio_libaio_queue,
-       .commit         = fio_libaio_commit,
-       .cancel         = fio_libaio_cancel,
-       .getevents      = fio_libaio_getevents,
-       .event          = fio_libaio_event,
-       .cleanup        = fio_libaio_cleanup,
-       .open_file      = generic_open_file,
-       .close_file     = generic_close_file,
-       .get_file_size  = generic_get_file_size,
+       .name                   = "libaio",
+       .version                = FIO_IOOPS_VERSION,
+       .init                   = fio_libaio_init,
+       .prep                   = fio_libaio_prep,
+       .queue                  = fio_libaio_queue,
+       .commit                 = fio_libaio_commit,
+       .cancel                 = fio_libaio_cancel,
+       .getevents              = fio_libaio_getevents,
+       .event                  = fio_libaio_event,
+       .cleanup                = fio_libaio_cleanup,
+       .open_file              = generic_open_file,
+       .close_file             = generic_close_file,
+       .get_file_size          = generic_get_file_size,
+       .options                = options,
+       .option_struct_size     = sizeof(struct libaio_options),
 };
 
 #else /* FIO_HAVE_LIBAIO */