int use_splice;
int pipes[2];
struct sockaddr_in addr;
+ struct sockaddr_in6 addr6;
struct sockaddr_un addr_un;
};
FIO_TYPE_TCP = 1,
FIO_TYPE_UDP = 2,
FIO_TYPE_UNIX = 3,
+ FIO_TYPE_TCP_V6 = 4,
+ FIO_TYPE_UDP_V6 = 5,
};
static int str_hostname_cb(void *data, const char *input);
.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",
},
};
+static inline int is_udp(struct netio_options *o)
+{
+ return o->proto == FIO_TYPE_UDP || o->proto == FIO_TYPE_UDP_V6;
+}
+
+static inline int is_tcp(struct netio_options *o)
+{
+ return o->proto == FIO_TYPE_TCP || o->proto == FIO_TYPE_TCP_V6;
+}
+
+static inline int is_ipv6(struct netio_options *o)
+{
+ return o->proto == FIO_TYPE_UDP_V6 || o->proto == FIO_TYPE_TCP_V6;
+}
+
/*
* Return -1 for error and 'nr events' for a positive number
* of events
/*
* Make sure we don't see spurious reads to a receiver, and vice versa
*/
- if (o->proto == FIO_TYPE_TCP)
+ if (is_tcp(o))
return 0;
if ((o->listen && io_u->ddir == DDIR_WRITE) ||
int ret, flags = 0;
do {
- if (o->proto == FIO_TYPE_UDP) {
- struct sockaddr *to = (struct sockaddr *) &nd->addr;
+ if (is_udp(o)) {
+ const struct sockaddr *to;
+ socklen_t len;
+
+ if (is_ipv6(o)) {
+ to = (struct sockaddr *) &nd->addr6;
+ len = sizeof(nd->addr6);
+ } else {
+ to = (struct sockaddr *) &nd->addr;
+ len = sizeof(nd->addr);
+ }
ret = sendto(io_u->file->fd, io_u->xfer_buf,
- io_u->xfer_buflen, flags, to,
- sizeof(*to));
+ io_u->xfer_buflen, flags, to, len);
} else {
/*
* if we are going to write more, set MSG_MORE
int ret, flags = 0;
do {
- if (o->proto == FIO_TYPE_UDP) {
- socklen_t l;
- socklen_t *len = &l;
+ if (is_udp(o)) {
struct sockaddr *from;
+ socklen_t l, *len = &l;
if (o->listen) {
- from = (struct sockaddr *) &nd->addr;
- *len = sizeof(nd->addr);
+ if (!is_ipv6(o)) {
+ from = (struct sockaddr *) &nd->addr;
+ *len = sizeof(nd->addr);
+ } else {
+ from = (struct sockaddr *) &nd->addr6;
+ *len = sizeof(nd->addr6);
+ }
} else {
from = NULL;
len = NULL;
int ret;
if (ddir == DDIR_WRITE) {
- if (!nd->use_splice || o->proto == FIO_TYPE_UDP ||
+ if (!nd->use_splice || is_udp(o) ||
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 ||
+ if (!nd->use_splice || is_udp(o) ||
o->proto == FIO_TYPE_UNIX)
ret = fio_netio_recv(td, io_u);
else
if (o->proto == FIO_TYPE_TCP) {
domain = AF_INET;
type = SOCK_STREAM;
+ } else if (o->proto == FIO_TYPE_TCP_V6) {
+ domain = AF_INET6;
+ type = SOCK_STREAM;
} else if (o->proto == FIO_TYPE_UDP) {
domain = AF_INET;
type = SOCK_DGRAM;
+ } else if (o->proto == FIO_TYPE_UDP_V6) {
+ domain = AF_INET6;
+ type = SOCK_DGRAM;
} else if (o->proto == FIO_TYPE_UNIX) {
domain = AF_UNIX;
type = SOCK_STREAM;
}
#ifdef CONFIG_TCP_NODELAY
- if (o->nodelay && o->proto == FIO_TYPE_TCP) {
+ if (o->nodelay && is_tcp(o)) {
int optval = 1;
if (setsockopt(f->fd, IPPROTO_TCP, TCP_NODELAY, (void *) &optval, sizeof(int)) < 0) {
}
#endif
- if (o->proto == FIO_TYPE_UDP) {
+ if (is_udp(o)) {
if (!fio_netio_is_multicast(td->o.filename))
return 0;
+ if (is_ipv6(o)) {
+ log_err("fio: multicast not supported on IPv6\n");
+ close(f->fd);
+ return 1;
+ }
if (o->intfc) {
struct in_addr interface_addr;
+
if (inet_aton(o->intfc, &interface_addr) == 0) {
log_err("fio: interface not valid interface IP\n");
close(f->fd);
close(f->fd);
return 1;
}
+ } else if (o->proto == FIO_TYPE_TCP_V6) {
+ socklen_t len = sizeof(nd->addr6);
+
+ if (connect(f->fd, (struct sockaddr *) &nd->addr6, len) < 0) {
+ td_verror(td, errno, "connect");
+ close(f->fd);
+ return 1;
+ }
+
} else {
struct sockaddr_un *addr = &nd->addr_un;
socklen_t len;
{
struct netio_data *nd = td->io_ops->data;
struct netio_options *o = td->eo;
- socklen_t socklen = sizeof(nd->addr);
+ socklen_t socklen;
int state;
- if (o->proto == FIO_TYPE_UDP) {
+ if (is_udp(o)) {
f->fd = nd->listenfd;
return 0;
}
if (poll_wait(td, nd->listenfd, POLLIN) < 0)
goto err;
- f->fd = accept(nd->listenfd, (struct sockaddr *) &nd->addr, &socklen);
+ if (o->proto == FIO_TYPE_TCP) {
+ socklen = sizeof(nd->addr);
+ f->fd = accept(nd->listenfd, (struct sockaddr *) &nd->addr, &socklen);
+ } else {
+ socklen = sizeof(nd->addr6);
+ f->fd = accept(nd->listenfd, (struct sockaddr *) &nd->addr6, &socklen);
+ }
+
if (f->fd < 0) {
td_verror(td, errno, "accept");
goto err;
}
#ifdef CONFIG_TCP_NODELAY
- if (o->nodelay && o->proto == FIO_TYPE_TCP) {
+ if (o->nodelay && is_tcp(o)) {
int optval = 1;
if (setsockopt(f->fd, IPPROTO_TCP, TCP_NODELAY, (void *) &optval, sizeof(int)) < 0) {
static void fio_netio_udp_close(struct thread_data *td, struct fio_file *f)
{
struct netio_data *nd = td->io_ops->data;
+ struct netio_options *o = td->eo;
struct udp_close_msg msg;
- struct sockaddr *to = (struct sockaddr *) &nd->addr;
+ struct sockaddr *to;
+ socklen_t len;
int ret;
+ if (is_ipv6(o)) {
+ to = (struct sockaddr *) &nd->addr6;
+ len = sizeof(nd->addr6);
+ } else {
+ to = (struct sockaddr *) &nd->addr;
+ len = sizeof(nd->addr);
+ }
+
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));
+ ret = sendto(f->fd, (void *) &msg, sizeof(msg), MSG_WAITALL, to, len);
if (ret < 0)
td_verror(td, errno, "sendto udp link close");
}
* If this is an UDP connection, notify the receiver that we are
* closing down the link
*/
- if (o->proto == FIO_TYPE_UDP)
+ if (is_udp(o))
fio_netio_udp_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_options *o = td->eo;
struct udp_close_msg msg;
- struct sockaddr *to = (struct sockaddr *) &nd->addr;
- socklen_t len = sizeof(nd->addr);
+ struct sockaddr *to;
+ socklen_t len;
int ret;
+ if (is_ipv6(o)) {
+ len = sizeof(nd->addr6);
+ to = (struct sockaddr *) &nd->addr6;
+ } else {
+ len = sizeof(nd->addr);
+ to = (struct sockaddr *) &nd->addr;
+ }
+
ret = recvfrom(f->fd, (void *) &msg, sizeof(msg), MSG_WAITALL, to, &len);
if (ret < 0) {
td_verror(td, errno, "recvfrom udp link open");
static int fio_netio_udp_send_open(struct thread_data *td, struct fio_file *f)
{
struct netio_data *nd = td->io_ops->data;
+ struct netio_options *o = td->eo;
struct udp_close_msg msg;
- struct sockaddr *to = (struct sockaddr *) &nd->addr;
+ struct sockaddr *to;
+ socklen_t len;
int ret;
+ if (is_ipv6(o)) {
+ len = sizeof(nd->addr6);
+ to = (struct sockaddr *) &nd->addr6;
+ } else {
+ len = sizeof(nd->addr);
+ to = (struct sockaddr *) &nd->addr;
+ }
+
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));
+ ret = sendto(f->fd, (void *) &msg, sizeof(msg), MSG_WAITALL, to, len);
if (ret < 0) {
td_verror(td, errno, "sendto udp link open");
return ret;
return ret;
}
- if (o->proto == FIO_TYPE_UDP) {
+ if (is_udp(o)) {
if (td_write(td))
ret = fio_netio_udp_send_open(td, f);
else {
return ret;
}
+static int fio_fill_addr(struct thread_data *td, const char *host, int af,
+ void *dst, struct addrinfo **res)
+{
+ struct netio_options *o = td->eo;
+ struct addrinfo hints;
+ int ret;
+
+ if (inet_pton(af, host, dst))
+ return 0;
+
+ memset(&hints, 0, sizeof(hints));
+
+ if (is_tcp(o))
+ hints.ai_socktype = SOCK_STREAM;
+ else
+ hints.ai_socktype = SOCK_DGRAM;
+
+ if (is_ipv6(o))
+ hints.ai_family = AF_INET6;
+ else
+ hints.ai_family = AF_INET;
+
+ ret = getaddrinfo(host, NULL, &hints, res);
+ if (ret) {
+ int e = EINVAL;
+ char str[128];
+
+ if (ret == EAI_SYSTEM)
+ e = errno;
+
+ snprintf(str, sizeof(str), "getaddrinfo: %s", gai_strerror(ret));
+ td_verror(td, e, str);
+ return 1;
+ }
+
+ return 0;
+}
+
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_options *o = td->eo;
+ struct addrinfo *res = NULL;
+ void *dst, *src;
+ int af, len;
if (!host) {
log_err("fio: connect with no host to connect to.\n");
nd->addr.sin_family = AF_INET;
nd->addr.sin_port = htons(port);
+ nd->addr6.sin6_family = AF_INET6;
+ nd->addr6.sin6_port = htons(port);
+
+ if (is_ipv6(o)) {
+ af = AF_INET6;
+ dst = &nd->addr6.sin6_addr;
+ } else {
+ af = AF_INET;
+ dst = &nd->addr.sin_addr;
+ }
- if (inet_aton(host, &nd->addr.sin_addr) != 1) {
- struct hostent *hent;
+ if (fio_fill_addr(td, host, af, dst, &res))
+ return 1;
- hent = gethostbyname(host);
- if (!hent) {
- td_verror(td, errno, "gethostbyname");
- return 1;
- }
+ if (!res)
+ return 0;
- memcpy(&nd->addr.sin_addr, hent->h_addr, 4);
+ if (is_ipv6(o)) {
+ len = sizeof(nd->addr6.sin6_addr);
+ src = &((struct sockaddr_in6 *) res->ai_addr)->sin6_addr;
+ } else {
+ len = sizeof(nd->addr.sin_addr);
+ src = &((struct sockaddr_in *) res->ai_addr)->sin_addr;
}
+ memcpy(dst, src, len);
+ freeaddrinfo(res);
return 0;
}
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;
}
{
struct netio_options *o = td->eo;
- if (o->proto == FIO_TYPE_UDP || o->proto == FIO_TYPE_TCP)
+ if (is_udp(o) || is_tcp(o))
return fio_netio_setup_connect_inet(td, td->o.filename,o->port);
else
return fio_netio_setup_connect_unix(td, td->o.filename);
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;
struct netio_options *o = td->eo;
struct ip_mreq mr;
struct sockaddr_in sin;
- int fd, opt, type;
+ struct sockaddr_in6 sin6;
+ struct sockaddr *saddr;
+ int fd, opt, type, domain;
+ socklen_t len;
memset(&sin, 0, sizeof(sin));
- if (o->proto == FIO_TYPE_TCP)
+ memset(&sin6, 0, sizeof(sin6));
+
+ if (o->proto == FIO_TYPE_TCP) {
type = SOCK_STREAM;
- else
+ domain = AF_INET;
+ } else if (o->proto == FIO_TYPE_TCP_V6) {
+ type = SOCK_STREAM;
+ domain = AF_INET6;
+ } else if (o->proto == FIO_TYPE_UDP) {
+ type = SOCK_DGRAM;
+ domain = AF_INET;
+ } else if (o->proto == FIO_TYPE_UDP_V6) {
type = SOCK_DGRAM;
+ domain = AF_INET6;
+ } else {
+ log_err("fio: unknown proto %d\n", o->proto);
+ return 1;
+ }
- fd = socket(AF_INET, type, 0);
+ fd = socket(domain, type, 0);
if (fd < 0) {
td_verror(td, errno, "socket");
return 1;
}
#endif
- if (td->o.filename){
- if(o->proto != FIO_TYPE_UDP ||
- !fio_netio_is_multicast(td->o.filename)) {
+ 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");
close(fd);
return 1;
}
+ if (is_ipv6(o)) {
+ log_err("fio: IPv6 not supported for multicast network IO");
+ close(fd);
+ return 1;
+ }
inet_aton(td->o.filename, &sin.sin_addr);
} else {
mr.imr_interface.s_addr = htonl(INADDR_ANY);
}
+
if (setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, (const char*)&mr, sizeof(mr)) < 0) {
td_verror(td, errno, "setsockopt IP_ADD_MEMBERSHIP");
close(fd);
}
}
- nd->addr.sin_family = AF_INET;
- 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 (!is_ipv6(o)) {
+ saddr = (struct sockaddr *) &nd->addr;
+ len = sizeof(nd->addr);
- if (bind(fd, (struct sockaddr *) &nd->addr, sizeof(nd->addr)) < 0) {
+ nd->addr.sin_family = AF_INET;
+ 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);
+ } else {
+ saddr = (struct sockaddr *) &nd->addr6;
+ 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_port = htons(port);
+ }
+
+ if (bind(fd, saddr, len) < 0) {
+ close(fd);
td_verror(td, errno, "bind");
return 1;
}
struct netio_options *o = td->eo;
int ret;
- if (o->proto == FIO_TYPE_UDP || o->proto == FIO_TYPE_TCP)
+ if (is_udp(o) || is_tcp(o))
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)
+ if (is_udp(o))
return 0;
if (listen(nd->listenfd, 10) < 0) {
return 1;
}
- if (o->proto != FIO_TYPE_TCP) {
+ if (!is_tcp(o)) {
if (o->listen) {
log_err("fio: listen only valid for TCP proto IO\n");
return 1;
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) {
projects / fio.git / blobdiff