X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Flibaio.c;h=a659ba9bc141890b57ff0b29180eb446bf6dc17f;hp=acc125f48e46df799c7d7fdcf0c42daea9694145;hb=145dad6d3e1ae4bf44dd49eea9d0c025500b97d0;hpb=8d714a60ae956c5758fe4b5a75aa6cc31ce7e9eb;ds=sidebyside

diff --git a/engines/libaio.c b/engines/libaio.c
index acc125f4..a659ba9b 100644
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -18,7 +18,9 @@
 struct libaio_data {
 	io_context_t aio_ctx;
 	struct io_event *aio_events;
-	struct io_u *sync_io_u;
+	struct iocb **iocbs;
+	struct io_u **io_us;
+	int iocbs_nr;
 };
 
 static int fio_libaio_prep(struct thread_data fio_unused *td, struct io_u *io_u)
@@ -41,13 +43,6 @@ static struct io_u *fio_libaio_event(struct thread_data *td, int event)
 {
 	struct libaio_data *ld = td->io_ops->data;
 
-	if (ld->sync_io_u) {
-		struct io_u *ret = ld->sync_io_u;
-
-		ld->sync_io_u = NULL;
-		return ret;
-	}
-
 	return ev_to_iou(ld->aio_events + event);
 }
 
@@ -57,9 +52,6 @@ static int fio_libaio_getevents(struct thread_data *td, int min, int max,
 	struct libaio_data *ld = td->io_ops->data;
 	long r;
 
-	if (ld->sync_io_u)
-		return 1;
-
 	do {
 		r = io_getevents(ld->aio_ctx, min, max, ld->aio_events, t);
 		if (r >= min)
@@ -73,48 +65,90 @@ static int fio_libaio_getevents(struct thread_data *td, int min, int max,
 			break;
 	} while (1);
 
-	if (r < 0)
-		r = -r;
-
-	return (int) r;
+	return r;
 }
 
 static int fio_libaio_queue(struct thread_data *td, struct io_u *io_u)
 {
 	struct libaio_data *ld = td->io_ops->data;
-	struct iocb *iocb = &io_u->iocb;
-	long ret;
 
+	if (ld->iocbs_nr == (int) td->iodepth)
+		return FIO_Q_BUSY;
+
+	/*
+	 * fsync is tricky, since it can fail and we need to do it
+	 * serialized with other io. the reason is that linux doesn't
+	 * support aio fsync yet. So return busy for the case where we
+	 * have pending io, to let fio complete those first.
+	 */
+	if (io_u->ddir == DDIR_SYNC) {
+		if (ld->iocbs_nr)
+			return FIO_Q_BUSY;
+		if (fsync(io_u->file->fd) < 0)
+			io_u->error = errno;
+
+		return FIO_Q_COMPLETED;
+	}
+
+	ld->iocbs[ld->iocbs_nr] = &io_u->iocb;
+	ld->io_us[ld->iocbs_nr] = io_u;
+	ld->iocbs_nr++;
+	return FIO_Q_QUEUED;
+}
+
+static void fio_libaio_queued(struct thread_data *td, struct io_u **io_us,
+			      unsigned int nr)
+{
+	struct timeval now;
+	unsigned int i;
+
+	fio_gettime(&now, NULL);
+
+	for (i = 0; i < nr; i++) {
+		struct io_u *io_u = io_us[i];
+
+		memcpy(&io_u->issue_time, &now, sizeof(now));
+		io_u_queued(td, io_u);
+	}
+}
+
+static int fio_libaio_commit(struct thread_data *td)
+{
+	struct libaio_data *ld = td->io_ops->data;
+	struct iocb **iocbs;
+	struct io_u **io_us;
+	int ret, iocbs_nr;
+
+	if (!ld->iocbs_nr)
+		return 0;
+
+	iocbs_nr = ld->iocbs_nr;
+	io_us = ld->io_us;
+	iocbs = ld->iocbs;
 	do {
-		ret = io_submit(ld->aio_ctx, 1, &iocb);
-		if (ret == 1)
-			return 0;
-		else if (ret == -EAGAIN || !ret)
+		ret = io_submit(ld->aio_ctx, iocbs_nr, iocbs);
+		if (ret == iocbs_nr) {
+			fio_libaio_queued(td, io_us, ret);
+			ret = 0;
+			break;
+		} else if (ret > 0) {
+			fio_libaio_queued(td, io_us, ret);
+			io_us += ret;
+			iocbs += ret;
+			iocbs_nr -= ret;
+			continue;
+		} else if (ret == -EAGAIN || !ret)
 			usleep(100);
 		else if (ret == -EINTR)
 			continue;
-		else if (ret == -EINVAL && io_u->ddir == DDIR_SYNC) {
-			/*
-			 * the async fsync doesn't currently seem to be
-			 * supported, so just fsync if we fail with EINVAL
-			 * for a sync. since buffered io is also sync
-			 * with libaio (still), we don't have pending
-			 * requests to flush first.
-			 */
-			ret = fsync(io_u->file->fd);
-			ld->sync_io_u = io_u;
-			break;
-		} else
+		else
 			break;
 	} while (1);
 
-	if (ret <= 0) {
-		io_u->resid = io_u->xfer_buflen;
-		io_u->error = -ret;
-		return 1;
-	}
+	if (!ret)
+		ld->iocbs_nr = 0;
 
-	return 0;
+	return ret;
 }
 
 static int fio_libaio_cancel(struct thread_data *td, struct io_u *io_u)
@@ -130,9 +164,9 @@ static void fio_libaio_cleanup(struct thread_data *td)
 
 	if (ld) {
 		io_destroy(ld->aio_ctx);
-		if (ld->aio_events)
-			free(ld->aio_events);
-
+		free(ld->aio_events);
+		free(ld->iocbs);
+		free(ld->io_us);
 		free(ld);
 		td->io_ops->data = NULL;
 	}
@@ -151,6 +185,12 @@ static int fio_libaio_init(struct thread_data *td)
 
 	ld->aio_events = malloc(td->iodepth * sizeof(struct io_event));
 	memset(ld->aio_events, 0, td->iodepth * sizeof(struct io_event));
+	ld->iocbs = malloc(td->iodepth * sizeof(struct iocb *));
+	memset(ld->iocbs, 0, sizeof(struct iocb *));
+	ld->io_us = malloc(td->iodepth * sizeof(struct io_u *));
+	memset(ld->io_us, 0, td->iodepth * sizeof(struct io_u *));
+	ld->iocbs_nr = 0;
+
 	td->io_ops->data = ld;
 	return 0;
 }
@@ -161,6 +201,7 @@ static struct ioengine_ops ioengine = {
 	.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,