X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Fnet.c;h=de7cdb541824bc35d8eb3cb97121f24bcce5bde3;hp=419508e47a5ec037a33c2c00781973820cbdc752;hb=1f81991ed356dd7257aef2c715ba9a24d9af93a5;hpb=7d988f68c7f0ff6bd4c9e558c4defbd9a544b167 diff --git a/engines/net.c b/engines/net.c index 419508e4..de7cdb54 100644 --- a/engines/net.c +++ b/engines/net.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -33,6 +34,7 @@ struct netio_options { unsigned int port; unsigned int proto; unsigned int listen; + unsigned int pingpong; }; struct udp_close_msg { @@ -42,7 +44,8 @@ struct udp_close_msg { enum { FIO_LINK_CLOSE = 0x89, - FIO_LINK_CLOSE_MAGIC = 0x6c696e6b, + FIO_LINK_OPEN_CLOSE_MAGIC = 0x6c696e6b, + FIO_LINK_OPEN = 0x98, FIO_TYPE_TCP = 1, FIO_TYPE_UDP = 2, @@ -93,6 +96,12 @@ static struct fio_option options[] = { .off1 = offsetof(struct netio_options, listen), .help = "Listen for incoming TCP connections", }, + { + .name = "pingpong", + .type = FIO_OPT_STR_SET, + .off1 = offsetof(struct netio_options, pingpong), + .help = "Ping-pong IO requests", + }, { .name = NULL, }, @@ -148,7 +157,7 @@ static int fio_netio_prep(struct thread_data *td, struct io_u *io_u) return 0; } -#ifdef FIO_HAVE_SPLICE +#ifdef CONFIG_LINUX_SPLICE static int splice_io_u(int fdin, int fdout, unsigned int len) { int bytes = 0; @@ -287,7 +296,7 @@ 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 = OS_MSG_DONTWAIT; + int ret, flags = 0; do { if (o->proto == FIO_TYPE_UDP) { @@ -301,8 +310,8 @@ static int fio_netio_send(struct thread_data *td, struct io_u *io_u) * 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) + 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, @@ -314,8 +323,6 @@ static int fio_netio_send(struct thread_data *td, struct io_u *io_u) ret = poll_wait(td, io_u->file->fd, POLLOUT); if (ret <= 0) break; - - flags &= ~OS_MSG_DONTWAIT; } while (1); return ret; @@ -329,7 +336,7 @@ static int is_udp_close(struct io_u *io_u, int len) return 0; msg = io_u->xfer_buf; - if (ntohl(msg->magic) != FIO_LINK_CLOSE_MAGIC) + if (ntohl(msg->magic) != FIO_LINK_OPEN_CLOSE_MAGIC) return 0; if (ntohl(msg->cmd) != FIO_LINK_CLOSE) return 0; @@ -341,11 +348,11 @@ static int fio_netio_recv(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 = OS_MSG_DONTWAIT; + int ret, flags = 0; do { if (o->proto == FIO_TYPE_UDP) { - fio_socklen_t len = sizeof(nd->addr); + socklen_t len = sizeof(nd->addr); struct sockaddr *from = (struct sockaddr *) &nd->addr; ret = recvfrom(io_u->file->fd, io_u->xfer_buf, @@ -366,28 +373,26 @@ static int fio_netio_recv(struct thread_data *td, struct io_u *io_u) ret = poll_wait(td, io_u->file->fd, POLLIN); if (ret <= 0) break; - flags &= ~OS_MSG_DONTWAIT; flags |= MSG_WAITALL; } while (1); return ret; } -static int fio_netio_queue(struct thread_data *td, struct io_u *io_u) +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; - fio_ro_check(td, io_u); - - if (io_u->ddir == DDIR_WRITE) { + 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 (io_u->ddir == DDIR_READ) { + } 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); @@ -404,7 +409,7 @@ static int fio_netio_queue(struct thread_data *td, struct io_u *io_u) } else { int err = errno; - if (io_u->ddir == DDIR_WRITE && err == EMSGSIZE) + if (ddir == DDIR_WRITE && err == EMSGSIZE) return FIO_Q_BUSY; io_u->error = err; @@ -417,6 +422,28 @@ 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; @@ -447,7 +474,7 @@ static int fio_netio_connect(struct thread_data *td, struct fio_file *f) if (o->proto == FIO_TYPE_UDP) return 0; else if (o->proto == FIO_TYPE_TCP) { - fio_socklen_t len = sizeof(nd->addr); + socklen_t len = sizeof(nd->addr); if (connect(f->fd, (struct sockaddr *) &nd->addr, len) < 0) { td_verror(td, errno, "connect"); @@ -456,7 +483,7 @@ static int fio_netio_connect(struct thread_data *td, struct fio_file *f) } } else { struct sockaddr_un *addr = &nd->addr_un; - fio_socklen_t len; + socklen_t len; len = sizeof(addr->sun_family) + strlen(addr->sun_path) + 1; @@ -474,40 +501,34 @@ 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; - fio_socklen_t socklen = sizeof(nd->addr); + socklen_t socklen = sizeof(nd->addr); + int state; 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) - return 1; + goto err; f->fd = accept(nd->listenfd, (struct sockaddr *) &nd->addr, &socklen); if (f->fd < 0) { td_verror(td, errno, "accept"); - return 1; + goto err; } + reset_all_stats(td); + td_set_runstate(td, state); return 0; -} - -static int fio_netio_open_file(struct thread_data *td, struct fio_file *f) -{ - int ret; - struct netio_options *o = td->eo; - - if (o->listen) - ret = fio_netio_accept(td, f); - else - ret = fio_netio_connect(td, f); - - if (ret) - f->fd = -1; - return ret; +err: + td_set_runstate(td, state); + return 1; } static void fio_netio_udp_close(struct thread_data *td, struct fio_file *f) @@ -517,10 +538,10 @@ static void fio_netio_udp_close(struct thread_data *td, struct fio_file *f) struct sockaddr *to = (struct sockaddr *) &nd->addr; int ret; - msg.magic = htonl(FIO_LINK_CLOSE_MAGIC); + msg.magic = htonl(FIO_LINK_OPEN_CLOSE_MAGIC); msg.cmd = htonl(FIO_LINK_CLOSE); - ret = sendto(f->fd, &msg, sizeof(msg), MSG_WAITALL, to, + 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"); @@ -540,6 +561,84 @@ static int fio_netio_close_file(struct thread_data *td, struct fio_file *f) return generic_close_file(td, f); } +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; + + 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; + } + + 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) +{ + int ret; + struct netio_options *o = td->eo; + + if (o->listen) + ret = fio_netio_accept(td, f); + else + 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_inet(struct thread_data *td, const char *host, unsigned short port) { @@ -644,7 +743,7 @@ static int fio_netio_setup_listen_inet(struct thread_data *td, short port) } 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; } @@ -783,7 +882,12 @@ static int fio_netio_setup(struct thread_data *td) return 0; } -#ifdef FIO_HAVE_SPLICE +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; @@ -811,11 +915,12 @@ static struct ioengine_ops ioengine_splice = { .init = fio_netio_init, .cleanup = fio_netio_cleanup, .open_file = fio_netio_open_file, - .close_file = generic_close_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_SIGTERM | FIO_PIPEIO, + FIO_PIPEIO, }; #endif @@ -829,10 +934,11 @@ static struct ioengine_ops ioengine_rw = { .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_SIGTERM | FIO_PIPEIO, + FIO_PIPEIO, }; static int str_hostname_cb(void *data, const char *input) @@ -848,7 +954,7 @@ static int str_hostname_cb(void *data, const char *input) static void fio_init fio_netio_register(void) { register_ioengine(&ioengine_rw); -#ifdef FIO_HAVE_SPLICE +#ifdef CONFIG_LINUX_SPLICE register_ioengine(&ioengine_splice); #endif } @@ -856,7 +962,7 @@ static void fio_init fio_netio_register(void) static void fio_exit fio_netio_unregister(void) { unregister_ioengine(&ioengine_rw); -#ifdef FIO_HAVE_SPLICE +#ifdef CONFIG_LINUX_SPLICE unregister_ioengine(&ioengine_splice); #endif }