X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Fbinject.c;h=43e316950be45a3f9c9a183c6e7619b60b980b98;hb=79816cf7aca1e96b2f1dbb846f1d8aa0c1bbcd9f;hp=65894c2ef7847462c36baeeb2baf7593672e4067;hpb=d01c404b8971df6b86a7274177ddfb8d887061c8;p=fio.git

diff --git a/engines/binject.c b/engines/binject.c
index 65894c2e..43e31695 100644
--- a/engines/binject.c
+++ b/engines/binject.c
@@ -12,6 +12,8 @@
 #include <assert.h>
 #include <string.h>
 #include <sys/poll.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include "../fio.h"
 
@@ -67,7 +69,7 @@ static unsigned int binject_read_commands(struct thread_data *td, void *p,
 one_more:
 	events = 0;
 	for_each_file(td, f, i) {
-		bf = f->file_data;
+		bf = (struct binject_file *) (uintptr_t) f->engine_data;
 		ret = read(bf->fd, p, left * sizeof(struct b_user_cmd));
 		if (ret < 0) {
 			if (errno == EAGAIN)
@@ -102,15 +104,16 @@ static int fio_binject_getevents(struct thread_data *td, unsigned int min,
 	 * Fill in the file descriptors
 	 */
 	for_each_file(td, f, i) {
-		bf = f->file_data;
+		bf = (struct binject_file *) (uintptr_t) f->engine_data;
 
 		/*
 		 * don't block for min events == 0
 		 */
-		if (!min) {
-			bd->fd_flags[i] = fcntl(bf->fd, F_GETFL);
-			fcntl(bf->fd, F_SETFL, bd->fd_flags[i] | O_NONBLOCK);
-		}
+		if (!min)
+			bd->fd_flags[i] = fio_set_fd_nonblocking(bf->fd, "binject");
+		else
+			bd->fd_flags[i] = -1;
+
 		bd->pfds[i].fd = bf->fd;
 		bd->pfds[i].events = POLLIN;
 	}
@@ -144,15 +147,20 @@ static int fio_binject_getevents(struct thread_data *td, unsigned int min,
 		for (i = 0; i < events; i++) {
 			struct b_user_cmd *buc = (struct b_user_cmd *) buf + i;
 
-			bd->events[ev_index] = (struct io_u *) buc->usr_ptr;
+			bd->events[ev_index] = (struct io_u *) (unsigned long) buc->usr_ptr;
 			ev_index++;
 		}
 	}
 
 	if (!min) {
 		for_each_file(td, f, i) {
-			bf = f->file_data;
-			fcntl(bf->fd, F_SETFL, bd->fd_flags[i]);
+			bf = (struct binject_file *) (uintptr_t) f->engine_data;
+
+			if (bd->fd_flags[i] == -1)
+				continue;
+
+			if (fcntl(bf->fd, F_SETFL, bd->fd_flags[i]) < 0)
+				log_err("fio: binject failed to restore fcntl flags: %s\n", strerror(errno));
 		}
 	}
 
@@ -165,7 +173,7 @@ static int fio_binject_getevents(struct thread_data *td, unsigned int min,
 static int fio_binject_doio(struct thread_data *td, struct io_u *io_u)
 {
 	struct b_user_cmd *buc = &io_u->buc;
-	struct binject_file *bf = io_u->file->file_data;
+	struct binject_file *bf = (struct binject_file *) (uintptr_t) io_u->file->engine_data;
 	int ret;
 
 	ret = write(bf->fd, buc, sizeof(*buc));
@@ -179,7 +187,7 @@ static int fio_binject_prep(struct thread_data *td, struct io_u *io_u)
 {
 	struct binject_data *bd = td->io_ops->data;
 	struct b_user_cmd *buc = &io_u->buc;
-	struct binject_file *bf = io_u->file->file_data;
+	struct binject_file *bf = (struct binject_file *) (uintptr_t) io_u->file->engine_data;
 
 	if (io_u->xfer_buflen & (bf->bs - 1)) {
 		log_err("read/write not sector aligned\n");
@@ -191,7 +199,10 @@ static int fio_binject_prep(struct thread_data *td, struct io_u *io_u)
 		buc->type = B_TYPE_READ;
 	} else if (io_u->ddir == DDIR_WRITE) {
 		binject_buc_init(bd, io_u);
-		buc->type = B_TYPE_WRITE;
+		if (io_u->flags & IO_U_F_BARRIER)
+			buc->type = B_TYPE_WRITEBARRIER;
+		else
+			buc->type = B_TYPE_WRITE;
 	} else if (io_u->ddir == DDIR_TRIM) {
 		binject_buc_init(bd, io_u);
 		buc->type = B_TYPE_DISCARD;
@@ -228,6 +239,17 @@ static struct io_u *fio_binject_event(struct thread_data *td, int event)
 	return bd->events[event];
 }
 
+static int binject_open_ctl(struct thread_data *td)
+{
+	int fd;
+
+	fd = open("/dev/binject-ctl", O_RDWR);
+	if (fd < 0)
+		td_verror(td, errno, "open binject-ctl");
+
+	return fd;
+}
+
 static void binject_unmap_dev(struct thread_data *td, struct binject_file *bf)
 {
 	struct b_ioctl_cmd bic;
@@ -238,19 +260,14 @@ static void binject_unmap_dev(struct thread_data *td, struct binject_file *bf)
 		bf->fd = -1;
 	}
 
-	fdb = open("/dev/binject-ctl", O_RDWR);
-	if (fdb < 0) {
-		td_verror(td, errno, "open binject-ctl");
+	fdb = binject_open_ctl(td);
+	if (fdb < 0)
 		return;
-	}
 
 	bic.minor = bf->minor;
 
-	if (ioctl(fdb, 1, &bic) < 0) {
+	if (ioctl(fdb, B_IOCTL_DEL, &bic) < 0)
 		td_verror(td, errno, "binject dev unmap");
-		close(fdb);
-		return;
-	}
 
 	close(fdb);
 }
@@ -263,15 +280,13 @@ static int binject_map_dev(struct thread_data *td, struct binject_file *bf,
 	struct stat sb;
 	int fdb, dev_there, loops;
 
-	fdb = open("/dev/binject-ctl", O_RDWR);
-	if (fdb < 0) {
-		td_verror(td, errno, "binject ctl open");
+	fdb = binject_open_ctl(td);
+	if (fdb < 0)
 		return 1;
-	}
 
 	bic.fd = fd;
 
-	if (ioctl(fdb, 0, &bic) < 0) {
+	if (ioctl(fdb, B_IOCTL_ADD, &bic) < 0) {
 		td_verror(td, errno, "binject dev map");
 		close(fdb);
 		return 1;
@@ -314,12 +329,12 @@ err_unmap:
 
 static int fio_binject_close_file(struct thread_data *td, struct fio_file *f)
 {
-	struct binject_file *bf = f->file_data;
+	struct binject_file *bf = (struct binject_file *) (uintptr_t) f->engine_data;
 
 	if (bf) {
 		binject_unmap_dev(td, bf);
 		free(bf);
-		f->file_data = NULL;
+		f->engine_data = 0;
 		return generic_close_file(td, f);
 	}
 
@@ -348,7 +363,7 @@ static int fio_binject_open_file(struct thread_data *td, struct fio_file *f)
 	bf = malloc(sizeof(*bf));
 	bf->bs = bs;
 	bf->minor = bf->fd = -1;
-	f->file_data = bf;
+	f->engine_data = (uintptr_t) bf;
 
 	if (binject_map_dev(td, bf, f->fd)) {
 err_close:
@@ -407,7 +422,7 @@ static struct ioengine_ops ioengine = {
 	.open_file	= fio_binject_open_file,
 	.close_file	= fio_binject_close_file,
 	.get_file_size	= generic_get_file_size,
-	.flags		= FIO_RAWIO,
+	.flags		= FIO_RAWIO | FIO_BARRIER | FIO_MEMALIGN,
 };
 
 #else /* FIO_HAVE_BINJECT */