engines/net: add TCP_MAXSEG setting (mss)

[fio.git] / engines / net.c

diff --git a/engines/net.c b/engines/net.c
index 4be106a28307e20db7ee26d315877b41d081ffec..9a327da8a442659f1098711671227102c27126da 100644 (file)
--- a/engines/net.c
+++ b/engines/net.c
@@ -39,6 +39,8 @@ struct netio_options {
        unsigned int pingpong;
        unsigned int nodelay;
        unsigned int ttl;
+       unsigned int window_size;
+       unsigned int mss;
        char *intfc;
 };
 
@@ -94,18 +96,22 @@ static struct fio_option options[] = {
                            .oval = FIO_TYPE_TCP,
                            .help = "Transmission Control Protocol",
                          },
+#ifdef CONFIG_IPV6
                          { .ival = "tcpv6",
                            .oval = FIO_TYPE_TCP_V6,
                            .help = "Transmission Control Protocol V6",
                          },
+#endif
                          { .ival = "udp",
                            .oval = FIO_TYPE_UDP,
                            .help = "User Datagram Protocol",
                          },
+#ifdef CONFIG_IPV6
                          { .ival = "udpv6",
                            .oval = FIO_TYPE_UDP_V6,
                            .help = "User Datagram Protocol V6",
                          },
+#endif
                          { .ival = "unix",
                            .oval = FIO_TYPE_UNIX,
                            .help = "UNIX domain socket",
@@ -161,6 +167,30 @@ static struct fio_option options[] = {
                .category = FIO_OPT_C_ENGINE,
                .group  = FIO_OPT_G_NETIO,
        },
+#ifdef CONFIG_NET_WINDOWSIZE
+       {
+               .name   = "window_size",
+               .lname  = "Window Size",
+               .type   = FIO_OPT_INT,
+               .off1   = offsetof(struct netio_options, window_size),
+               .minval = 0,
+               .help   = "Set socket buffer window size",
+               .category = FIO_OPT_C_ENGINE,
+               .group  = FIO_OPT_G_NETIO,
+       },
+#endif
+#ifdef CONFIG_NET_MSS
+       {
+               .name   = "mss",
+               .lname  = "Maximum segment size",
+               .type   = FIO_OPT_INT,
+               .off1   = offsetof(struct netio_options, mss),
+               .minval = 0,
+               .help   = "Set TCP maximum segment size",
+               .category = FIO_OPT_C_ENGINE,
+               .group  = FIO_OPT_G_NETIO,
+       },
+#endif
        {
                .name   = NULL,
        },
@@ -181,6 +211,65 @@ static inline int is_ipv6(struct netio_options *o)
        return o->proto == FIO_TYPE_UDP_V6 || o->proto == FIO_TYPE_TCP_V6;
 }
 
