X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Fnet.c;h=12f49a2a67ca2f1d7241b42efdc45543b77fd868;hp=cc707db972178a5cee9c8815d15ce6f97d963f16;hb=95820b6e6c92025df8d89c0bf39b174e53137c41;hpb=f4e62a5f3640dfe2d2119bbe1e40bf57747f6564

diff --git a/engines/net.c b/engines/net.c
index cc707db9..12f49a2a 100644
--- a/engines/net.c
+++ b/engines/net.c
@@ -7,66 +7,415 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <signal.h>
 #include <errno.h>
 #include <assert.h>
 #include <netinet/in.h>
+#include <netinet/tcp.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <sys/poll.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/socket.h>
+#include <sys/un.h>
 
 #include "../fio.h"
 
 struct netio_data {
 	int listenfd;
-	int send_to_net;
-	char host[64];
+	int use_splice;
+	int pipes[2];
 	struct sockaddr_in addr;
+	struct sockaddr_un addr_un;
 };
 
+struct netio_options {
+	struct thread_data *td;
+	unsigned int port;
+	unsigned int proto;
+	unsigned int listen;
+	unsigned int pingpong;
+	unsigned int nodelay;
+};
+
+struct udp_close_msg {
+	uint32_t magic;
+	uint32_t cmd;
+};
+
+enum {
+	FIO_LINK_CLOSE = 0x89,
+	FIO_LINK_OPEN_CLOSE_MAGIC = 0x6c696e6b,
+	FIO_LINK_OPEN = 0x98,
+
+	FIO_TYPE_TCP	= 1,
+	FIO_TYPE_UDP	= 2,
+	FIO_TYPE_UNIX	= 3,
+};
+
+static int str_hostname_cb(void *data, const char *input);
+static struct fio_option options[] = {
+	{
+		.name	= "hostname",
+		.lname	= "net engine hostname",
+		.type	= FIO_OPT_STR_STORE,
+		.cb	= str_hostname_cb,
+		.help	= "Hostname for net IO engine",
+		.category = FIO_OPT_C_IO,
+	},
+	{
+		.name	= "port",
+		.lname	= "net engine port",
+		.type	= FIO_OPT_INT,
+		.off1	= offsetof(struct netio_options, port),
+		.minval	= 1,
+		.maxval	= 65535,
+		.help	= "Port to use for TCP or UDP net connections",
+		.category = FIO_OPT_C_IO,
+	},
+	{
+		.name	= "protocol",
+		.lname	= "net engine protocol",
+		.alias	= "proto",
+		.type	= FIO_OPT_STR,
+		.off1	= offsetof(struct netio_options, proto),
+		.help	= "Network protocol to use",
+		.def	= "tcp",
+		.category = FIO_OPT_C_IO,
+		.posval = {
+			  { .ival = "tcp",
+			    .oval = FIO_TYPE_TCP,
+			    .help = "Transmission Control Protocol",
+			  },
+			  { .ival = "udp",
+			    .oval = FIO_TYPE_UDP,
+			    .help = "User Datagram Protocol",
+			  },
+			  { .ival = "unix",
+			    .oval = FIO_TYPE_UNIX,
+			    .help = "UNIX domain socket",
+			  },
+		},
+	},
+#ifdef CONFIG_TCP_NODELAY
+	{
+		.name	= "nodelay",
+		.type	= FIO_OPT_BOOL,
+		.off1	= offsetof(struct netio_options, nodelay),
+		.help	= "Use TCP_NODELAY on TCP connections",
+	},
+#endif
+	{
+		.name	= "listen",
+		.lname	= "net engine listen",
+		.type	= FIO_OPT_STR_SET,
+		.off1	= offsetof(struct netio_options, listen),
+		.help	= "Listen for incoming TCP connections",
+		.category = FIO_OPT_C_IO,
+	},
+	{
+		.name	= "pingpong",
+		.type	= FIO_OPT_STR_SET,
+		.off1	= offsetof(struct netio_options, pingpong),
+		.help	= "Ping-pong IO requests",
+	},
+	{
+		.name	= NULL,
+	},
+};
+
+/*
+ * Return -1 for error and 'nr events' for a positive number
+ * of events
+ */
+static int poll_wait(struct thread_data *td, int fd, short events)
+{
+	struct pollfd pfd;
+	int ret;
+
+	while (!td->terminate) {
+		pfd.fd = fd;
+		pfd.events = events;
+		ret = poll(&pfd, 1, -1);
+		if (ret < 0) {
+			if (errno == EINTR)
+				break;
+
+			td_verror(td, errno, "poll");
+			return -1;
+		} else if (!ret)
+			continue;
+
+		break;
+	}
+
+	if (pfd.revents & events)
+		return 1;
+
+	return -1;
+}
+
 static int fio_netio_prep(struct thread_data *td, struct io_u *io_u)
 {
-	struct netio_data *nd = td->io_ops->data;
-	struct fio_file *f = io_u->file;
+	struct netio_options *o = td->eo;
 
 	/*
 	 * Make sure we don't see spurious reads to a receiver, and vice versa
 	 */
-	if ((nd->send_to_net && io_u->ddir == DDIR_READ) ||
-	    (!nd->send_to_net && io_u->ddir == DDIR_WRITE)) {
+	if (o->proto == FIO_TYPE_TCP)
+		return 0;
+
+	if ((o->listen && io_u->ddir == DDIR_WRITE) ||
+	    (!o->listen && io_u->ddir == DDIR_READ)) {
 		td_verror(td, EINVAL, "bad direction");
 		return 1;
 	}
-		
-	if (io_u->ddir == DDIR_SYNC)
+
+	return 0;
+}
+
+#ifdef CONFIG_LINUX_SPLICE
+static int splice_io_u(int fdin, int fdout, unsigned int len)
+{
+	int bytes = 0;
+
+	while (len) {
+		int ret = splice(fdin, NULL, fdout, NULL, len, 0);
+
+		if (ret < 0) {
+			if (!bytes)
+				bytes = ret;
+
+			break;
+		} else if (!ret)
+			break;
+
+		bytes += ret;
+		len -= ret;
+	}
+
+	return bytes;
+}
+
+/*
+ * Receive bytes from a socket and fill them into the internal pipe
+ */
+static int splice_in(struct thread_data *td, struct io_u *io_u)
+{
+	struct netio_data *nd = td->io_ops->data;
+
+	return splice_io_u(io_u->file->fd, nd->pipes[1], io_u->xfer_buflen);
+}
+
+/*
+ * Transmit 'len' bytes from the internal pipe
+ */
+static int splice_out(struct thread_data *td, struct io_u *io_u,
+		      unsigned int len)
+{
+	struct netio_data *nd = td->io_ops->data;
+
+	return splice_io_u(nd->pipes[0], io_u->file->fd, len);
+}
+
+static int vmsplice_io_u(struct io_u *io_u, int fd, unsigned int len)
+{
+	struct iovec iov = {
+		.iov_base = io_u->xfer_buf,
+		.iov_len = len,
+	};
+	int bytes = 0;
+
+	while (iov.iov_len) {
+		int ret = vmsplice(fd, &iov, 1, SPLICE_F_MOVE);
+
+		if (ret < 0) {
+			if (!bytes)
+				bytes = ret;
+			break;
+		} else if (!ret)
+			break;
+
+		iov.iov_len -= ret;
+		iov.iov_base += ret;
+		bytes += ret;
+	}
+
+	return bytes;
+
+}
+
+/*
+ * vmsplice() pipe to io_u buffer
+ */
+static int vmsplice_io_u_out(struct thread_data *td, struct io_u *io_u,
+			     unsigned int len)
+{
+	struct netio_data *nd = td->io_ops->data;
+
+	return vmsplice_io_u(io_u, nd->pipes[0], len);
+}
+
+/*
+ * vmsplice() io_u to pipe
+ */
+static int vmsplice_io_u_in(struct thread_data *td, struct io_u *io_u)
+{
+	struct netio_data *nd = td->io_ops->data;
+
+	return vmsplice_io_u(io_u, nd->pipes[1], io_u->xfer_buflen);
+}
+
+/*
+ * splice receive - transfer socket data into a pipe using splice, then map
+ * that pipe data into the io_u using vmsplice.
+ */
+static int fio_netio_splice_in(struct thread_data *td, struct io_u *io_u)
+{
+	int ret;
+
+	ret = splice_in(td, io_u);
+	if (ret > 0)
+		return vmsplice_io_u_out(td, io_u, ret);
+
+	return ret;
+}
+
+/*
+ * splice transmit - map data from the io_u into a pipe by using vmsplice,
+ * then transfer that pipe to a socket using splice.
+ */
+static int fio_netio_splice_out(struct thread_data *td, struct io_u *io_u)
+{
+	int ret;
+
+	ret = vmsplice_io_u_in(td, io_u);
+	if (ret > 0)
+		return splice_out(td, io_u, ret);
+
+	return ret;
+}
+#else
+static int fio_netio_splice_in(struct thread_data *td, struct io_u *io_u)
+{
+	errno = EOPNOTSUPP;
+	return -1;
+}
+
+static int fio_netio_splice_out(struct thread_data *td, struct io_u *io_u)
+{
+	errno = EOPNOTSUPP;
+	return -1;
+}
+#endif
+
+static int fio_netio_send(struct thread_data *td, struct io_u *io_u)
+{
+	struct netio_data *nd = td->io_ops->data;
+	struct netio_options *o = td->eo;
+	int ret, flags = 0;
+
+	do {
+		if (o->proto == FIO_TYPE_UDP) {
+			struct sockaddr *to = (struct sockaddr *) &nd->addr;
+
+			ret = sendto(io_u->file->fd, io_u->xfer_buf,
+					io_u->xfer_buflen, flags, to,
+					sizeof(*to));
+		} else {
+			/*
+			 * if we are going to write more, set MSG_MORE
+			 */
+#ifdef MSG_MORE
+			if ((td->this_io_bytes[DDIR_WRITE] + io_u->xfer_buflen <
+			    td->o.size) && !o->pingpong)
+				flags |= MSG_MORE;
+#endif
+			ret = send(io_u->file->fd, io_u->xfer_buf,
+					io_u->xfer_buflen, flags);
+		}
+		if (ret > 0)
+			break;
+
+		ret = poll_wait(td, io_u->file->fd, POLLOUT);
+		if (ret <= 0)
+			break;
+	} while (1);
+
+	return ret;
+}
+
+static int is_udp_close(struct io_u *io_u, int len)
+{
+	struct udp_close_msg *msg;
+
+	if (len != sizeof(struct udp_close_msg))
 		return 0;
-	if (io_u->offset == f->last_completed_pos)
+
+	msg = io_u->xfer_buf;
+	if (ntohl(msg->magic) != FIO_LINK_OPEN_CLOSE_MAGIC)
+		return 0;
+	if (ntohl(msg->cmd) != FIO_LINK_CLOSE)
 		return 0;
 
-	/*
-	 * If offset is different from last end position, it's a seek.
-	 * As network io is purely sequential, we don't allow seeks.
-	 */
-	td_verror(td, EINVAL, "cannot seek");
 	return 1;
 }
 
-static int fio_netio_queue(struct thread_data *td, struct io_u *io_u)
+static int fio_netio_recv(struct thread_data *td, struct io_u *io_u)
 {
-	struct fio_file *f = io_u->file;
+	struct netio_data *nd = td->io_ops->data;
+	struct netio_options *o = td->eo;
 	int ret, flags = 0;
 
-	if (io_u->ddir == DDIR_WRITE) {
-		/*
-		 * if we are going to write more, set MSG_MORE
-		 */
-		if (td->this_io_bytes[DDIR_WRITE] + io_u->xfer_buflen <
-		    td->o.size)
-			flags = MSG_MORE;
-
-		ret = send(f->fd, io_u->xfer_buf, io_u->xfer_buflen, flags);
-	} else if (io_u->ddir == DDIR_READ) {
-		flags = MSG_WAITALL;
-		ret = recv(f->fd, io_u->xfer_buf, io_u->xfer_buflen, flags);
+	do {
+		if (o->proto == FIO_TYPE_UDP) {
+			socklen_t len = sizeof(nd->addr);
+			struct sockaddr *from = (struct sockaddr *) &nd->addr;
+
+			ret = recvfrom(io_u->file->fd, io_u->xfer_buf,
+					io_u->xfer_buflen, flags, from, &len);
+			if (is_udp_close(io_u, ret)) {
+				td->done = 1;
+				return 0;
+			}
+		} else {
+			ret = recv(io_u->file->fd, io_u->xfer_buf,
+					io_u->xfer_buflen, flags);
+		}
+		if (ret > 0)
+			break;
+		else if (!ret && (flags & MSG_WAITALL))
+			break;
+
+		ret = poll_wait(td, io_u->file->fd, POLLIN);
+		if (ret <= 0)
+			break;
+		flags |= MSG_WAITALL;
+	} while (1);
+
+	return ret;
+}
+
+static int __fio_netio_queue(struct thread_data *td, struct io_u *io_u,
+			     enum fio_ddir ddir)
+{
+	struct netio_data *nd = td->io_ops->data;
+	struct netio_options *o = td->eo;
+	int ret;
+
+	if (ddir == DDIR_WRITE) {
+		if (!nd->use_splice || o->proto == FIO_TYPE_UDP ||
+		    o->proto == FIO_TYPE_UNIX)
+			ret = fio_netio_send(td, io_u);
+		else
+			ret = fio_netio_splice_out(td, io_u);
+	} else if (ddir == DDIR_READ) {
+		if (!nd->use_splice || o->proto == FIO_TYPE_UDP ||
+		    o->proto == FIO_TYPE_UNIX)
+			ret = fio_netio_recv(td, io_u);
+		else
+			ret = fio_netio_splice_in(td, io_u);
 	} else
 		ret = 0;	/* must be a SYNC */
 
@@ -75,8 +424,14 @@ static int fio_netio_queue(struct thread_data *td, struct io_u *io_u)
 			io_u->resid = io_u->xfer_buflen - ret;
 			io_u->error = 0;
 			return FIO_Q_COMPLETED;
-		} else
-			io_u->error = errno;
+		} else {
+			int err = errno;
+
+			if (ddir == DDIR_WRITE && err == EMSGSIZE)
+				return FIO_Q_BUSY;
+
+			io_u->error = err;
+		}
 	}
 
 	if (io_u->error)
