X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Fsg.c;h=3a6a2486b758df41ea749482c88efa91b2378ae4;hp=877264acd15b3316f4abd6b2c5002f09177f83df;hb=b5af82930ccfd7dda6a1b11794efb452eb76d8dc;hpb=adee86c56189017f7e11fc3e2d5e074674333d60;ds=sidebyside

diff --git a/engines/sg.c b/engines/sg.c
index 877264ac..3a6a2486 100644
--- a/engines/sg.c
+++ b/engines/sg.c
@@ -22,7 +22,11 @@ struct sgio_cmd {
 struct sgio_data {
 	struct sgio_cmd *cmds;
 	struct io_u **events;
+	struct pollfd *pfds;
+	int *fd_flags;
+	void *sgbuf;
 	unsigned int bs;
+	int type_checked;
 };
 
 static void sgio_hdr_init(struct sgio_data *sd, struct sg_io_hdr *hdr,
@@ -45,21 +49,6 @@ static void sgio_hdr_init(struct sgio_data *sd, struct sg_io_hdr *hdr,
 	}
 }
 
-static int fio_sgio_ioctl_getevents(struct thread_data *td, int fio_unused min,
-				    int max, struct timespec fio_unused *t)
-{
-	assert(max <= 1);
-
-	/*
-	 * we can only have one finished io_u for sync io, since the depth
-	 * is always 1
-	 */
-	if (list_empty(&td->io_u_busylist))
-		return 0;
-
-	return 1;
-}
-
 static int pollin_events(struct pollfd *pfds, int fds)
 {
 	int i;
@@ -80,29 +69,24 @@ static int fio_sgio_getevents(struct thread_data *td, int min, int max,
 	 */
 	struct fio_file *f = &td->files[0];
 	struct sgio_data *sd = td->io_ops->data;
-	int left = max, ret, events, i, r = 0, *fl;
-	struct pollfd *pfds;
-	void *buf;
+	int left = max, ret, events, i, r = 0;
+	void *buf = sd->sgbuf;
 
 	/*
 	 * Fill in the file descriptors
 	 */
-	pfds = malloc(sizeof(struct pollfd) * td->nr_files);
-	fl = malloc(sizeof(int) * td->nr_files);
-
 	for_each_file(td, f, i) {
 		/*
 		 * don't block for min events == 0
 		 */
 		if (!min) {
-			fl[i] = fcntl(f->fd, F_GETFL);
-			fcntl(f->fd, F_SETFL, fl[i] | O_NONBLOCK);
+			sd->fd_flags[i] = fcntl(f->fd, F_GETFL);
+			fcntl(f->fd, F_SETFL, sd->fd_flags[i] | O_NONBLOCK);
 		}
-		pfds[i].fd = f->fd;
-		pfds[i].events = POLLIN;
+		sd->pfds[i].fd = f->fd;
+		sd->pfds[i].events = POLLIN;
 	}
 
-	buf = malloc(max * sizeof(struct sg_io_hdr));
 	while (left) {
 		void *p;
 
@@ -110,16 +94,16 @@ static int fio_sgio_getevents(struct thread_data *td, int min, int max,
 			if (!min)
 				break;
 
-			ret = poll(pfds, td->nr_files, -1);
+			ret = poll(sd->pfds, td->nr_files, -1);
 			if (ret < 0) {
-				td_verror(td, errno);
 				if (!r)
-					r = -1;
+					r = -errno;
+				td_verror(td, errno, "poll");
 				break;
 			} else if (!ret)
 				continue;
 
-			if (pollin_events(pfds, td->nr_files))
+			if (pollin_events(sd->pfds, td->nr_files))
 				break;
 		} while (1);
 
@@ -134,8 +118,8 @@ re_read:
 			if (ret < 0) {
 				if (errno == EAGAIN)
 					continue;
-				td_verror(td, errno);
-				r = -1;
+				r = -errno;
+				td_verror(td, errno, "read");
 				break;
 			} else if (ret) {
 				p += ret;
@@ -162,12 +146,9 @@ re_read:
 
 	if (!min) {
 		for_each_file(td, f, i)
-			fcntl(f->fd, F_SETFL, fl[i]);
+			fcntl(f->fd, F_SETFL, sd->fd_flags[i]);
 	}
 
-	free(buf);
-	free(pfds);
-	free(fl);
 	return r;
 }
 
@@ -176,10 +157,15 @@ static int fio_sgio_ioctl_doio(struct thread_data *td,
 {
 	struct sgio_data *sd = td->io_ops->data;
 	struct sg_io_hdr *hdr = &io_u->hdr;
+	int ret;
 
 	sd->events[0] = io_u;
 
-	return ioctl(f->fd, SG_IO, hdr);
+	ret = ioctl(f->fd, SG_IO, hdr);
+	if (ret < 0)
+		return -errno;
+
+	return FIO_Q_COMPLETED;
 }
 
 static int fio_sgio_rw_doio(struct fio_file *f, struct io_u *io_u, int sync)
@@ -194,10 +180,11 @@ static int fio_sgio_rw_doio(struct fio_file *f, struct io_u *io_u, int sync)
 	if (sync) {
 		ret = read(f->fd, hdr, sizeof(*hdr));
 		if (ret < 0)
-			return errno;
+			return -errno;
+		return FIO_Q_COMPLETED;
 	}
 
-	return 0;
+	return FIO_Q_QUEUED;
 }
 
 static int fio_sgio_doio(struct thread_data *td, struct io_u *io_u, int sync)
@@ -266,7 +253,12 @@ static int fio_sgio_queue(struct thread_data *td, struct io_u *io_u)
 		io_u->error = EIO;
 	}
 
-	return io_u->error;
+	if (io_u->error) {
+		td_verror(td, io_u->error, "xfer");
+		return FIO_Q_COMPLETED;
+	}
+
+	return ret;
 }
 
 static struct io_u *fio_sgio_event(struct thread_data *td, int event)
@@ -285,6 +277,7 @@ static int fio_sgio_get_bs(struct thread_data *td, unsigned int *bs)
 	int ret;
 
 	io_u = __get_io_u(td);
+	io_u->file = &td->files[0];
 	assert(io_u);
 
 	hdr = &io_u->hdr;
@@ -309,18 +302,23 @@ static int fio_sgio_get_bs(struct thread_data *td, unsigned int *bs)
 
 static void fio_sgio_cleanup(struct thread_data *td)
 {
-	if (td->io_ops->data) {
-		free(td->io_ops->data);
+	struct sgio_data *sd = td->io_ops->data;
+
+	if (sd) {
+		free(sd->events);
+		free(sd->cmds);
+		free(sd->fd_flags);
+		free(sd->pfds);
+		free(sd->sgbuf);
+		free(sd);
+
 		td->io_ops->data = NULL;
 	}
 }
 
 static int fio_sgio_init(struct thread_data *td)
 {
-	struct fio_file *f = &td->files[0];
 	struct sgio_data *sd;
-	unsigned int bs;
-	int ret;
 
 	sd = malloc(sizeof(*sd));
 	memset(sd, 0, sizeof(*sd));
@@ -328,47 +326,73 @@ static int fio_sgio_init(struct thread_data *td)
 	memset(sd->cmds, 0, td->iodepth * sizeof(struct sgio_cmd));
 	sd->events = malloc(td->iodepth * sizeof(struct io_u *));
 	memset(sd->events, 0, td->iodepth * sizeof(struct io_u *));
+	sd->pfds = malloc(sizeof(struct pollfd) * td->nr_files);
+	memset(sd->pfds, 0, sizeof(struct pollfd) * td->nr_files);
+	sd->fd_flags = malloc(sizeof(int) * td->nr_files);
+	memset(sd->fd_flags, 0, sizeof(int) * td->nr_files);
+	sd->sgbuf = malloc(sizeof(struct sg_io_hdr) * td->iodepth);
+	memset(sd->sgbuf, 0, sizeof(struct sg_io_hdr) * td->iodepth);
+
 	td->io_ops->data = sd;
 
+	/*
+	 * we want to do it, regardless of whether odirect is set or not
+	 */
+	td->override_sync = 1;
+	return 0;
+}
+
+static int fio_sgio_type_check(struct thread_data *td, struct fio_file *f)
+{
+	struct sgio_data *sd = td->io_ops->data;
+	unsigned int bs;
+
 	if (td->filetype == FIO_TYPE_BD) {
 		if (ioctl(f->fd, BLKSSZGET, &bs) < 0) {
-			td_verror(td, errno);
-			goto err;
+			td_verror(td, errno, "ioctl");
+			return 1;
 		}
 	} else if (td->filetype == FIO_TYPE_CHAR) {
-		int version;
+		int version, ret;
 
 		if (ioctl(f->fd, SG_GET_VERSION_NUM, &version) < 0) {
-			td_verror(td, errno);
-			goto err;
+			td_verror(td, errno, "ioctl");
+			return 1;
 		}
 
 		ret = fio_sgio_get_bs(td, &bs);
 		if (ret)
-			goto err;
+			return 1;
 	} else {
 		log_err("ioengine sgio only works on block devices\n");
-		goto err;
+		return 1;
 	}
 
 	sd->bs = bs;
 
-	if (td->filetype == FIO_TYPE_BD)
-		td->io_ops->getevents = fio_sgio_ioctl_getevents;
-	else
-		td->io_ops->getevents = fio_sgio_getevents;
+	if (td->filetype == FIO_TYPE_BD) {
+		td->io_ops->getevents = NULL;
+		td->io_ops->event = NULL;
+	}
+
+	return 0;
+}
+
+static int fio_sgio_open(struct thread_data *td, struct fio_file *f)
+{
+	struct sgio_data *sd = td->io_ops->data;
+	int ret;
+
+	ret = generic_open_file(td, f);
+	if (ret)
+		return ret;
+
+	if (!sd->type_checked && fio_sgio_type_check(td, f)) {
+		generic_close_file(td, f);
+		return 1;
+	}
 
-	/*
-	 * we want to do it, regardless of whether odirect is set or not
-	 */
-	td->override_sync = 1;
 	return 0;
-err:
-	free(sd->events);
-	free(sd->cmds);
-	free(sd);
-	td->io_ops->data = NULL;
-	return 1;
 }
 
 static struct ioengine_ops ioengine = {
@@ -380,6 +404,8 @@ static struct ioengine_ops ioengine = {
 	.getevents	= fio_sgio_getevents,
 	.event		= fio_sgio_event,
 	.cleanup	= fio_sgio_cleanup,
+	.open_file	= fio_sgio_open,
+	.close_file	= generic_close_file,
 	.flags		= FIO_SYNCIO | FIO_RAWIO,
 };