X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Flibaio.c;h=60dc49d3352a950fa522931ccdfe52a601628975;hb=592bf4581264dcb7959359a93bbddd46d12794ab;hp=cd10aabfe831c772602cc9523756e27dcc4f310a;hpb=1f440ece6127d2d274b961b6af0aa9091787702a;p=fio.git

diff --git a/engines/libaio.c b/engines/libaio.c
index cd10aabf..60dc49d3 100644
--- a/engines/libaio.c
+++ b/engines/libaio.c
@@ -12,6 +12,9 @@
 #include <libaio.h>
 
 #include "../fio.h"
+#include "../lib/pow2.h"
+
+static int fio_libaio_commit(struct thread_data *td);
 
 struct libaio_data {
 	io_context_t aio_ctx;
@@ -35,7 +38,7 @@ struct libaio_data {
 };
 
 struct libaio_options {
-	struct thread_data *td;
+	void *pad;
 	unsigned int userspace_reap;
 };
 
@@ -143,7 +146,7 @@ static int fio_libaio_getevents(struct thread_data *td, unsigned int min,
 {
 	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;
+	unsigned actual_min = td->o.iodepth_batch_complete_min == 0 ? 0 : min;
 	struct timespec __lt, *lt = NULL;
 	int r, events = 0;
 
@@ -163,10 +166,13 @@ static int fio_libaio_getevents(struct thread_data *td, unsigned int min,
 			r = io_getevents(ld->aio_ctx, actual_min,
 				max, ld->aio_events + events, lt);
 		}
-		if (r >= 0)
+		if (r > 0)
 			events += r;
-		else if (r == -EAGAIN)
+		else if ((min && r == 0) || r == -EAGAIN) {
+			fio_libaio_commit(td);
 			usleep(100);
+		} else if (r != -EINTR)
+			break;
 	} while (events < min);
 
 	return r < 0 ? r : events;
@@ -234,7 +240,8 @@ 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;
+	struct timeval tv;
+	int ret, wait_start = 0;
 
 	if (!ld->queued)
 		return 0;
@@ -254,21 +261,46 @@ static int fio_libaio_commit(struct thread_data *td)
 			ld->queued -= ret;
 			ring_inc(ld, &ld->tail, ret);
 			ret = 0;
+			wait_start = 0;
 		} else if (ret == -EINTR || !ret) {
 			if (!ret)
 				io_u_mark_submit(td, ret);
+			wait_start = 0;
 			continue;
 		} else if (ret == -EAGAIN) {
 			/*
 			 * If we get EAGAIN, we should break out without
 			 * error and let the upper layer reap some
-			 * events for us.
+			 * events for us. If we have no queued IO, we
+			 * must loop here. If we loop for more than 30s,
+			 * just error out, something must be buggy in the
+			 * IO path.
 			 */
-			ret = 0;
+			if (ld->queued) {
+				ret = 0;
+				break;
+			}
+			if (!wait_start) {
+				fio_gettime(&tv, NULL);
+				wait_start = 1;
+			} else if (mtime_since_now(&tv) > 30000) {
+				log_err("fio: aio appears to be stalled, giving up\n");
+				break;
+			}
+			usleep(1);
+			continue;
+		} else if (ret == -ENOMEM) {
+			/*
+			 * If we get -ENOMEM, reap events if we can. If
+			 * we cannot, treat it as a fatal event since there's
+			 * nothing we can do about it.
+			 */
+			if (ld->queued)
+				ret = 0;
 			break;
 		} else
 			break;
-	} while (ld->head != ld->tail);
+	} while (ld->queued);
 
 	return ret;
 }
@@ -285,7 +317,14 @@ static void fio_libaio_cleanup(struct thread_data *td)
 	struct libaio_data *ld = td->io_ops->data;
 
 	if (ld) {
-		io_destroy(ld->aio_ctx);
+		/*
+		 * Work-around to avoid huge RCU stalls at exit time. If we
+		 * don't do this here, then it'll be torn down by exit_aio().
+		 * But for that case we can parallellize the freeing, thus
+		 * speeding it up a lot.
+		 */
+		if (!(td->flags & TD_F_CHILD))
+			io_destroy(ld->aio_ctx);
 		free(ld->aio_events);
 		free(ld->iocbs);
 		free(ld->io_us);