X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Flibaio.c;h=9c278d060b218617d0ab89aa5285a1e010507661;hp=2a4d653467849e0d764c8a0c279e15264f13c690;hb=ed7f3a07363d62c6d6147b0c568f87f079d241a8;hpb=a1b006fe1cd3aa7e1b567f55e5a4c827d54f7c41 diff --git a/engines/libaio.c b/engines/libaio.c index 2a4d6534..9c278d06 100644 --- a/engines/libaio.c +++ b/engines/libaio.c @@ -8,19 +8,27 @@ #include #include #include +#include +#include #include "../fio.h" #include "../lib/pow2.h" #include "../optgroup.h" +#include "../lib/memalign.h" +#include "cmdprio.h" -#ifndef IOCB_FLAG_HIPRI -#define IOCB_FLAG_HIPRI (1 << 2) +/* Should be defined in newest aio_abi.h */ +#ifndef IOCB_FLAG_IOPRIO +#define IOCB_FLAG_IOPRIO (1 << 1) #endif -#ifndef IOCTX_FLAG_IOPOLL -#define IOCTX_FLAG_IOPOLL (1 << 0) + +/* Hack for libaio < 0.3.111 */ +#ifndef CONFIG_LIBAIO_RW_FLAGS +#define aio_rw_flags __pad2 #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; @@ -28,6 +36,8 @@ struct libaio_data { struct iocb **iocbs; struct io_u **io_us; + struct io_u **io_u_index; + /* * Basic ring buffer. 'head' is incremented in _queue(), and * 'tail' is incremented in _commit(). We keep 'queued' so @@ -41,12 +51,15 @@ struct libaio_data { unsigned int queued; unsigned int head; unsigned int tail; + + struct cmdprio cmdprio; }; struct libaio_options { - void *pad; + struct thread_data *td; unsigned int userspace_reap; - unsigned int hipri; + struct cmdprio_options cmdprio_options; + unsigned int nowait; }; static struct fio_option options[] = { @@ -59,12 +72,93 @@ 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_options.percentage[DDIR_READ]), + .off2 = offsetof(struct libaio_options, + cmdprio_options.percentage[DDIR_WRITE]), + .minval = 0, + .maxval = 100, + .help = "Send high priority I/O this percentage of the time", + .category = FIO_OPT_C_ENGINE, + .group = FIO_OPT_G_LIBAIO, + }, + { + .name = "cmdprio_class", + .lname = "Asynchronous I/O priority class", + .type = FIO_OPT_INT, + .off1 = offsetof(struct libaio_options, + cmdprio_options.class[DDIR_READ]), + .off2 = offsetof(struct libaio_options, + cmdprio_options.class[DDIR_WRITE]), + .help = "Set asynchronous IO priority class", + .minval = IOPRIO_MIN_PRIO_CLASS + 1, + .maxval = IOPRIO_MAX_PRIO_CLASS, + .interval = 1, + .category = FIO_OPT_C_ENGINE, + .group = FIO_OPT_G_LIBAIO, + }, + { + .name = "cmdprio", + .lname = "Asynchronous I/O priority level", + .type = FIO_OPT_INT, + .off1 = offsetof(struct libaio_options, + cmdprio_options.level[DDIR_READ]), + .off2 = offsetof(struct libaio_options, + cmdprio_options.level[DDIR_WRITE]), + .help = "Set asynchronous IO priority level", + .minval = IOPRIO_MIN_PRIO, + .maxval = IOPRIO_MAX_PRIO, + .interval = 1, + .category = FIO_OPT_C_ENGINE, + .group = FIO_OPT_G_LIBAIO, + }, + { + .name = "cmdprio_bssplit", + .lname = "Priority percentage block size split", + .type = FIO_OPT_STR_STORE, + .off1 = offsetof(struct libaio_options, + cmdprio_options.bssplit_str), + .help = "Set priority percentages for different block sizes", + .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", + }, + { + .name = "cmdprio_class", + .lname = "Asynchronous I/O priority class", + .type = FIO_OPT_UNSUPPORTED, + .help = "Your platform does not support I/O priority classes", + }, + { + .name = "cmdprio", + .lname = "Asynchronous I/O priority level", + .type = FIO_OPT_UNSUPPORTED, + .help = "Your platform does not support I/O priority classes", + }, + { + .name = "cmdprio_bssplit", + .lname = "Priority percentage block size split", + .type = FIO_OPT_UNSUPPORTED, + .help = "Your platform does not support I/O priority classes", + }, +#endif + { + .name = "nowait", + .lname = "RWF_NOWAIT", + .type = FIO_OPT_BOOL, + .off1 = offsetof(struct libaio_options, nowait), + .help = "Set RWF_NOWAIT for reads/writes", .category = FIO_OPT_C_ENGINE, .group = FIO_OPT_G_LIBAIO, }, @@ -82,25 +176,38 @@ static inline void ring_inc(struct libaio_data *ld, unsigned int *val, *val = (*val + add) % ld->entries; } -static int fio_libaio_prep(struct thread_data fio_unused *td, struct io_u *io_u) +static int fio_libaio_prep(struct thread_data *td, struct io_u *io_u) { - struct fio_file *f = io_u->file; struct libaio_options *o = td->eo; + struct fio_file *f = io_u->file; + struct iocb *iocb = &io_u->iocb; if (io_u->ddir == DDIR_READ) { - io_prep_pread(&io_u->iocb, f->fd, io_u->xfer_buf, io_u->xfer_buflen, io_u->offset); - if (o->hipri) - io_u->iocb.u.c.flags |= IOCB_FLAG_HIPRI; + io_prep_pread(iocb, f->fd, io_u->xfer_buf, io_u->xfer_buflen, io_u->offset); + if (o->nowait) + iocb->aio_rw_flags |= RWF_NOWAIT; } else if (io_u->ddir == DDIR_WRITE) { - io_prep_pwrite(&io_u->iocb, f->fd, io_u->xfer_buf, io_u->xfer_buflen, io_u->offset); - if (o->hipri) - io_u->iocb.u.c.flags |= IOCB_FLAG_HIPRI; + io_prep_pwrite(iocb, f->fd, io_u->xfer_buf, io_u->xfer_buflen, io_u->offset); + if (o->nowait) + iocb->aio_rw_flags |= RWF_NOWAIT; } else if (ddir_sync(io_u->ddir)) - io_prep_fsync(&io_u->iocb, f->fd); + io_prep_fsync(iocb, f->fd); return 0; } +static inline void fio_libaio_cmdprio_prep(struct thread_data *td, + struct io_u *io_u) +{ + struct libaio_data *ld = td->io_ops_data; + struct cmdprio *cmdprio = &ld->cmdprio; + + if (fio_cmdprio_set_ioprio(td, cmdprio, io_u)) { + io_u->iocb.aio_reqprio = io_u->ioprio; + io_u->iocb.u.c.flags |= IOCB_FLAG_IOPRIO; + } +} + static struct io_u *fio_libaio_event(struct thread_data *td, int event) { struct libaio_data *ld = td->io_ops_data; @@ -153,8 +260,8 @@ static int user_io_getevents(io_context_t aio_ctx, unsigned int max, } else { /* There is another completion to reap */ events[i] = ring->events[head]; - read_barrier(); - ring->head = (head + 1) % ring->nr; + atomic_store_release(&ring->head, + (head + 1) % ring->nr); i++; } } @@ -234,6 +341,9 @@ static enum fio_q_status fio_libaio_queue(struct thread_data *td, return FIO_Q_COMPLETED; } + if (ld->cmdprio.mode != CMDPRIO_MODE_NONE) + fio_libaio_cmdprio_prep(td, io_u); + ld->iocbs[ld->head] = &io_u->iocb; ld->io_us[ld->head] = io_u; ring_inc(ld, &ld->head, 1); @@ -350,6 +460,8 @@ static void fio_libaio_cleanup(struct thread_data *td) */ if (!(td->flags & TD_F_CHILD)) io_destroy(ld->aio_ctx); + + fio_cmdprio_cleanup(&ld->cmdprio); free(ld->aio_events); free(ld->iocbs); free(ld->io_us); @@ -357,46 +469,28 @@ static void fio_libaio_cleanup(struct thread_data *td) } } -static int fio_libaio_queue_init(struct libaio_data *ld, unsigned int depth, - bool hipri) +static int fio_libaio_post_init(struct thread_data *td) { -#ifdef __NR_sys_io_setup2 - int flags = 0; - - if (hipri) - flags = IOCTX_FLAG_IOPOLL; + struct libaio_data *ld = td->io_ops_data; + int err; - return syscall(__NR_sys_io_setup2, depth, flags, &ld->aio_ctx); -#else - if (hipri) { - log_err("fio: polled aio not available on your platform\n"); + err = io_queue_init(td->o.iodepth, &ld->aio_ctx); + if (err) { + td_verror(td, -err, "io_queue_init"); return 1; } - return io_queue_init(depth, &ld->aio_ctx); -#endif + + return 0; } static int fio_libaio_init(struct thread_data *td) { - struct libaio_options *o = td->eo; struct libaio_data *ld; - int err = 0; + struct libaio_options *o = td->eo; + int ret; ld = calloc(1, sizeof(*ld)); - /* - * First try passing in 0 for queue depth, since we don't - * care about the user ring. If that fails, the kernel is too old - * and we need the right depth. - */ - err = fio_libaio_queue_init(ld, td->o.iodepth, o->hipri); - if (err) { - td_verror(td, -err, "io_queue_init"); - log_err("fio: check /proc/sys/fs/aio-max-nr\n"); - free(ld); - return 1; - } - ld->entries = td->o.iodepth; ld->is_pow2 = is_power_of_2(ld->entries); ld->aio_events = calloc(ld->entries, sizeof(struct io_event)); @@ -404,13 +498,22 @@ static int fio_libaio_init(struct thread_data *td) ld->io_us = calloc(ld->entries, sizeof(struct io_u *)); td->io_ops_data = ld; + + ret = fio_cmdprio_init(td, &ld->cmdprio, &o->cmdprio_options); + if (ret) { + td_verror(td, EINVAL, "fio_libaio_init"); + return 1; + } + return 0; } -static struct ioengine_ops ioengine = { +FIO_STATIC struct ioengine_ops ioengine = { .name = "libaio", .version = FIO_IOOPS_VERSION, + .flags = FIO_ASYNCIO_SYNC_TRIM, .init = fio_libaio_init, + .post_init = fio_libaio_post_init, .prep = fio_libaio_prep, .queue = fio_libaio_queue, .commit = fio_libaio_commit,