+static int set_window_size(struct thread_data *td, int fd)
+{
+#ifdef CONFIG_NET_WINDOWSIZE
+       struct netio_options *o = td->eo;
+       unsigned int wss;
+       int snd, rcv, ret;
+
+       if (!o->window_size)
+               return 0;
+
+       rcv = o->listen || o->pingpong;
+       snd = !o->listen || o->pingpong;
+       wss = o->window_size;
+       ret = 0;
+
+       if (rcv) {
+               ret = setsockopt(fd, SOL_SOCKET, SO_RCVBUF, (void *) &wss,
+                                       sizeof(wss));
+               if (ret < 0)
+                       td_verror(td, errno, "rcvbuf window size");
+       }
+       if (snd && !ret) {
+               ret = setsockopt(fd, SOL_SOCKET, SO_SNDBUF, (void *) &wss,
+                                       sizeof(wss));
+               if (ret < 0)
+                       td_verror(td, errno, "sndbuf window size");
+       }
+
+       return ret;
+#else
+       td_verror(td, -EINVAL, "setsockopt window size");
+       return -1;
+#endif
+}
+
+static int set_mss(struct thread_data *td, int fd)
+{
+#ifdef CONFIG_NET_MSS
+       struct netio_options *o = td->eo;
+       unsigned int mss;
+       int ret;
+
+       if (!o->mss || !is_tcp(o))
+               return 0;
+
+       mss = o->mss;
+       ret = setsockopt(fd, IPPROTO_TCP, TCP_MAXSEG, (void *) &mss,
+                               sizeof(mss));
+       if (ret < 0)
+               td_verror(td, errno, "setsockopt TCP_MAXSEG");
+
+       return ret;
+#else
+       td_verror(td, -EINVAL, "setsockopt TCP_MAXSEG");
+       return -1;
+#endif
+}
+
+
 /*
  * Return -1 for error and 'nr events' for a positive number
  * of events
@@ -388,7 +477,7 @@ static int fio_netio_send(struct thread_data *td, struct io_u *io_u)
 
        do {
                if (is_udp(o)) {
-                       struct sockaddr *to;
+                       const struct sockaddr *to;
                        socklen_t len;
 
                        if (is_ipv6(o)) {
@@ -511,11 +600,13 @@ static int __fio_netio_queue(struct thread_data *td, struct io_u *io_u,
                ret = 0;        /* must be a SYNC */
 
        if (ret != (int) io_u->xfer_buflen) {
-               if (ret >= 0) {
+               if (ret > 0) {
                        io_u->resid = io_u->xfer_buflen - ret;
                        io_u->error = 0;
                        return FIO_Q_COMPLETED;
-               } else {
+               } else if (!ret)
+                       return FIO_Q_BUSY;
+               else {
                        int err = errno;
 
                        if (ddir == DDIR_WRITE && err == EMSGSIZE)
@@ -597,6 +688,15 @@ static int fio_netio_connect(struct thread_data *td, struct fio_file *f)
        }
 #endif
 
+       if (set_window_size(td, f->fd)) {
+               close(f->fd);
+               return 1;
+       }
+       if (set_mss(td, f->fd)) {
+               close(f->fd);
+               return 1;
+       }
+
        if (is_udp(o)) {
                if (!fio_netio_is_multicast(td->o.filename))
                        return 0;
@@ -909,10 +1009,10 @@ static int fio_netio_setup_connect_inet(struct thread_data *td,
 
        if (is_ipv6(o)) {
                af = AF_INET6;
-               dst = &nd->addr6;
+               dst = &nd->addr6.sin6_addr;
        } else {
                af = AF_INET;
-               dst = &nd->addr;
+               dst = &nd->addr.sin_addr;
        }
 
        if (fio_fill_addr(td, host, af, dst, &res))
@@ -941,7 +1041,8 @@ static int fio_netio_setup_connect_unix(struct thread_data *td,
        struct sockaddr_un *soun = &nd->addr_un;
 
        soun->sun_family = AF_UNIX;
-       strcpy(soun->sun_path, path);
+       memset(soun->sun_path, 0, sizeof(soun->sun_path));
+       strncpy(soun->sun_path, path, sizeof(soun->sun_path) - 1);
        return 0;
 }
 
@@ -972,7 +1073,7 @@ static int fio_netio_setup_listen_unix(struct thread_data *td, const char *path)
 
        memset(addr, 0, sizeof(*addr));
        addr->sun_family = AF_UNIX;
-       strcpy(addr->sun_path, path);
+       strncpy(addr->sun_path, path, sizeof(addr->sun_path) - 1);
        unlink(path);
 
        len = sizeof(addr->sun_family) + strlen(path) + 1;
@@ -994,13 +1095,11 @@ static int fio_netio_setup_listen_inet(struct thread_data *td, short port)
        struct netio_options *o = td->eo;
        struct ip_mreq mr;
        struct sockaddr_in sin;
-       struct sockaddr_in6 sin6;
        struct sockaddr *saddr;
        int fd, opt, type, domain;
        socklen_t len;
 
        memset(&sin, 0, sizeof(sin));
-       memset(&sin6, 0, sizeof(sin6));
 
        if (o->proto == FIO_TYPE_TCP) {
                type = SOCK_STREAM;
@@ -1039,6 +1138,15 @@ static int fio_netio_setup_listen_inet(struct thread_data *td, short port)
        }
 #endif
 
+       if (set_window_size(td, fd)) {
+               close(fd);
+               return 1;
+       }
+       if (set_mss(td, fd)) {
+               close(fd);
+               return 1;
+       }
+
        if (td->o.filename) {
                if (!is_udp(o) || !fio_netio_is_multicast(td->o.filename)) {
                        log_err("fio: hostname not valid for non-multicast inbound network IO\n");
@@ -1083,11 +1191,12 @@ static int fio_netio_setup_listen_inet(struct thread_data *td, short port)
                len = sizeof(nd->addr6);
 
                nd->addr6.sin6_family = AF_INET6;
-               nd->addr6.sin6_addr = sin6.sin6_addr.s6_addr ? sin6.sin6_addr : in6addr_any;
+               nd->addr6.sin6_addr = in6addr_any;
                nd->addr6.sin6_port = htons(port);
        }
 
        if (bind(fd, saddr, len) < 0) {
+               close(fd);
                td_verror(td, errno, "bind");
                return 1;
        }
@@ -1190,8 +1299,9 @@ static int fio_netio_setup(struct thread_data *td)
        struct netio_data *nd;
 
        if (!td->files_index) {
-               add_file(td, td->o.filename ?: "net");
+               add_file(td, td->o.filename ?: "net", 0, 0);
                td->o.nr_files = td->o.nr_files ?: 1;
+               td->o.open_files++;
        }
 
        if (!td->io_ops->data) {
@@ -1208,7 +1318,7 @@ static int fio_netio_setup(struct thread_data *td)
 
 static void fio_netio_terminate(struct thread_data *td)
 {
-       kill(td->pid, SIGUSR2);
+       kill(td->pid, SIGTERM);
 }
 
 #ifdef CONFIG_LINUX_SPLICE