X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Fsyslet-rw.c;h=d225cc41630d0a4838da6d41ae1b7da485f11fa6;hp=fe400daa501dd4e8e31ecc1db6129ab7fb0bc921;hb=946ff86535e86f9b1be618bd4b8ae925343f1df3;hpb=e2e679121ec5b16486fe190dad334107941e05a5

diff --git a/engines/syslet-rw.c b/engines/syslet-rw.c
index fe400daa..d225cc41 100644
--- a/engines/syslet-rw.c
+++ b/engines/syslet-rw.c
@@ -1,5 +1,8 @@
 /*
- * read/write() engine that uses syslet to be async
+ * syslet engine
+ *
+ * IO engine that does regular pread(2)/pwrite(2) to transfer data, but
+ * with syslets to make the execution async.
  *
  */
 #include <stdio.h>
@@ -7,12 +10,21 @@
 #include <unistd.h>
 #include <errno.h>
 #include <assert.h>
+#include <asm/unistd.h>
 
 #include "../fio.h"
 #include "../os.h"
 
 #ifdef FIO_HAVE_SYSLET
 
+#ifdef __NR_pread64
+#define __NR_fio_pread	__NR_pread64
+#define __NR_fio_pwrite	__NR_pwrite64
+#else
+#define __NR_fio_pread	__NR_pread
+#define __NR_fio_pwrite	__NR_pwrite
+#endif
+
 struct syslet_data {
 	struct io_u **events;
 	unsigned int nr_events;
@@ -51,7 +63,7 @@ static void fio_syslet_complete_atom(struct thread_data *td,
 		else if (ret < 0)
 			io_u->error = ret;
 
-		assert(sd->nr_events < td->iodepth);
+		assert(sd->nr_events < td->o.iodepth);
 		sd->events[sd->nr_events++] = io_u;
 
 		if (atom == last)
@@ -78,7 +90,7 @@ static void fio_syslet_complete(struct thread_data *td)
 			break;
 
 		sd->ring[sd->ahu.user_ring_idx] = NULL;
-		if (++sd->ahu.user_ring_idx == td->iodepth)
+		if (++sd->ahu.user_ring_idx == td->o.iodepth)
 			sd->ahu.user_ring_idx = 0;
 
 		fio_syslet_complete_atom(td, atom);
@@ -154,9 +166,9 @@ static void fio_syslet_prep_rw(struct io_u *io_u, struct fio_file *f)
 	 * prepare rw
 	 */
 	if (io_u->ddir == DDIR_READ)
-		nr = __NR_pread64;
+		nr = __NR_fio_pread;
 	else
-		nr = __NR_pwrite64;
+		nr = __NR_fio_pwrite;
 
 	init_atom(&io_u->req.atom, nr, &f->fd, &io_u->xfer_buf,
 		  &io_u->xfer_buflen, &io_u->offset, &io_u->req.ret, 0, io_u);
@@ -225,6 +237,11 @@ static int fio_syslet_commit(struct thread_data *td)
 	 */
 	done = async_exec(sd->head, &sd->ahu);
 
+	if (done == (void *) -1) {
+		log_err("fio: syslets don't appear to work\n");
+		return -1;
+	}
+
 	sd->head = sd->tail = NULL;
 
 	if (done)
@@ -272,6 +289,19 @@ static void async_head_exit(struct syslet_data *sd)
 	free(sd->ring);
 }
 
+static int check_syslet_support(struct syslet_data *sd)
+{
+	struct syslet_uatom atom;
+	void *ret;
+
+	init_atom(&atom, __NR_getpid, NULL, NULL, NULL, NULL, NULL, 0, NULL);
+	ret = async_exec(sd->head, &sd->ahu);
+	if (ret == (void *) -1)
+		return 1;
+
+	return 0;
+}
+
 static void fio_syslet_cleanup(struct thread_data *td)
 {
 	struct syslet_data *sd = td->io_ops->data;
@@ -288,16 +318,22 @@ static int fio_syslet_init(struct thread_data *td)
 {
 	struct syslet_data *sd;
 
-
 	sd = malloc(sizeof(*sd));
 	memset(sd, 0, sizeof(*sd));
-	sd->events = malloc(sizeof(struct io_u *) * td->iodepth);
-	memset(sd->events, 0, sizeof(struct io_u *) * td->iodepth);
+	sd->events = malloc(sizeof(struct io_u *) * td->o.iodepth);
+	memset(sd->events, 0, sizeof(struct io_u *) * td->o.iodepth);
 
 	/*
 	 * This will handily fail for kernels where syslet isn't available
 	 */
-	if (async_head_init(sd, td->iodepth)) {
+	if (async_head_init(sd, td->o.iodepth)) {
+		free(sd->events);
+		free(sd);
+		return 1;
+	}
+
+	if (check_syslet_support(sd)) {
+		log_err("fio: syslets do not appear to work\n");
 		free(sd->events);
 		free(sd);
 		return 1;