@@ -85,19 +440,86 @@ static int fio_netio_queue(struct thread_data *td, struct io_u *io_u)
 	return FIO_Q_COMPLETED;
 }
 
+static int fio_netio_queue(struct thread_data *td, struct io_u *io_u)
+{
+	struct netio_options *o = td->eo;
+	int ret;
+
+	fio_ro_check(td, io_u);
+
+	ret = __fio_netio_queue(td, io_u, io_u->ddir);
+	if (!o->pingpong || ret != FIO_Q_COMPLETED)
+		return ret;
+
+	/*
+	 * For ping-pong mode, receive or send reply as needed
+	 */
+	if (td_read(td) && io_u->ddir == DDIR_READ)
+		ret = __fio_netio_queue(td, io_u, DDIR_WRITE);
+	else if (td_write(td) && io_u->ddir == DDIR_WRITE)
+		ret = __fio_netio_queue(td, io_u, DDIR_READ);
+
+	return ret;
+}
+
 static int fio_netio_connect(struct thread_data *td, struct fio_file *f)
 {
 	struct netio_data *nd = td->io_ops->data;
+	struct netio_options *o = td->eo;
+	int type, domain, optval;
+
+	if (o->proto == FIO_TYPE_TCP) {
+		domain = AF_INET;
+		type = SOCK_STREAM;
+	} else if (o->proto == FIO_TYPE_UDP) {
+		domain = AF_INET;
+		type = SOCK_DGRAM;
+	} else if (o->proto == FIO_TYPE_UNIX) {
+		domain = AF_UNIX;
+		type = SOCK_STREAM;
+	} else {
+		log_err("fio: bad network type %d\n", o->proto);
+		f->fd = -1;
+		return 1;
+	}
 
-	f->fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+	f->fd = socket(domain, type, 0);
 	if (f->fd < 0) {
 		td_verror(td, errno, "socket");
 		return 1;
 	}
 
-	if (connect(f->fd, (struct sockaddr *) &nd->addr, sizeof(nd->addr)) < 0) {
-		td_verror(td, errno, "connect");
-		return 1;
+#ifdef CONFIG_TCP_NODELAY
+	if (o->nodelay && o->proto == FIO_TYPE_TCP) {
+		optval = 1;
+		if (setsockopt(f->fd, IPPROTO_TCP, TCP_NODELAY, (void *) &optval, sizeof(int)) < 0) {
+			log_err("fio: cannot set TCP_NODELAY option on socket (%s), disable with 'nodelay=0'\n", strerror(errno));
+			return 1;
+		}
+	}
+#endif
+
+	if (o->proto == FIO_TYPE_UDP)
+		return 0;
+	else if (o->proto == FIO_TYPE_TCP) {
+		socklen_t len = sizeof(nd->addr);
+
+		if (connect(f->fd, (struct sockaddr *) &nd->addr, len) < 0) {
+			td_verror(td, errno, "connect");
+			close(f->fd);
+			return 1;
+		}
+	} else {
+		struct sockaddr_un *addr = &nd->addr_un;
+		socklen_t len;
+
+		len = sizeof(addr->sun_family) + strlen(addr->sun_path) + 1;
+
+		if (connect(f->fd, (struct sockaddr *) addr, len) < 0) {
+			td_verror(td, errno, "connect");
+			close(f->fd);
+			return 1;
+		}
 	}
 
 	return 0;
@@ -106,61 +528,169 @@ static int fio_netio_connect(struct thread_data *td, struct fio_file *f)
 static int fio_netio_accept(struct thread_data *td, struct fio_file *f)
 {
 	struct netio_data *nd = td->io_ops->data;
+	struct netio_options *o = td->eo;
 	socklen_t socklen = sizeof(nd->addr);
-	struct pollfd pfd;
-	int ret;
+	int state, optval;
+
+	if (o->proto == FIO_TYPE_UDP) {
+		f->fd = nd->listenfd;
+		return 0;
+	}
+
+	state = td->runstate;
+	td_set_runstate(td, TD_SETTING_UP);
 
 	log_info("fio: waiting for connection\n");
 
+	if (poll_wait(td, nd->listenfd, POLLIN) < 0)
+		goto err;
+
+	f->fd = accept(nd->listenfd, (struct sockaddr *) &nd->addr, &socklen);
+	if (f->fd < 0) {
+		td_verror(td, errno, "accept");
+		goto err;
+	}
+
+#ifdef CONFIG_TCP_NODELAY
+	if (o->nodelay && o->proto == FIO_TYPE_TCP) {
+		optval = 1;
+		if (setsockopt(f->fd, IPPROTO_TCP, TCP_NODELAY, (void *) &optval, sizeof(int)) < 0) {
+			log_err("fio: cannot set TCP_NODELAY option on socket (%s), disable with 'nodelay=0'\n", strerror(errno));
+			return 1;
+		}
+	}
+#endif
+
+	reset_all_stats(td);
+	td_set_runstate(td, state);
+	return 0;
+err:
+	td_set_runstate(td, state);
+	return 1;
+}
+
+static void fio_netio_udp_close(struct thread_data *td, struct fio_file *f)
+{
+	struct netio_data *nd = td->io_ops->data;
+	struct udp_close_msg msg;
+	struct sockaddr *to = (struct sockaddr *) &nd->addr;
+	int ret;
+
+	msg.magic = htonl(FIO_LINK_OPEN_CLOSE_MAGIC);
+	msg.cmd = htonl(FIO_LINK_CLOSE);
+
+	ret = sendto(f->fd, (void *) &msg, sizeof(msg), MSG_WAITALL, to,
+			sizeof(nd->addr));
+	if (ret < 0)
+		td_verror(td, errno, "sendto udp link close");
+}
+
+static int fio_netio_close_file(struct thread_data *td, struct fio_file *f)
+{
+	struct netio_options *o = td->eo;
+
 	/*
-	 * Accept loop. poll for incoming events, accept them. Repeat until we
-	 * have all connections.
+	 * If this is an UDP connection, notify the receiver that we are
+	 * closing down the link
 	 */
-	while (!td->terminate) {
-		pfd.fd = nd->listenfd;
-		pfd.events = POLLIN;
+	if (o->proto == FIO_TYPE_UDP)
+		fio_netio_udp_close(td, f);
 
-		ret = poll(&pfd, 1, -1);
-		if (ret < 0) {
-			if (errno == EINTR)
-				continue;
+	return generic_close_file(td, f);
+}
 
-			td_verror(td, errno, "poll");
-			break;
-		} else if (!ret)
-			continue;
+static int fio_netio_udp_recv_open(struct thread_data *td, struct fio_file *f)
+{
+	struct netio_data *nd = td->io_ops->data;
+	struct udp_close_msg msg;
+	struct sockaddr *to = (struct sockaddr *) &nd->addr;
+	socklen_t len = sizeof(nd->addr);
+	int ret;
 
-		/*
-		 * should be impossible
-		 */
-		if (!(pfd.revents & POLLIN))
-			continue;
+	ret = recvfrom(f->fd, (void *) &msg, sizeof(msg), MSG_WAITALL, to, &len);
+	if (ret < 0) {
+		td_verror(td, errno, "sendto udp link open");
+		return ret;
+	}
 
-		f->fd = accept(nd->listenfd, (struct sockaddr *) &nd->addr, &socklen);
-		if (f->fd < 0) {
-			td_verror(td, errno, "accept");
-			return 1;
-		}
-		break;
+	if (ntohl(msg.magic) != FIO_LINK_OPEN_CLOSE_MAGIC ||
+	    ntohl(msg.cmd) != FIO_LINK_OPEN) {
+		log_err("fio: bad udp open magic %x/%x\n", ntohl(msg.magic),
+								ntohl(msg.cmd));
+		return -1;
 	}
 
 	return 0;
 }
 
+static int fio_netio_udp_send_open(struct thread_data *td, struct fio_file *f)
+{
+	struct netio_data *nd = td->io_ops->data;
+	struct udp_close_msg msg;
+	struct sockaddr *to = (struct sockaddr *) &nd->addr;
+	int ret;
+
+	msg.magic = htonl(FIO_LINK_OPEN_CLOSE_MAGIC);
+	msg.cmd = htonl(FIO_LINK_OPEN);
+
+	ret = sendto(f->fd, (void *) &msg, sizeof(msg), MSG_WAITALL, to,
+			sizeof(nd->addr));
+	if (ret < 0) {
+		td_verror(td, errno, "sendto udp link open");
+		return ret;
+	}
+
+	return 0;
+}
 
 static int fio_netio_open_file(struct thread_data *td, struct fio_file *f)
 {
-	if (td_read(td))
-		return fio_netio_accept(td, f);
+	int ret;
+	struct netio_options *o = td->eo;
+
+	if (o->listen)
+		ret = fio_netio_accept(td, f);
 	else
-		return fio_netio_connect(td, f);
+		ret = fio_netio_connect(td, f);
+
+	if (ret) {
+		f->fd = -1;
+		return ret;
+	}
+
+	if (o->proto == FIO_TYPE_UDP) {
+		if (td_write(td))
+			ret = fio_netio_udp_send_open(td, f);
+		else {
+			int state;
+
+			state = td->runstate;
+			td_set_runstate(td, TD_SETTING_UP);
+			ret = fio_netio_udp_recv_open(td, f);
+			td_set_runstate(td, state);
+		}
+	}
+
+	if (ret)
+		fio_netio_close_file(td, f);
+
+	return ret;
 }
 
-static int fio_netio_setup_connect(struct thread_data *td, const char *host,
-				   unsigned short port)
+static int fio_netio_setup_connect_inet(struct thread_data *td,
+					const char *host, unsigned short port)
 {
 	struct netio_data *nd = td->io_ops->data;
 
+	if (!host) {
+		log_err("fio: connect with no host to connect to.\n");
+		if (td_read(td))
+			log_err("fio: did you forget to set 'listen'?\n");
+
+		td_verror(td, EINVAL, "no hostname= set");
+		return 1;
+	}
+
 	nd->addr.sin_family = AF_INET;
 	nd->addr.sin_port = htons(port);
 
@@ -179,24 +709,84 @@ static int fio_netio_setup_connect(struct thread_data *td, const char *host,
 	return 0;
 }
 
-static int fio_netio_setup_listen(struct thread_data *td, short port)
+static int fio_netio_setup_connect_unix(struct thread_data *td,
+					const char *path)
 {
 	struct netio_data *nd = td->io_ops->data;
-	int fd, opt;
+	struct sockaddr_un *soun = &nd->addr_un;
+
+	soun->sun_family = AF_UNIX;
+	strcpy(soun->sun_path, path);
+	return 0;
+}
+
+static int fio_netio_setup_connect(struct thread_data *td)
+{
+	struct netio_options *o = td->eo;
 
-	fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+	if (o->proto == FIO_TYPE_UDP || o->proto == FIO_TYPE_TCP)
+		return fio_netio_setup_connect_inet(td, td->o.filename,o->port);
+	else
+		return fio_netio_setup_connect_unix(td, td->o.filename);
+}
+
+static int fio_netio_setup_listen_unix(struct thread_data *td, const char *path)
+{
+	struct netio_data *nd = td->io_ops->data;
+	struct sockaddr_un *addr = &nd->addr_un;
+	mode_t mode;
+	int len, fd;
+
+	fd = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (fd < 0) {
+		log_err("fio: socket: %s\n", strerror(errno));
+		return -1;
+	}
+
+	mode = umask(000);
+
+	memset(addr, 0, sizeof(*addr));
+	addr->sun_family = AF_UNIX;
+	strcpy(addr->sun_path, path);
+	unlink(path);
+
+	len = sizeof(addr->sun_family) + strlen(path) + 1;
+
+	if (bind(fd, (struct sockaddr *) addr, len) < 0) {
+		log_err("fio: bind: %s\n", strerror(errno));
+		close(fd);
+		return -1;
+	}
+
+	umask(mode);
+	nd->listenfd = fd;
+	return 0;
+}
+
+static int fio_netio_setup_listen_inet(struct thread_data *td, short port)
+{
+	struct netio_data *nd = td->io_ops->data;
+	struct netio_options *o = td->eo;
+	int fd, opt, type;
+
+	if (o->proto == FIO_TYPE_TCP)
+		type = SOCK_STREAM;
+	else
+		type = SOCK_DGRAM;
+
+	fd = socket(AF_INET, type, 0);
 	if (fd < 0) {
 		td_verror(td, errno, "socket");
 		return 1;
 	}
 
 	opt = 1;
-	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) {
+	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void *) &opt, sizeof(opt)) < 0) {
 		td_verror(td, errno, "setsockopt");
 		return 1;
 	}
 #ifdef SO_REUSEPORT
-	if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt)) < 0) {
+	if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, (void *) &opt, sizeof(opt)) < 0) {
 		td_verror(td, errno, "setsockopt");
 		return 1;
 	}
