X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Fnet.c;h=0c90e1cac74f77d80dbdae4280c691bda06ec864;hb=1378cc68af81d2160ba1603b1724aac6c01f3a7f;hp=468bc7c81746a8f73935903e8c99d3990c2286e1;hpb=f681d0bac9c42e5d6bcb3601d2f3cfaa1c2cefb4;p=fio.git diff --git a/engines/net.c b/engines/net.c index 468bc7c8..0c90e1ca 100644 --- a/engines/net.c +++ b/engines/net.c @@ -7,9 +7,11 @@ #include #include #include +#include #include #include #include +#include #include #include #include @@ -33,6 +35,10 @@ struct netio_options { unsigned int port; unsigned int proto; unsigned int listen; + unsigned int pingpong; + unsigned int nodelay; + unsigned int ttl; + char * interface; }; struct udp_close_msg { @@ -42,7 +48,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, @@ -57,7 +64,8 @@ static struct fio_option options[] = { .type = FIO_OPT_STR_STORE, .cb = str_hostname_cb, .help = "Hostname for net IO engine", - .category = FIO_OPT_C_IO, + .category = FIO_OPT_C_ENGINE, + .group = FIO_OPT_G_NETIO, }, { .name = "port", @@ -67,7 +75,8 @@ static struct fio_option options[] = { .minval = 1, .maxval = 65535, .help = "Port to use for TCP or UDP net connections", - .category = FIO_OPT_C_IO, + .category = FIO_OPT_C_ENGINE, + .group = FIO_OPT_G_NETIO, }, { .name = "protocol", @@ -77,7 +86,6 @@ static struct fio_option options[] = { .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, @@ -92,14 +100,55 @@ static struct fio_option options[] = { .help = "UNIX domain socket", }, }, + .category = FIO_OPT_C_ENGINE, + .group = FIO_OPT_G_NETIO, }, +#ifdef CONFIG_TCP_NODELAY + { + .name = "nodelay", + .type = FIO_OPT_BOOL, + .off1 = offsetof(struct netio_options, nodelay), + .help = "Use TCP_NODELAY on TCP connections", + .category = FIO_OPT_C_ENGINE, + .group = FIO_OPT_G_NETIO, + }, +#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, + .category = FIO_OPT_C_ENGINE, + .group = FIO_OPT_G_NETIO, + }, + { + .name = "pingpong", + .type = FIO_OPT_STR_SET, + .off1 = offsetof(struct netio_options, pingpong), + .help = "Ping-pong IO requests", + .category = FIO_OPT_C_ENGINE, + .group = FIO_OPT_G_NETIO, + }, + { + .name = "interface", + .lname = "net engine interface", + .type = FIO_OPT_STR_STORE, + .off1 = offsetof(struct netio_options, interface), + .help = "Network interface to use", + .category = FIO_OPT_C_ENGINE, + .group = FIO_OPT_G_NETIO, + }, + { + .name = "ttl", + .lname = "net engine multicast ttl", + .type = FIO_OPT_INT, + .off1 = offsetof(struct netio_options, ttl), + .def = "1", + .minval = 0, + .help = "Time-to-live value for outgoing UDP multicast packets", + .category = FIO_OPT_C_ENGINE, + .group = FIO_OPT_G_NETIO, }, { .name = NULL, @@ -137,6 +186,20 @@ static int poll_wait(struct thread_data *td, int fd, short events) return -1; } +static int fio_netio_is_multicast(const char *mcaddr) +{ + in_addr_t addr = inet_network(mcaddr); + if (addr == -1) + return 0; + + if (inet_network("224.0.0.0") <= addr && + inet_network("239.255.255.255") >= addr) + return 1; + + return 0; +} + + static int fio_netio_prep(struct thread_data *td, struct io_u *io_u) { struct netio_options *o = td->eo; @@ -156,7 +219,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; @@ -295,7 +358,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) { @@ -309,8 +372,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, @@ -322,8 +385,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; @@ -337,7 +398,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; @@ -349,15 +410,24 @@ 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); - struct sockaddr *from = (struct sockaddr *) &nd->addr; + socklen_t l; + socklen_t *len = &l; + struct sockaddr *from; + + if (o->listen) { + from = (struct sockaddr *) &nd->addr; + *len = sizeof(nd->addr); + } else { + from = NULL; + len = NULL; + } ret = recvfrom(io_u->file->fd, io_u->xfer_buf, - io_u->xfer_buflen, flags, from, &len); + io_u->xfer_buflen, flags, from, len); if (is_udp_close(io_u, ret)) { td->done = 1; return 0; @@ -368,32 +438,32 @@ static int fio_netio_recv(struct thread_data *td, struct io_u *io_u) } 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 &= ~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); @@ -410,7 +480,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; @@ -423,6 +493,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; @@ -450,10 +542,42 @@ static int fio_netio_connect(struct thread_data *td, struct fio_file *f) return 1; } - if (o->proto == FIO_TYPE_UDP) +#ifdef CONFIG_TCP_NODELAY + if (o->nodelay && o->proto == FIO_TYPE_TCP) { + int 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) { + if (!fio_netio_is_multicast(td->o.filename)) + return 0; + + if (o->interface) { + struct in_addr interface_addr; + if (inet_aton(o->interface, &interface_addr) == 0) { + log_err("fio: interface not valid interface IP\n"); + close(f->fd); + return 1; + } + if (setsockopt(f->fd, IPPROTO_IP, IP_MULTICAST_IF, &interface_addr, sizeof(interface_addr)) < 0) { + td_verror(td, errno, "setsockopt IP_MULTICAST_IF"); + close(f->fd); + return 1; + } + } + if (setsockopt(f->fd, IPPROTO_IP, IP_MULTICAST_TTL, &o->ttl, sizeof(o->ttl)) < 0) { + td_verror(td, errno, "setsockopt IP_MULTICAST_TTL"); + close(f->fd); + return 1; + } return 0; - else if (o->proto == FIO_TYPE_TCP) { - fio_socklen_t len = sizeof(nd->addr); + } 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"); @@ -462,7 +586,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; @@ -480,40 +604,45 @@ 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; } - return 0; -} - -static int fio_netio_open_file(struct thread_data *td, struct fio_file *f) -{ - int ret; - struct netio_options *o = td->eo; +#ifdef CONFIG_TCP_NODELAY + if (o->nodelay && o->proto == FIO_TYPE_TCP) { + int optval = 1; - if (o->listen) - ret = fio_netio_accept(td, f); - else - ret = fio_netio_connect(td, f); + 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 (ret) - f->fd = -1; - return ret; + 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) @@ -523,10 +652,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"); @@ -546,11 +675,98 @@ 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, "recvfrom 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) { 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); @@ -627,8 +843,11 @@ 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; + struct ip_mreq mr; + struct sockaddr_in sin; int fd, opt, type; + memset(&sin, 0, sizeof(sin)); if (o->proto == FIO_TYPE_TCP) type = SOCK_STREAM; else @@ -641,19 +860,48 @@ 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"); + close(fd); 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"); + close(fd); return 1; } #endif + if (td->o.filename){ + if(o->proto != FIO_TYPE_UDP || + !fio_netio_is_multicast(td->o.filename)) { + log_err("fio: hostname not valid for non-multicast inbound network IO\n"); + close(fd); + return 1; + } + + inet_aton(td->o.filename, &sin.sin_addr); + + mr.imr_multiaddr = sin.sin_addr; + if (o->interface) { + if (inet_aton(o->interface, &mr.imr_interface) == 0) { + log_err("fio: interface not valid interface IP\n"); + close(fd); + return 1; + } + } else { + mr.imr_interface.s_addr = htonl(INADDR_ANY); + } + if (setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mr, sizeof(mr)) < 0) { + td_verror(td, errno, "setsockopt IP_ADD_MEMBERSHIP"); + close(fd); + return 1; + } + } + nd->addr.sin_family = AF_INET; - nd->addr.sin_addr.s_addr = htonl(INADDR_ANY); + nd->addr.sin_addr.s_addr = sin.sin_addr.s_addr ? sin.sin_addr.s_addr : htonl(INADDR_ANY); nd->addr.sin_port = htons(port); if (bind(fd, (struct sockaddr *) &nd->addr, sizeof(nd->addr)) < 0) { @@ -730,11 +978,6 @@ static int fio_netio_init(struct thread_data *td) o->listen = td_read(td); } - 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 @@ -780,7 +1023,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; @@ -808,11 +1056,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 @@ -826,10 +1075,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 | FIO_BIT_BASED, }; static int str_hostname_cb(void *data, const char *input) @@ -845,7 +1095,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 } @@ -853,7 +1103,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 }