#include <unistd.h>
#include <errno.h>
#include <libaio.h>
+#include <sys/time.h>
+#include <sys/resource.h>
#include "../fio.h"
#include "../lib/pow2.h"
#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)
#endif
-#ifndef IOCTX_FLAG_USERIOCB
-#define IOCTX_FLAG_USERIOCB (1 << 1)
-#endif
-
static int fio_libaio_commit(struct thread_data *td);
struct iocb **iocbs;
struct io_u **io_us;
- struct iocb *user_iocbs;
struct io_u **io_u_index;
/*
void *pad;
unsigned int userspace_reap;
unsigned int hipri;
- unsigned int useriocb;
};
static struct fio_option options[] = {
.category = FIO_OPT_C_ENGINE,
.group = FIO_OPT_G_LIBAIO,
},
- {
- .name = "useriocb",
- .lname = "User IOCBs",
- .type = FIO_OPT_STR_SET,
- .off1 = offsetof(struct libaio_options, useriocb),
- .help = "Use user mapped IOCBs",
- .category = FIO_OPT_C_ENGINE,
- .group = FIO_OPT_G_LIBAIO,
- },
{
.name = NULL,
},
static int fio_libaio_prep(struct thread_data fio_unused *td, struct io_u *io_u)
{
- struct libaio_data *ld = td->io_ops_data;
struct fio_file *f = io_u->file;
struct libaio_options *o = td->eo;
struct iocb *iocb;
- if (o->useriocb)
- iocb = &ld->user_iocbs[io_u->index];
- else
- iocb = &io_u->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);
static struct io_u *fio_libaio_event(struct thread_data *td, int event)
{
struct libaio_data *ld = td->io_ops_data;
- struct libaio_options *o = td->eo;
struct io_event *ev;
struct io_u *io_u;
ev = ld->aio_events + event;
- if (o->useriocb) {
- int index = (int) (uintptr_t) ev->obj;
- io_u = ld->io_u_index[index];
- } else
- io_u = container_of(ev->obj, struct io_u, iocb);
+ io_u = container_of(ev->obj, struct io_u, iocb);
if (ev->res != io_u->xfer_buflen) {
if (ev->res > io_u->xfer_buflen)
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);
return FIO_Q_COMPLETED;
}
- if (o->useriocb)
- ld->iocbs[ld->head] = (struct iocb *) (uintptr_t) io_u->index;
- else
- ld->iocbs[ld->head] = &io_u->iocb;
-
+ ld->iocbs[ld->head] = &io_u->iocb;
ld->io_us[ld->head] = io_u;
ring_inc(ld, &ld->head, 1);
ld->queued++;
free(ld->aio_events);
free(ld->iocbs);
free(ld->io_us);
- if (ld->user_iocbs)
- free(ld->user_iocbs);
free(ld);
}
}
-static int fio_libaio_queue_init(struct libaio_data *ld, unsigned int depth,
- bool hipri, bool useriocb)
+static int fio_libaio_old_queue_init(struct libaio_data *ld, unsigned int depth,
+ bool hipri)
{
-#ifdef __NR_sys_io_setup2
- int flags = 0;
-
- if (hipri)
- flags |= IOCTX_FLAG_IOPOLL;
- if (useriocb)
- flags |= IOCTX_FLAG_USERIOCB;
-
- return syscall(__NR_sys_io_setup2, depth, flags, ld->user_iocbs, &ld->aio_ctx);
-#else
if (hipri) {
log_err("fio: polled aio not available on your platform\n");
return 1;
}
- if (useriocb) {
- log_err("fio: user mapped iocbs not available on your platform\n");
- return 1;
- }
return io_queue_init(depth, &ld->aio_ctx);
-#endif
}
-static int fio_libaio_init(struct thread_data *td)
+static int fio_libaio_queue_init(struct libaio_data *ld, unsigned int depth,
+ bool hipri)
{
- struct libaio_options *o = td->eo;
- struct libaio_data *ld;
- int err = 0;
+#ifdef __NR_sys_io_setup2
+ int ret, flags = 0;
- ld = calloc(1, sizeof(*ld));
+ if (hipri)
+ flags |= IOCTX_FLAG_IOPOLL;
- if (o->useriocb) {
- size_t size;
- void *p;
+ 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);
+}
- ld->io_u_index = calloc(td->o.iodepth, sizeof(struct io_u *));
- size = td->o.iodepth * sizeof(struct iocb);
- if (posix_memalign(&p, page_size, size)) {
- log_err("fio: libaio iocb allocation failure\n");
- free(ld);
- return 1;
- }
- ld->user_iocbs = p;
- }
+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;
- /*
- * 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, o->useriocb);
+ 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");
- if (ld->user_iocbs)
- free(ld->user_iocbs);
- 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));
- ld->iocbs = calloc(ld->entries, sizeof(struct iocb *));
- ld->io_us = calloc(ld->entries, sizeof(struct io_u *));
-
- td->io_ops_data = ld;
return 0;
}
-static int fio_libaio_io_u_init(struct thread_data *td, struct io_u *io_u)
+static int fio_libaio_init(struct thread_data *td)
{
- struct libaio_options *o = td->eo;
+ struct libaio_data *ld;
- if (o->useriocb) {
- struct libaio_data *ld = td->io_ops_data;
+ ld = calloc(1, sizeof(*ld));
- ld->io_u_index[io_u->index] = io_u;
- }
+ ld->entries = td->o.iodepth;
+ ld->is_pow2 = is_power_of_2(ld->entries);
+ ld->aio_events = calloc(ld->entries, sizeof(struct io_event));
+ ld->iocbs = calloc(ld->entries, sizeof(struct iocb *));
+ ld->io_us = calloc(ld->entries, sizeof(struct io_u *));
+ td->io_ops_data = ld;
return 0;
}
.name = "libaio",
.version = FIO_IOOPS_VERSION,
.init = fio_libaio_init,
- .io_u_init = fio_libaio_io_u_init,
+ .post_init = fio_libaio_post_init,
.prep = fio_libaio_prep,
.queue = fio_libaio_queue,
.commit = fio_libaio_commit,
projects / fio.git / blobdiff