@@ -210,49 +800,86 @@ static int fio_netio_setup_listen(struct thread_data *td, short port)
 		td_verror(td, errno, "bind");
 		return 1;
 	}
-	if (listen(fd, 1) < 0) {
+
+	nd->listenfd = fd;
+	return 0;
+}
+
+static int fio_netio_setup_listen(struct thread_data *td)
+{
+	struct netio_data *nd = td->io_ops->data;
+	struct netio_options *o = td->eo;
+	int ret;
+
+	if (o->proto == FIO_TYPE_UDP || o->proto == FIO_TYPE_TCP)
+		ret = fio_netio_setup_listen_inet(td, o->port);
+	else
+		ret = fio_netio_setup_listen_unix(td, td->o.filename);
+
+	if (ret)
+		return ret;
+	if (o->proto == FIO_TYPE_UDP)
+		return 0;
+
+	if (listen(nd->listenfd, 10) < 0) {
 		td_verror(td, errno, "listen");
+		nd->listenfd = -1;
 		return 1;
 	}
 
-	nd->listenfd = fd;
 	return 0;
 }
 
 static int fio_netio_init(struct thread_data *td)
 {
-	struct netio_data *nd = td->io_ops->data;
-	unsigned short port;
-	char host[64], buf[128];
-	char *sep;
+	struct netio_options *o = td->eo;
 	int ret;
 
-	if (td_rw(td)) {
-		log_err("fio: network connections must be read OR write\n");
+#ifdef WIN32
+	WSADATA wsd;
+	WSAStartup(MAKEWORD(2,2), &wsd);
+#endif
+
+	if (td_random(td)) {
+		log_err("fio: network IO can't be random\n");
 		return 1;
 	}
 
-	strcpy(buf, td->o.filename);
-
-	sep = strchr(buf, '/');
-	if (!sep) {
-		log_err("fio: bad network host/port <<%s>>\n", td->o.filename);
+	if (o->proto == FIO_TYPE_UNIX && o->port) {
+		log_err("fio: network IO port not valid with unix socket\n");
+		return 1;
+	} else if (o->proto != FIO_TYPE_UNIX && !o->port) {
+		log_err("fio: network IO requires port for tcp or udp\n");
 		return 1;
 	}
 
-	*sep = '\0';
-	sep++;
-	strcpy(host, buf);
-	port = atoi(sep);
+	if (o->proto != FIO_TYPE_TCP) {
+		if (o->listen) {
+			log_err("fio: listen only valid for TCP proto IO\n");
+			return 1;
+		}
+		if (td_rw(td)) {
+			log_err("fio: datagram network connections must be"
+				   " read OR write\n");
+			return 1;
+		}
+		if (o->proto == FIO_TYPE_UNIX && !td->o.filename) {
+			log_err("fio: UNIX sockets need host/filename\n");
+			return 1;
+		}
+		o->listen = td_read(td);
+	}
 
-	if (td_read(td)) {
-		nd->send_to_net = 0;
-		ret = fio_netio_setup_listen(td, port);
-	} else {
-		nd->send_to_net = 1;
-		ret = fio_netio_setup_connect(td, host, port);
+	if (o->proto != FIO_TYPE_UNIX && o->listen && td->o.filename) {
+		log_err("fio: hostname not valid for inbound network IO\n");
+		return 1;
 	}
 
+	if (o->listen)
+		ret = fio_netio_setup_listen(td);
+	else
+		ret = fio_netio_setup_connect(td);
+
 	return ret;
 }
 
@@ -261,54 +888,119 @@ static void fio_netio_cleanup(struct thread_data *td)
 	struct netio_data *nd = td->io_ops->data;
 
 	if (nd) {
+		if (nd->listenfd != -1)
+			close(nd->listenfd);
+		if (nd->pipes[0] != -1)
+			close(nd->pipes[0]);
+		if (nd->pipes[1] != -1)
+			close(nd->pipes[1]);
+
 		free(nd);
-		td->io_ops->data = NULL;
 	}
 }
 
 static int fio_netio_setup(struct thread_data *td)
 {
 	struct netio_data *nd;
-	struct fio_file *f;
-	unsigned int i;
+
+	if (!td->files_index) {
+		add_file(td, td->o.filename ?: "net");
+		td->o.nr_files = td->o.nr_files ?: 1;
+	}
 
 	if (!td->io_ops->data) {
 		nd = malloc(sizeof(*nd));;
 
 		memset(nd, 0, sizeof(*nd));
 		nd->listenfd = -1;
+		nd->pipes[0] = nd->pipes[1] = -1;
 		td->io_ops->data = nd;
-
-		for_each_file(td, f, i) {
-			if (td->o.size)
-				f->real_file_size = td->o.size / td->o.nr_files;
-			else
-				f->real_file_size = -1ULL;
-		}
 	}
 
 	return 0;
 }
 
-static struct ioengine_ops ioengine = {
-	.name		= "net",
-	.version	= FIO_IOOPS_VERSION,
-	.prep		= fio_netio_prep,
-	.queue		= fio_netio_queue,
-	.setup		= fio_netio_setup,
-	.init		= fio_netio_init,
-	.cleanup	= fio_netio_cleanup,
-	.open_file	= fio_netio_open_file,
-	.close_file	= generic_close_file,
-	.flags		= FIO_SYNCIO | FIO_DISKLESSIO,
+static void fio_netio_terminate(struct thread_data *td)
+{
+	kill(td->pid, SIGUSR2);
+}
+
+#ifdef CONFIG_LINUX_SPLICE
+static int fio_netio_setup_splice(struct thread_data *td)
+{
+	struct netio_data *nd;
+
+	fio_netio_setup(td);
+
+	nd = td->io_ops->data;
+	if (nd) {
+		if (pipe(nd->pipes) < 0)
+			return 1;
+
+		nd->use_splice = 1;
+		return 0;
+	}
+
+	return 1;
+}
+
+static struct ioengine_ops ioengine_splice = {
+	.name			= "netsplice",
+	.version		= FIO_IOOPS_VERSION,
+	.prep			= fio_netio_prep,
+	.queue			= fio_netio_queue,
+	.setup			= fio_netio_setup_splice,
+	.init			= fio_netio_init,
+	.cleanup		= fio_netio_cleanup,
+	.open_file		= fio_netio_open_file,
+	.close_file		= fio_netio_close_file,
+	.terminate		= fio_netio_terminate,
+	.options		= options,
+	.option_struct_size	= sizeof(struct netio_options),
+	.flags			= FIO_SYNCIO | FIO_DISKLESSIO | FIO_UNIDIR |
+				  FIO_PIPEIO,
 };
+#endif
+
+static struct ioengine_ops ioengine_rw = {
+	.name			= "net",
+	.version		= FIO_IOOPS_VERSION,
+	.prep			= fio_netio_prep,
+	.queue			= fio_netio_queue,
+	.setup			= fio_netio_setup,
+	.init			= fio_netio_init,
+	.cleanup		= fio_netio_cleanup,
+	.open_file		= fio_netio_open_file,
+	.close_file		= fio_netio_close_file,
+	.terminate		= fio_netio_terminate,
+	.options		= options,
+	.option_struct_size	= sizeof(struct netio_options),
+	.flags			= FIO_SYNCIO | FIO_DISKLESSIO | FIO_UNIDIR |
+				  FIO_PIPEIO,
+};
+
+static int str_hostname_cb(void *data, const char *input)
+{
+	struct netio_options *o = data;
+
+	if (o->td->o.filename)
+		free(o->td->o.filename);
+	o->td->o.filename = strdup(input);
+	return 0;
+}
 
 static void fio_init fio_netio_register(void)
 {
-	register_ioengine(&ioengine);
+	register_ioengine(&ioengine_rw);
+#ifdef CONFIG_LINUX_SPLICE
+	register_ioengine(&ioengine_splice);
+#endif
 }
 
 static void fio_exit fio_netio_unregister(void)
 {
-	unregister_ioengine(&ioengine);
+	unregister_ioengine(&ioengine_rw);
+#ifdef CONFIG_LINUX_SPLICE
+	unregister_ioengine(&ioengine_splice);
+#endif
 }