Add missing trailing \n in log_err/info()

[fio.git] / engines / net.c

diff --git a/engines/net.c b/engines/net.c
index ac5a93c8309b7bd275461cc599ff18f8389947a0..3bdd5cd0ff3410e24abbd80b3c26cebda5c8a192 100644 (file)
--- a/engines/net.c
+++ b/engines/net.c
@@ -21,14 +21,19 @@
 #include <sys/un.h>
 
 #include "../fio.h"
+#include "../verify.h"
+#include "../optgroup.h"
 
 struct netio_data {
        int listenfd;
        int use_splice;
+       int seq_off;
        int pipes[2];
        struct sockaddr_in addr;
        struct sockaddr_in6 addr6;
        struct sockaddr_un addr_un;
+       uint64_t udp_send_seq;
+       uint64_t udp_recv_seq;
 };
 
 struct netio_options {
@@ -40,6 +45,7 @@ struct netio_options {
        unsigned int nodelay;
        unsigned int ttl;
        unsigned int window_size;
+       unsigned int mss;
        char *intfc;
 };
 
@@ -48,10 +54,17 @@ struct udp_close_msg {
        uint32_t cmd;
 };
 
+struct udp_seq {
+       uint64_t magic;
+       uint64_t seq;
+       uint64_t bs;
+};
+
 enum {
        FIO_LINK_CLOSE = 0x89,
        FIO_LINK_OPEN_CLOSE_MAGIC = 0x6c696e6b,
        FIO_LINK_OPEN = 0x98,
+       FIO_UDP_SEQ_MAGIC = 0x657375716e556563ULL,
 
        FIO_TYPE_TCP    = 1,
        FIO_TYPE_UDP    = 2,
@@ -122,6 +135,7 @@ static struct fio_option options[] = {
 #ifdef CONFIG_TCP_NODELAY
        {
                .name   = "nodelay",
+               .lname  = "No Delay",
                .type   = FIO_OPT_BOOL,
                .off1   = offsetof(struct netio_options, nodelay),
                .help   = "Use TCP_NODELAY on TCP connections",
@@ -140,6 +154,7 @@ static struct fio_option options[] = {
        },
        {
                .name   = "pingpong",
+               .lname  = "Ping Pong",
                .type   = FIO_OPT_STR_SET,
                .off1   = offsetof(struct netio_options, pingpong),
                .help   = "Ping-pong IO requests",
@@ -177,6 +192,18 @@ static struct fio_option options[] = {
                .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,
@@ -233,6 +260,30 @@ static int set_window_size(struct thread_data *td, int fd)
 #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
@@ -325,7 +376,7 @@ static int splice_io_u(int fdin, int fdout, unsigned int len)
  */
 static int splice_in(struct thread_data *td, struct io_u *io_u)
 {
-       struct netio_data *nd = td->io_ops->data;
+       struct netio_data *nd = td->io_ops_data;
 
        return splice_io_u(io_u->file->fd, nd->pipes[1], io_u->xfer_buflen);
 }
@@ -336,7 +387,7 @@ static int splice_in(struct thread_data *td, struct io_u *io_u)
 static int splice_out(struct thread_data *td, struct io_u *io_u,
                      unsigned int len)
 {
-       struct netio_data *nd = td->io_ops->data;
+       struct netio_data *nd = td->io_ops_data;
 
        return splice_io_u(nd->pipes[0], io_u->file->fd, len);
 }
@@ -374,7 +425,7 @@ static int vmsplice_io_u(struct io_u *io_u, int fd, unsigned int len)
 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;
+       struct netio_data *nd = td->io_ops_data;
 
        return vmsplice_io_u(io_u, nd->pipes[0], len);
 }
@@ -384,7 +435,7 @@ static int vmsplice_io_u_out(struct thread_data *td, struct io_u *io_u,
  */
 static int vmsplice_io_u_in(struct thread_data *td, struct io_u *io_u)
 {
-       struct netio_data *nd = td->io_ops->data;
+       struct netio_data *nd = td->io_ops_data;
 
        return vmsplice_io_u(io_u, nd->pipes[1], io_u->xfer_buflen);
 }
@@ -432,9 +483,50 @@ static int fio_netio_splice_out(struct thread_data *td, struct io_u *io_u)
 }
 #endif
 
+static void store_udp_seq(struct netio_data *nd, struct io_u *io_u)
+{
+       struct udp_seq *us;
+
+       if (io_u->xfer_buflen < sizeof(*us))
+               return;
+
+       us = io_u->xfer_buf + io_u->xfer_buflen - sizeof(*us);
+       us->magic = cpu_to_le64((uint64_t) FIO_UDP_SEQ_MAGIC);
+       us->bs = cpu_to_le64((uint64_t) io_u->xfer_buflen);
+       us->seq = cpu_to_le64(nd->udp_send_seq++);
+}
+
+static void verify_udp_seq(struct thread_data *td, struct netio_data *nd,
+                          struct io_u *io_u)
+{
+       struct udp_seq *us;
+       uint64_t seq;
+
+       if (io_u->xfer_buflen < sizeof(*us))
+               return;
+
+       if (nd->seq_off)
+               return;
+
+       us = io_u->xfer_buf + io_u->xfer_buflen - sizeof(*us);
+       if (le64_to_cpu(us->magic) != FIO_UDP_SEQ_MAGIC)
+               return;
+       if (le64_to_cpu(us->bs) != io_u->xfer_buflen) {
+               nd->seq_off = 1;
+               return;
+       }
+
+       seq = le64_to_cpu(us->seq);
+
+       if (seq != nd->udp_recv_seq)
+               td->ts.drop_io_u[io_u->ddir] += seq - nd->udp_recv_seq;
+
+       nd->udp_recv_seq = seq + 1;
+}
+
 static int fio_netio_send(struct thread_data *td, struct io_u *io_u)
 {
-       struct netio_data *nd = td->io_ops->data;
+       struct netio_data *nd = td->io_ops_data;
        struct netio_options *o = td->eo;
        int ret, flags = 0;
 
@@ -451,6 +543,9 @@ static int fio_netio_send(struct thread_data *td, struct io_u *io_u)
                                len = sizeof(nd->addr);
                        }
 
+                       if (td->o.verify == VERIFY_NONE)
+                               store_udp_seq(nd, io_u);
+
                        ret = sendto(io_u->file->fd, io_u->xfer_buf,
                                        io_u->xfer_buflen, flags, to, len);
                } else {
@@ -476,7 +571,7 @@ static int fio_netio_send(struct thread_data *td, struct io_u *io_u)
        return ret;
 }
 
-static int is_udp_close(struct io_u *io_u, int len)
+static int is_close_msg(struct io_u *io_u, int len)
 {
        struct udp_close_msg *msg;
 
@@ -484,9 +579,9 @@ 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_OPEN_CLOSE_MAGIC)
+       if (le32_to_cpu(msg->magic) != FIO_LINK_OPEN_CLOSE_MAGIC)
                return 0;
-       if (ntohl(msg->cmd) != FIO_LINK_CLOSE)
+       if (le32_to_cpu(msg->cmd) != FIO_LINK_CLOSE)
                return 0;
 
        return 1;
@@ -494,7 +589,7 @@ static int is_udp_close(struct io_u *io_u, int len)
 
 static int fio_netio_recv(struct thread_data *td, struct io_u *io_u)
 {
-       struct netio_data *nd = td->io_ops->data;
+       struct netio_data *nd = td->io_ops_data;
        struct netio_options *o = td->eo;
        int ret, flags = 0;
 
@@ -518,13 +613,19 @@ static int fio_netio_recv(struct thread_data *td, struct io_u *io_u)
 
                        ret = recvfrom(io_u->file->fd, io_u->xfer_buf,
                                        io_u->xfer_buflen, flags, from, len);
-                       if (is_udp_close(io_u, ret)) {
+
+                       if (is_close_msg(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 (is_close_msg(io_u, ret)) {
+                               td->done = 1;
+                               return 0;
+                       }
                }
                if (ret > 0)
                        break;
@@ -537,13 +638,16 @@ static int fio_netio_recv(struct thread_data *td, struct io_u *io_u)
                flags |= MSG_WAITALL;
        } while (1);
 
+       if (is_udp(o) && td->o.verify == VERIFY_NONE)
+               verify_udp_seq(td, nd, io_u);
+
        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_data *nd = td->io_ops_data;
        struct netio_options *o = td->eo;
        int ret;
 
@@ -609,7 +713,7 @@ static int fio_netio_queue(struct thread_data *td, struct io_u *io_u)
 
 static int fio_netio_connect(struct thread_data *td, struct fio_file *f)
 {
-       struct netio_data *nd = td->io_ops->data;
+       struct netio_data *nd = td->io_ops_data;
        struct netio_options *o = td->eo;
        int type, domain;
 
@@ -655,6 +759,10 @@ static int fio_netio_connect(struct thread_data *td, struct fio_file *f)
                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))
@@ -720,7 +828,7 @@ 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_data *nd = td->io_ops_data;
        struct netio_options *o = td->eo;
        socklen_t socklen;
        int state;
@@ -770,9 +878,9 @@ err:
        return 1;
 }
 
-static void fio_netio_udp_close(struct thread_data *td, struct fio_file *f)
+static void fio_netio_send_close(struct thread_data *td, struct fio_file *f)
 {
-       struct netio_data *nd = td->io_ops->data;
+       struct netio_data *nd = td->io_ops_data;
        struct netio_options *o = td->eo;
        struct udp_close_msg msg;
        struct sockaddr *to;
@@ -787,8 +895,8 @@ static void fio_netio_udp_close(struct thread_data *td, struct fio_file *f)
                len = sizeof(nd->addr);
        }
 
-       msg.magic = htonl(FIO_LINK_OPEN_CLOSE_MAGIC);
-       msg.cmd = htonl(FIO_LINK_CLOSE);
+       msg.magic = cpu_to_le32((uint32_t) FIO_LINK_OPEN_CLOSE_MAGIC);
+       msg.cmd = cpu_to_le32((uint32_t) FIO_LINK_CLOSE);
 
        ret = sendto(f->fd, (void *) &msg, sizeof(msg), MSG_WAITALL, to, len);
        if (ret < 0)
@@ -797,21 +905,17 @@ static void fio_netio_udp_close(struct thread_data *td, struct fio_file *f)
 
 static int fio_netio_close_file(struct thread_data *td, struct fio_file *f)
 {
-       struct netio_options *o = td->eo;
-
        /*
-        * If this is an UDP connection, notify the receiver that we are
-        * closing down the link
+        * Notify the receiver that we are closing down the link
         */
-       if (is_udp(o))
-               fio_netio_udp_close(td, f);
+       fio_netio_send_close(td, 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 netio_data *nd = td->io_ops_data;
        struct netio_options *o = td->eo;
        struct udp_close_msg msg;
        struct sockaddr *to;
@@ -839,12 +943,13 @@ static int fio_netio_udp_recv_open(struct thread_data *td, struct fio_file *f)
                return -1;
        }
 
+       fio_gettime(&td->start, NULL);
        return 0;
 }
 
-static int fio_netio_udp_send_open(struct thread_data *td, struct fio_file *f)
+static int fio_netio_send_open(struct thread_data *td, struct fio_file *f)
 {
-       struct netio_data *nd = td->io_ops->data;
+       struct netio_data *nd = td->io_ops_data;
        struct netio_options *o = td->eo;
        struct udp_close_msg msg;
        struct sockaddr *to;
@@ -888,7 +993,7 @@ static int fio_netio_open_file(struct thread_data *td, struct fio_file *f)
 
        if (is_udp(o)) {
                if (td_write(td))
-                       ret = fio_netio_udp_send_open(td, f);
+                       ret = fio_netio_send_open(td, f);
                else {
                        int state;
 
@@ -946,7 +1051,7 @@ static int fio_fill_addr(struct thread_data *td, const char *host, int af,
 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;
+       struct netio_data *nd = td->io_ops_data;
        struct netio_options *o = td->eo;
        struct addrinfo *res = NULL;
        void *dst, *src;
@@ -996,7 +1101,7 @@ static int fio_netio_setup_connect_inet(struct thread_data *td,
 static int fio_netio_setup_connect_unix(struct thread_data *td,
                                        const char *path)
 {
-       struct netio_data *nd = td->io_ops->data;
+       struct netio_data *nd = td->io_ops_data;
        struct sockaddr_un *soun = &nd->addr_un;
 
        soun->sun_family = AF_UNIX;
@@ -1017,7 +1122,7 @@ static int fio_netio_setup_connect(struct thread_data *td)
 
 static int fio_netio_setup_listen_unix(struct thread_data *td, const char *path)
 {
-       struct netio_data *nd = td->io_ops->data;
+       struct netio_data *nd = td->io_ops_data;
        struct sockaddr_un *addr = &nd->addr_un;
        mode_t mode;
        int len, fd;
@@ -1050,7 +1155,7 @@ static int fio_netio_setup_listen_unix(struct thread_data *td, const char *path)
 
 static int fio_netio_setup_listen_inet(struct thread_data *td, short port)
 {
-       struct netio_data *nd = td->io_ops->data;
+       struct netio_data *nd = td->io_ops_data;
        struct netio_options *o = td->eo;
        struct ip_mreq mr;
        struct sockaddr_in sin;
@@ -1101,6 +1206,10 @@ static int fio_netio_setup_listen_inet(struct thread_data *td, short port)
                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)) {
@@ -1109,7 +1218,7 @@ static int fio_netio_setup_listen_inet(struct thread_data *td, short port)
                        return 1;
                }
                if (is_ipv6(o)) {
-                       log_err("fio: IPv6 not supported for multicast network IO");
+                       log_err("fio: IPv6 not supported for multicast network IO\n");
                        close(fd);
                        return 1;
                }
@@ -1162,7 +1271,7 @@ static int fio_netio_setup_listen_inet(struct thread_data *td, short port)
 
 static int fio_netio_setup_listen(struct thread_data *td)
 {
-       struct netio_data *nd = td->io_ops->data;
+       struct netio_data *nd = td->io_ops_data;
        struct netio_options *o = td->eo;
        int ret;
 
@@ -1208,6 +1317,8 @@ static int fio_netio_init(struct thread_data *td)
                return 1;
        }
 
+       o->port += td->subjob_number;
+
        if (!is_tcp(o)) {
                if (o->listen) {
                        log_err("fio: listen only valid for TCP proto IO\n");
@@ -1235,7 +1346,7 @@ static int fio_netio_init(struct thread_data *td)
 
 static void fio_netio_cleanup(struct thread_data *td)
 {
-       struct netio_data *nd = td->io_ops->data;
+       struct netio_data *nd = td->io_ops_data;
 
        if (nd) {
                if (nd->listenfd != -1)
@@ -1259,13 +1370,13 @@ static int fio_netio_setup(struct thread_data *td)
                td->o.open_files++;
        }
 
-       if (!td->io_ops->data) {
+       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;
+               td->io_ops_data = nd;
        }
 
        return 0;
@@ -1283,7 +1394,7 @@ static int fio_netio_setup_splice(struct thread_data *td)
 
        fio_netio_setup(td);
 
-       nd = td->io_ops->data;
+       nd = td->io_ops_data;
        if (nd) {
                if (pipe(nd->pipes) < 0)
                        return 1;