#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_USERIOCB
+#define IOCTX_FLAG_USERIOCB (1 << 0)
+#endif
#ifndef IOCTX_FLAG_IOPOLL
-#define IOCTX_FLAG_IOPOLL (1 << 0)
+#define IOCTX_FLAG_IOPOLL (1 << 1)
#endif
-#ifndef IOCTX_FLAG_USERIOCB
-#define IOCTX_FLAG_USERIOCB (1 << 1)
+#ifndef IOCTX_FLAG_FIXEDBUFS
+#define IOCTX_FLAG_FIXEDBUFS (1 << 2)
#endif
-
static int fio_libaio_commit(struct thread_data *td);
struct libaio_data {
unsigned int userspace_reap;
unsigned int hipri;
unsigned int useriocb;
+ unsigned int fixedbufs;
};
static struct fio_option options[] = {
.category = FIO_OPT_C_ENGINE,
.group = FIO_OPT_G_LIBAIO,
},
+ {
+ .name = "fixedbufs",
+ .lname = "Fixed (pre-mapped) IO buffers",
+ .type = FIO_OPT_STR_SET,
+ .off1 = offsetof(struct libaio_options, fixedbufs),
+ .help = "Pre map IO buffers",
+ .category = FIO_OPT_C_ENGINE,
+ .group = FIO_OPT_G_LIBAIO,
+ },
{
.name = NULL,
},
else
iocb = &io_u->iocb;
+ iocb->u.c.flags = 0;
+
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)
free(ld->aio_events);
free(ld->iocbs);
free(ld->io_us);
- if (ld->user_iocbs)
- free(ld->user_iocbs);
+ if (ld->user_iocbs) {
+ size_t size = td->o.iodepth * sizeof(struct iocb);
+ fio_memfree(ld->user_iocbs, size, false);
+ }
free(ld);
}
}
+static int fio_libaio_old_queue_init(struct libaio_data *ld, unsigned int depth,
+ bool hipri, bool useriocb, bool fixedbufs)
+{
+ 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;
+ }
+ if (fixedbufs) {
+ log_err("fio: fixed buffers 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, bool useriocb)
+ bool hipri, bool useriocb, bool fixedbufs)
{
#ifdef __NR_sys_io_setup2
- int flags = 0;
+ int ret, flags = 0;
if (hipri)
flags |= IOCTX_FLAG_IOPOLL;
if (useriocb)
flags |= IOCTX_FLAG_USERIOCB;
+ if (fixedbufs)
+ flags |= IOCTX_FLAG_FIXEDBUFS;
- 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;
+ ret = syscall(__NR_sys_io_setup2, depth, flags, ld->user_iocbs,
+ &ld->aio_ctx);
+ if (!ret)
+ return 0;
+ /* fall through to old syscall */
+#endif
+ return fio_libaio_old_queue_init(ld, depth, hipri, useriocb, fixedbufs);
+}
+
+static int fio_libaio_post_init(struct thread_data *td)
+{
+ struct libaio_data *ld = td->io_ops_data;
+ struct libaio_options *o = td->eo;
+ struct io_u *io_u;
+ struct iocb *iocb;
+ int err = 0;
+
+ if (o->fixedbufs) {
+ int i;
+
+ for (i = 0; i < td->o.iodepth; i++) {
+ io_u = ld->io_u_index[i];
+ iocb = &ld->user_iocbs[i];
+ iocb->u.c.buf = io_u->buf;
+ iocb->u.c.nbytes = io_u->buflen;
+ }
}
- if (useriocb) {
- log_err("fio: user mapped iocbs not available on your platform\n");
+
+ err = fio_libaio_queue_init(ld, td->o.iodepth, o->hipri, o->useriocb,
+ o->fixedbufs);
+ 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;
ld = calloc(1, sizeof(*ld));
if (o->useriocb) {
size_t size;
- void *p;
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;
- }
-
- /*
- * 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);
- 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->user_iocbs = fio_memalign(page_size, size, false);
+ memset(ld->user_iocbs, 0, size);
}
ld->entries = td->o.iodepth;
.name = "libaio",
.version = FIO_IOOPS_VERSION,
.init = fio_libaio_init,
+ .post_init = fio_libaio_post_init,
.io_u_init = fio_libaio_io_u_init,
.prep = fio_libaio_prep,
.queue = fio_libaio_queue,
projects / fio.git / blobdiff