From: <ch...@su...> - 2013-12-12 16:39:50
|
Hi! > This is a perfomance test for TCP Fast Open (TFO) which is an extension to > speed up the opening of TCP connections between two endpoints. It reduces > the number of round time trips (RTT) required in TCP conversations. TFO could > result in speed improvements of between 4% and 41% in the page load times on > popular web sites. > > The default test scenario simulates an average conversation between a > web-browser and an application server, so the test results with TFO enabled > must be at least 3 percent faster. > > The test must be run on Linux versions higher then 3.7. (TFO client side > implemented in Linux 3.6, server side in Linux 3.7). > > Signed-off-by: Alexey Kodanev <ale...@or...> > --- > testcases/network/tcp_fastopen/.gitignore | 1 + > testcases/network/tcp_fastopen/Makefile | 24 + > testcases/network/tcp_fastopen/README | 16 + > testcases/network/tcp_fastopen/tcp_fastopen.c | 783 ++++++++++++++++++++ > testcases/network/tcp_fastopen/tcp_fastopen_run.sh | 164 ++++ > 5 files changed, 988 insertions(+), 0 deletions(-) > create mode 100644 testcases/network/tcp_fastopen/.gitignore > create mode 100644 testcases/network/tcp_fastopen/Makefile > create mode 100644 testcases/network/tcp_fastopen/README > create mode 100644 testcases/network/tcp_fastopen/tcp_fastopen.c > create mode 100755 testcases/network/tcp_fastopen/tcp_fastopen_run.sh > > diff --git a/testcases/network/tcp_fastopen/.gitignore b/testcases/network/tcp_fastopen/.gitignore > new file mode 100644 > index 0000000..f321cf0 > --- /dev/null > +++ b/testcases/network/tcp_fastopen/.gitignore > @@ -0,0 +1 @@ > +/tcp_fastopen > diff --git a/testcases/network/tcp_fastopen/Makefile b/testcases/network/tcp_fastopen/Makefile > new file mode 100644 > index 0000000..769364f > --- /dev/null > +++ b/testcases/network/tcp_fastopen/Makefile > @@ -0,0 +1,24 @@ > +# Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved. > +# > +# This program is free software; you can redistribute it and/or > +# modify it under the terms of the GNU General Public License as > +# published by the Free Software Foundation; either version 2 of > +# the License, or (at your option) any later version. > +# > +# This program is distributed in the hope that it would be useful, > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +# GNU General Public License for more details. > +# > +# You should have received a copy of the GNU General Public License > +# along with this program; if not, write the Free Software Foundation, > +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA > + > +top_srcdir ?= ../../.. > + > +include $(top_srcdir)/include/mk/testcases.mk > + > +INSTALL_TARGETS := tcp_fastopen_run.sh > +LDLIBS += -lpthread -lrt > + > +include $(top_srcdir)/include/mk/generic_leaf_target.mk > diff --git a/testcases/network/tcp_fastopen/README b/testcases/network/tcp_fastopen/README > new file mode 100644 > index 0000000..4e19add > --- /dev/null > +++ b/testcases/network/tcp_fastopen/README > @@ -0,0 +1,16 @@ > +TCP Fast Open (TFO) is an extension to speed up the opening of TCP connections > +between two endpoints. It reduces the number of round time trips (RTT) > +required in TCP conversations. > + > +The test must be run on Linux versions higher then 3.7. (client side > +implemented in Linux 3.6, server side in Linux 3.7). > + > +Developers reported (in "TCP Fast Open", CoNEXT 2011), TFO could result in > +speed improvements of between 4% and 41% in the page load times on popular web > +sites. > + > +With the default test scenario, a client is constantly sending requests to > +a server and waiting for replies. The server is closing a connection after 3 > +requests from the client. This scenario was chosen to simulate an average > +conversation between a web-browser and an application server. So the test > +results with TFO support enabled must be at least 3 percent faster. > diff --git a/testcases/network/tcp_fastopen/tcp_fastopen.c b/testcases/network/tcp_fastopen/tcp_fastopen.c > new file mode 100644 > index 0000000..05a38cd > --- /dev/null > +++ b/testcases/network/tcp_fastopen/tcp_fastopen.c > @@ -0,0 +1,783 @@ > +/* > + * Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved. > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of > + * the License, or (at your option) any later version. > + * > + * This program is distributed in the hope that it would be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write the Free Software Foundation, > + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA > + * > + * Author: Alexey Kodanev <ale...@or...> > + * > + */ > + > +#include <sys/stat.h> > +#include <sys/types.h> > +#include <sys/socket.h> > +#include <sys/time.h> > +#include <sys/resource.h> > +#include <sys/sysinfo.h> > +#include <sys/poll.h> > +#include <netinet/in.h> > +#include <arpa/inet.h> > +#include <netdb.h> > +#include <signal.h> > +#include <stdio.h> > +#include <stdlib.h> > +#include <string.h> > +#include <pthread.h> > +#include <unistd.h> > +#include <stdio.h> > +#include <stdlib.h> > +#include <unistd.h> > +#include <string.h> > +#include <errno.h> > + > +#include "test.h" > +#include "usctest.h" > +#include "safe_macros.h" > + > +char *TCID = "tcp_fastopen"; > + > +static const int max_msg_len = 1500; > + > +/* TCP server requiers */ > +#ifndef TCP_FASTOPEN > +#define TCP_FASTOPEN 23 > +#endif > + > +/* TCP client requiers */ > +#ifndef MSG_FASTOPEN > +#define MSG_FASTOPEN 0x20000000 /* Send data in TCP SYN */ > +#endif > + > +enum { > + TCP_SERVER = 0, > + TCP_CLIENT, > +}; > +static int tcp_mode; > + > +enum { > + TFO_ENABLED = 0, > + TFO_DISABLED, > +}; > +static int tfo_support; > +static int fastopen_api; > + > +static const char tfo_cfg[] = "/proc/sys/net/ipv4/tcp_fastopen"; > +static const char tcp_tw_reuse[] = "/proc/sys/net/ipv4/tcp_tw_reuse"; > +static int tw_reuse_changed; > +static int tfo_cfg_value; > +static int tfo_bit_num; > +static int tfo_cfg_changed; > +static int tfo_queue_size = 100; > +static int max_queue_len = 100; > +static const int client_byte = 0x43; > +static const int server_byte = 0x53; > +static const int start_byte = 0x24; > +static const int start_fin_byte = 0x25; > +static const int end_byte = 0x0a; > +static int client_msg_size = 32; > +static int server_msg_size = 128; > +static char *client_msg; > +static char *server_msg; > + > +/* > + * The number of requests from client after > + * which server has to close the connection. > + */ > +static int server_max_requests = 3; > +static int client_max_requests = 10; > +static int clients_num = 2; > +static char *tcp_port = "61000"; > +static char *server_addr = "localhost"; > +/* server socket */ > +static int sfd; > + > +/* how long a client must wait for the server's reply, microsec */ > +static long wait_timeout = 10000000; > + > +/* in the end test will save time result in this file */ > +static char *rpath = "./tfo_result"; > +static int force_run; > +static int verbose; > + > +static char *narg, *Narg, *qarg, *rarg, *Rarg, *aarg, *Targ; > + > +static const option_t options[] = { > + /* server params */ > + {"R:", NULL, &Rarg}, > + {"q:", NULL, &qarg}, > + > + /* client params */ > + {"H:", NULL, &server_addr}, > + {"a:", NULL, &aarg}, > + {"n:", NULL, &narg}, > + {"N:", NULL, &Narg}, > + {"T:", NULL, &Targ}, > + {"r:", NULL, &rarg}, > + {"d:", NULL, &rpath}, > + > + /* common */ > + {"g:", NULL, &tcp_port}, > + {"F", &force_run, NULL}, > + {"l", &tcp_mode, NULL}, > + {"o", &fastopen_api, NULL}, > + {"O", &tfo_support, NULL}, > + {"v", &verbose, NULL}, > + {NULL, NULL, NULL} > +}; > + > +static void help(void) > +{ > + printf("\n -F Force to run\n"); > + printf(" -v Verbose\n"); > + printf(" -o Use old TCP API, default is new TCP API\n"); > + printf(" -O TFO support is off, default is on\n"); > + printf(" -l Become TCP Client, default is TCP server\n"); > + printf(" -g x x - server port, default is %s\n", tcp_port); > + > + printf("\n Client:\n"); > + printf(" -H x x - server name or ip address, default is '%s'\n", > + server_addr); > + printf(" -a x x - num of clients running in parallel\n"); > + printf(" -r x x - num of client requests\n"); > + printf(" -n x Client message size, max msg size is '%d'\n", > + max_msg_len); > + printf(" -N x Server message size, max msg size is '%d'\n", > + max_msg_len); > + printf(" -T x Reply timeout, default is '%ld' (microsec)\n", > + wait_timeout); > + printf(" -d x x is a path to the file where results are saved\n"); > + > + printf("\n Server:\n"); > + printf(" -R x x - num of requests, after which conn. closed\n"); > + printf(" -q x x - server's limit on the queue of TFO requests\n"); > +} > + > +/* common structure for TCP server and TCP client */ > +struct tcp_func { > + void (*init)(void); > + void (*run)(void); > + void (*cleanup)(void); > +}; > +static struct tcp_func tcp; > + > +#define MAX_THREADS 10000 > +static pthread_attr_t attr; > +static pthread_t *thread_ids; > +static int threads_num; > + > +static struct addrinfo *remote_addrinfo; > +static struct addrinfo *local_addrinfo; > +static const struct linger clo = { 1, 3 }; > + > +static void cleanup(void) > +{ > + static int first = 1; > + if (!first) > + return; > + first = 0; There is still chance for a race condition here. But this could be easily fixed by pthread_once(). static pthread_once_t cleanup_executed = PTHREAD_ONCE_INIT; static void do_cleanup(void) { /* Do the cleanup here */ } static void cleanup(void) { pthread_once(&cleanup_executed, do_cleanup); } Thinking of the problems with LTP library thread safety again. One of the solutions may be having two tst_res.c implementaions. Note that the source of thread safety problems is the cleanup function which is executed by the tst_brkm() and the exitval that is in the test library too. If we did so then we will have tst_res.c we have now and one providing thread safe implemenation using pthread synchronization primitives (likely both will be implemented on the top of the common code). And if we could switch which one gets linked to a test at the linker phase depending whether it uses pthreads or not the thread safety problem will be fixed once for all. I will think about this a bit more. > + tst_resm(TINFO, "cleanup"); > + > + free(client_msg); > + free(server_msg); > + > + tcp.cleanup(); > + > + if (tfo_cfg_changed) { > + SAFE_FILE_SCANF(NULL, tfo_cfg, "%d", &tfo_cfg_value); > + tfo_cfg_value &= ~tfo_bit_num; > + tfo_cfg_value |= !tfo_support << (tfo_bit_num - 1); > + tst_resm(TINFO, "unset '%s' back to '%d'", > + tfo_cfg, tfo_cfg_value); > + SAFE_FILE_PRINTF(NULL, tfo_cfg, "%d", tfo_cfg_value); > + } > + > + if (tw_reuse_changed) { > + SAFE_FILE_PRINTF(NULL, tcp_tw_reuse, "0"); > + tst_resm(TINFO, "unset '%s' back to '0'", tcp_tw_reuse); > + } > + TEST_CLEANUP; > +} > + > +static int sock_recv_poll(int fd, char *buf, int buf_size, int *offset) > +{ > + struct pollfd pfd; > + pfd.fd = fd; > + pfd.events = POLLIN; > + int len = -1; > + while (1) { > + errno = 0; > + int ret = poll(&pfd, 1, wait_timeout / 1000); > + if (ret == -1) { > + if (errno == EINTR) > + continue; > + tst_resm(TFAIL | TERRNO, "poll failed at %s:%d", > + __FILE__, __LINE__); > + break; > + } > + if (ret == 0) { > + tst_resm(TFAIL, "msg timeout, sock '%d'", fd); > + break; > + } > + > + if (ret != 1 || !(pfd.revents & POLLIN)) > + break; > + > + errno = 0; > + len = recv(fd, buf + *offset, > + buf_size - *offset, MSG_DONTWAIT); > + > + if (len == -1 && errno == EINTR) > + continue; > + else > + break; > + } > + > + if (len == 0) > + tst_resm(TINFO, "sock was closed '%d'", fd); > + > + return len; > +} > + > +static void client_recv(int *fd, char *buf) > +{ > + int len, offset = 0; > + > + while (1) { > + > + len = sock_recv_poll(*fd, buf, server_msg_size, &offset); > + > + /* socket closed or msg is not valid */ > + if (len < 1 || (offset + len) > server_msg_size || > + (buf[0] != start_byte && buf[0] != start_fin_byte)) { > + tst_resm(TFAIL | TERRNO, > + "recv failed, sock '%d'", *fd); > + shutdown(*fd, SHUT_WR); > + SAFE_CLOSE(NULL, *fd); > + *fd = -1; > + break; > + } > + > + offset += len; > + > + if (buf[offset - 1] != end_byte) > + continue; > + > + if (verbose) { > + tst_resm_hexd(TINFO, buf, offset, > + "msg recv from sock %d:", *fd); > + } > + > + if (buf[0] == start_fin_byte) { > + /* recv last msg, close socket */ > + shutdown(*fd, SHUT_WR); > + SAFE_CLOSE(NULL, *fd); > + *fd = -1; > + } > + break; > + } > +} > + > +static int client_connect_send(const char *msg, int size) > +{ > + int cfd = socket(AF_INET, SOCK_STREAM, 0); > + const int flag = 1; > + setsockopt(cfd, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof(flag)); > + > + if (cfd == -1) { > + tst_resm(TWARN | TERRNO, "socket failed at %s:%d", > + __FILE__, __LINE__); > + return cfd; > + } > + > + if (fastopen_api == TFO_ENABLED) { > + /* Replaces connect() + send()/write() */ > + if (sendto(cfd, msg, size, MSG_FASTOPEN | MSG_NOSIGNAL, > + remote_addrinfo->ai_addr, > + remote_addrinfo->ai_addrlen) != size) { > + tst_resm(TFAIL | TERRNO, "sendto failed"); > + SAFE_CLOSE(NULL, cfd); > + return -1; > + } > + } else { > + /* old TCP API */ > + if (connect(cfd, remote_addrinfo->ai_addr, > + remote_addrinfo->ai_addrlen)) { > + tst_resm(TFAIL | TERRNO, "connect failed"); > + SAFE_CLOSE(NULL, cfd); > + return -1; > + } > + > + if (send(cfd, msg, size, MSG_NOSIGNAL) != client_msg_size) { > + tst_resm(TFAIL | TERRNO, > + "send failed on sock '%d'", cfd); > + SAFE_CLOSE(NULL, cfd); > + return -1; > + } > + } > + > + return cfd; > +} > + > +void *client_fn(void *arg) > +{ > + char buf[server_msg_size]; > + int cfd, i; > + > + /* connect & send requests */ > + cfd = client_connect_send(client_msg, client_msg_size); > + if (cfd == -1) > + return NULL; So if the connection breaks after the server was started and the client fails to connect the test will run fine and the resoult would be two nearly identical runtimes? Shouldn't this rather be tst_brkm(TBROK, ...) ? > + client_recv(&cfd, buf); > + > + for (i = 1; i < client_max_requests; ++i) { > + > + /* check connection, it can be closed */ > + int ret = 0; > + if (cfd != -1) > + ret = recv(cfd, buf, 1, MSG_DONTWAIT); > + > + if (ret == 0) { > + /* try to reconnect and send */ > + if (cfd != -1) > + SAFE_CLOSE(NULL, cfd); > + > + cfd = client_connect_send(client_msg, client_msg_size); > + if (cfd == -1) > + return NULL; > + client_recv(&cfd, buf); > + > + continue; > + > + } else if (ret > 0) { > + tst_resm_hexd(TFAIL, buf, 1, > + "received after recv, sock '%d':", cfd); > + } > + > + if (verbose) { > + tst_resm_hexd(TINFO, client_msg, client_msg_size, > + "try to send msg[%d]", i); > + } > + > + if (send(cfd, client_msg, client_msg_size, > + MSG_NOSIGNAL) != client_msg_size) { > + tst_resm(TFAIL | TERRNO, "send failed"); > + break; > + } > + client_recv(&cfd, buf); > + } > + > + if (cfd != -1) > + SAFE_CLOSE(NULL, cfd); > + return NULL; > +} > + > +static void make_client_request(void) > +{ > + client_msg[0] = start_byte; > + > + /* set size for reply */ > + *(uint16_t *)(client_msg + 1) = htons(server_msg_size); This will generate unaligned access on some architectures. What you need is to set the value byte by byte: client_msg[1] = (sever_msg_size>>8) & 0xff; client_msg[2] = sever_msg_size & 0xff; > + client_msg[client_msg_size - 1] = end_byte; > +} > + > +static int parse_client_request(const char *recv_msg) > +{ > + int size = ntohs(*(uint16_t *)(recv_msg + 1)); Here as well, you need to construct the value byte by byte as: uint16_t val = htons(((((uint16_t)recv_msg[1])<<8) + recv_msg[2])); > + if (size < 2 || size > max_msg_len) { > + tst_resm(TWARN, "wrong msg size received %u", size); > + size = 2; > + } > + > + return size; > +} > + > +static struct timespec tv_client_start; > +static struct timespec tv_client_end; > + > +static void client_init(void) > +{ > + if (clients_num >= MAX_THREADS) { > + tst_brkm(TBROK, cleanup, > + "Unexpected num of clients '%d'", > + clients_num); > + } > + > + thread_ids = SAFE_MALLOC(NULL, sizeof(pthread_t) * clients_num); > + > + client_msg = SAFE_MALLOC(NULL, client_msg_size); > + memset(client_msg, client_byte, client_msg_size); > + > + make_client_request(); > + > + struct addrinfo hints; > + memset(&hints, 0, sizeof(struct addrinfo)); > + hints.ai_family = AF_INET; > + hints.ai_socktype = SOCK_STREAM; > + if (getaddrinfo(server_addr, tcp_port, &hints, &remote_addrinfo) != 0) > + tst_brkm(TBROK | TERRNO, cleanup, "getaddrinfo failed"); > + > + clock_gettime(CLOCK_MONOTONIC_RAW, &tv_client_start); > + int i; > + for (i = 0; i < clients_num; ++i) { > + if (pthread_create(&thread_ids[i], 0, client_fn, NULL) != 0) { > + tst_brkm(TBROK | TERRNO, cleanup, > + "pthread_create failed at %s:%d", > + __FILE__, __LINE__); > + } > + ++threads_num; > + } > +} > + > +static void client_run(void) > +{ > + void *res = NULL; > + long clnt_time = 0; > + > + int i; > + for (i = 0; i < clients_num; ++i) > + pthread_join(thread_ids[i], &res); > + > + threads_num = 0; > + > + clock_gettime(CLOCK_MONOTONIC_RAW, &tv_client_end); > + clnt_time = (tv_client_end.tv_sec - tv_client_start.tv_sec) * 1000 + > + (tv_client_end.tv_nsec - tv_client_start.tv_nsec) / 1000000; > + > + tst_resm(TINFO, "total time '%ld' ms", clnt_time); > + > + /* ask server to terminate */ > + client_msg[0] = start_fin_byte; > + int cfd = client_connect_send(client_msg, client_msg_size); > + if (cfd != -1) { > + shutdown(cfd, SHUT_WR); > + SAFE_CLOSE(NULL, cfd); > + } > + /* the script tcp_fastopen_run.sh will remove it */ > + SAFE_FILE_PRINTF(cleanup, rpath, "%ld", clnt_time); > +} > + > +static void client_cleanup(void) > +{ > + void *res = NULL; > + int i; > + for (i = 0; i < threads_num; ++i) > + pthread_join(thread_ids[i], &res); > + > + free(thread_ids); > + > + if (remote_addrinfo) > + freeaddrinfo(remote_addrinfo); > +} > + > + > +static char *make_server_reply(int size) > +{ > + char *send_msg = SAFE_MALLOC(NULL, size); > + memset(send_msg, server_byte, size - 1); > + send_msg[0] = start_byte; > + send_msg[size - 1] = end_byte; > + > + return send_msg; > +} > + > +void *server_fn(void *cfd) > +{ > + int client_fd = (intptr_t) cfd; > + int num_requests = 0, offset = 0; > + > + /* Reply will be constructed from first client request */ > + char *send_msg = NULL; > + int send_msg_size = 0; > + > + char recv_msg[max_msg_len]; > + > + setsockopt(client_fd, SOL_SOCKET, SO_LINGER, &clo, sizeof(clo)); > + ssize_t recv_len; > + > + while (1) { > + recv_len = sock_recv_poll(client_fd, recv_msg, > + max_msg_len, &offset); > + > + if (recv_len == 0) { > + break; > + } else > + if (recv_len < 0 || (offset + recv_len) > max_msg_len || > + (recv_msg[0] != start_byte && > + recv_msg[0] != start_fin_byte)) { > + tst_resm(TFAIL, "recv failed, sock '%d'", client_fd); > + break; > + } This part of the code looks wrongly indented. Is the else branch needed at all? > + offset += recv_len; > + > + if (recv_msg[offset - 1] != end_byte) { > + tst_resm(TINFO, "msg is not complete, continue recv"); > + continue; > + } > + > + if (recv_msg[0] == start_fin_byte) > + tst_brkm(TBROK, cleanup, "client asks to terminate..."); I still dont like the TBROK on clean exit. Please change it to: cleanup(); tst_exit(); Actually I may be inclined to add a test exit function that would call cleanup first as the cleanup(); tst_exit() is quite common pattern. void tst_exit2(void (*cleanup)(void)); Or something similar would do. Unfortunatelly we cannot change tst_exit() because changing every single usage in tests is not feasible. > + if (verbose) { > + tst_resm_hexd(TINFO, recv_msg, offset, > + "msg recv from sock %d:", client_fd); > + } > + > + /* if we send reply for the first time, construct it here */ > + if (!send_msg) { > + send_msg_size = parse_client_request(recv_msg); > + send_msg = make_server_reply(send_msg_size); > + } > + > + /* > + * It will tell client that server is going > + * to close this connection. > + */ > + if (++num_requests >= server_max_requests) > + send_msg[0] = start_fin_byte; > + > + if (send(client_fd, send_msg, send_msg_size, > + MSG_NOSIGNAL) == -1) { > + tst_resm(TWARN | TERRNO, "Error while sending msg"); > + } else if (verbose) { > + tst_resm_hexd(TINFO, send_msg, send_msg_size, > + "msg sent:"); > + } > + > + offset = 0; > + > + if (num_requests >= server_max_requests) { > + if (verbose) > + tst_resm(TINFO, "Max reqs, close socket"); > + shutdown(client_fd, SHUT_WR); > + break; > + } > + } > + > + free(send_msg); > + SAFE_CLOSE(NULL, client_fd); > + > + return NULL; > +} > + > +static void server_thread_add(intptr_t client_fd) > +{ > + pthread_t id; > + if (pthread_create(&id, &attr, server_fn, (void *) client_fd)) { > + tst_brkm(TBROK | TERRNO, cleanup, > + "pthread_create failed at %s:%d", __FILE__, __LINE__); > + } > +} > + > +static void server_init(void) > +{ > + struct addrinfo hints; > + memset(&hints, 0, sizeof(struct addrinfo)); > + hints.ai_family = AF_INET; > + hints.ai_socktype = SOCK_STREAM; > + hints.ai_flags = AI_PASSIVE; > + if (getaddrinfo(NULL, tcp_port, &hints, &local_addrinfo) != 0) > + tst_brkm(TBROK | TERRNO, cleanup, "getaddrinfo failed"); > + > + sfd = socket(AF_INET, SOCK_STREAM, 0); > + if (sfd == -1) > + tst_brkm(TBROK, cleanup, "Failed to create a socket"); > + > + tst_resm(TINFO, "assigning a name to the server socket..."); > + if (!local_addrinfo) > + tst_brkm(TBROK, cleanup, "failed to get the address"); > + > + while (bind(sfd, local_addrinfo->ai_addr, > + local_addrinfo->ai_addrlen) == -1) { > + usleep(100000); > + } > + tst_resm(TINFO, "the name assigned"); > + > + freeaddrinfo(local_addrinfo); > + > + const int flag = 1; > + setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &flag, sizeof(flag)); > + > + if (fastopen_api == TFO_ENABLED) { > + if (setsockopt(sfd, IPPROTO_TCP, TCP_FASTOPEN, &tfo_queue_size, > + sizeof(tfo_queue_size)) == -1) > + tst_brkm(TBROK, cleanup, "Can't set TFO sock. options"); > + } > + > + listen(sfd, max_queue_len); > + tst_resm(TINFO, "Listen on the socket '%d', port '%s'", sfd, tcp_port); > +} > + > +static void server_cleanup(void) > +{ > + SAFE_CLOSE(NULL, sfd); > +} > + > +static void server_run(void) > +{ > + struct sockaddr_in client_addr; > + socklen_t addr_size = sizeof(client_addr); > + pthread_attr_init(&attr); > + > + /* > + * detaching threads allow to reclaim thread's resources > + * once a thread finishes its work. > + */ > + if (pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED) != 0) > + tst_brkm(TBROK | TERRNO, cleanup, "setdetachstate failed"); > + > + while (1) { > + int client_fd = accept(sfd, (struct sockaddr *) &client_addr, > + &addr_size); > + if (client_fd == -1) { > + tst_brkm(TBROK, cleanup, "Can't create client socket"); > + continue; Hmm, if I'm not mistaken, the tst_brkm() will abort the test execution, what is the continue needed for? > + } > + > + if (client_addr.sin_family == AF_INET) { > + if (verbose) { > + tst_resm(TINFO, "conn: port '%d', addr '%s'", > + client_addr.sin_port, > + inet_ntoa(client_addr.sin_addr)); > + } > + } > + server_thread_add(client_fd); > + } > +} > + > +static void check_opt(const char *name, char *arg, int *val, int lim) > +{ > + if (arg) { > + if (sscanf(arg, "%i", val) != 1) > + tst_brkm(TBROK, NULL, "-%s option arg is not a number", > + name); > + if (clients_num < lim) > + tst_brkm(TBROK, NULL, "-%s option arg is less than %d", > + name, lim); > + } > +} > + > +static void check_opt_l(const char *name, char *arg, long *val, long lim) > +{ > + if (arg) { > + if (sscanf(arg, "%ld", val) != 1) > + tst_brkm(TBROK, NULL, "-%s option arg is not a number", > + name); > + if (clients_num < lim) > + tst_brkm(TBROK, NULL, "-%s option arg is less than %ld", > + name, lim); > + } > +} > + > +static void setup(int argc, char *argv[]) > +{ > + char *msg; > + msg = parse_opts(argc, argv, options, help); > + if (msg != NULL) > + tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); > + > + /* if client num is not set, use num of processors */ > + clients_num = sysconf(_SC_NPROCESSORS_ONLN); > + > + check_opt("a", aarg, &clients_num, 1); > + check_opt("r", rarg, &client_max_requests, 1); > + check_opt("R", Rarg, &server_max_requests, 1); > + check_opt("n", narg, &client_msg_size, 1); > + check_opt("N", Narg, &server_msg_size, 1); > + check_opt("q", qarg, &tfo_queue_size, 1); > + check_opt_l("T", Targ, &wait_timeout, 0L); > + > + if (!force_run) > + tst_require_root(NULL); > + > + if (!force_run && tst_kvercmp(3, 7, 0) < 0) { > + tst_brkm(TCONF, NULL, > + "Test must be run with kernel 3.7 or newer"); > + } > + > + /* check tcp fast open knob */ > + if (!force_run && access(tfo_cfg, F_OK) == -1) > + tst_brkm(TCONF, NULL, "Failed to find '%s'", tfo_cfg); > + > + if (!force_run) { > + SAFE_FILE_SCANF(NULL, tfo_cfg, "%d", &tfo_cfg_value); > + tst_resm(TINFO, "'%s' is %d", tfo_cfg, tfo_cfg_value); > + } > + > + tst_sig(FORK, DEF_HANDLER, cleanup); > + > + tst_resm(TINFO, "TCP %s is using %s TCP API.", > + (tcp_mode == TCP_SERVER) ? "server" : "client", > + (fastopen_api == TFO_ENABLED) ? "Fastopen" : "old"); > + > + switch (tcp_mode) { > + case TCP_SERVER: > + tst_resm(TINFO, "max requests '%d'", > + server_max_requests); > + tcp.init = server_init; > + tcp.run = server_run; > + tcp.cleanup = server_cleanup; > + tfo_bit_num = 2; > + break; > + case TCP_CLIENT: > + tst_resm(TINFO, "connection: %s:%s", > + server_addr, tcp_port); > + tst_resm(TINFO, "client max req: %d", client_max_requests); > + tst_resm(TINFO, "clients num: %d", clients_num); > + tst_resm(TINFO, "client msg size: %d", client_msg_size); > + tst_resm(TINFO, "server msg size: %d", server_msg_size); > + > + tcp.init = client_init; > + tcp.run = client_run; > + tcp.cleanup = client_cleanup; > + tfo_bit_num = 1; > + break; > + } > + > + tfo_support = TFO_ENABLED == tfo_support; > + if (((tfo_cfg_value & tfo_bit_num) == tfo_bit_num) != tfo_support) { > + int value = (tfo_cfg_value & ~tfo_bit_num) > + | (tfo_support << (tfo_bit_num - 1)); > + tst_resm(TINFO, "set '%s' to '%d'", tfo_cfg, value); > + SAFE_FILE_PRINTF(cleanup, tfo_cfg, "%d", value); > + tfo_cfg_changed = 1; > + } > + > + int reuse_value = 0; > + SAFE_FILE_SCANF(cleanup, tcp_tw_reuse, "%d", &reuse_value); > + if (!reuse_value) { > + SAFE_FILE_PRINTF(cleanup, tcp_tw_reuse, "1"); > + tw_reuse_changed = 1; > + tst_resm(TINFO, "set '%s' to '1'", tcp_tw_reuse); > + } > + > + tst_resm(TINFO, "TFO support %s", > + (tfo_support) ? "enabled" : "disabled"); > + > + tcp.init(); > +} > + > +int main(int argc, char *argv[]) > +{ > + setup(argc, argv); > + > + tcp.run(); > + > + cleanup(); > + > + tst_exit(); > +} > diff --git a/testcases/network/tcp_fastopen/tcp_fastopen_run.sh b/testcases/network/tcp_fastopen/tcp_fastopen_run.sh > new file mode 100755 > index 0000000..f329a0e > --- /dev/null > +++ b/testcases/network/tcp_fastopen/tcp_fastopen_run.sh > @@ -0,0 +1,164 @@ > +#!/bin/bash > + > +# Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved. > +# > +# This program is free software; you can redistribute it and/or > +# modify it under the terms of the GNU General Public License as > +# published by the Free Software Foundation; either version 2 of > +# the License, or (at your option) any later version. > +# > +# This program is distributed in the hope that it would be useful, > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +# GNU General Public License for more details. > +# > +# You should have received a copy of the GNU General Public License > +# along with this program; if not, write the Free Software Foundation, > +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA > +# > +# Author: Alexey Kodanev <ale...@or...> > +# > + > +# default command-line options > +user_name="root" > +remote_addr=$RHOST > +use_ssh=0 > +clients_num=2 > +client_requests=2000000 > +max_requests=3 > +server_port=$[ $RANDOM % 28232 + 32768 ] Use $(( )) instead of the non-portable $[ ] > +while getopts :hu:H:sr:p:n:R: opt; do > + case "$opt" in > + h) > + echo "Usage:" > + echo "h help" > + echo "u x server user name" > + echo "H x server hostname or IP address" > + echo "s use ssh to run remote cmds" > + echo "n x num of clients running in parallel" > + echo "r x the number of client requests" > + echo "R x num of requests, after which conn. closed" > + echo "p x server port" > + exit 0 > + ;; > + u) user_name=$OPTARG ;; > + H) remote_addr=$OPTARG ;; > + s) use_ssh=1 ;; > + n) clients_num=$OPTARG ;; > + r) client_requests=$OPTARG ;; > + R) max_requests=$OPTARG ;; > + p) server_port=$OPTARG ;; > + *) > + tst_brkm TBROK NULL "unknown option: $opt" > + exit 2 > + ;; > + esac > +done > + > +run_remote_cmd() > +{ > + tst_resm TINFO "run cmd on $remote_addr: $1" > + > + if [ "$use_ssh" = 1 ]; then > + ssh -n -f $user_name@$remote_addr "sh -c 'nohup $1 &'" > + else > + rsh -n -l $user_name $remote_addr "sh -c 'nohup $1 &'" > + fi > +} > + > +cleanup() > +{ > + rm -f $tfo_result > + run_remote_cmd "pkill -9 tcp_fastopen\$" > +} > + > +read_result_file() > +{ > + if [ -f $tfo_result ]; then > + if [ -r $tfo_result ]; then > + cat $tfo_result > + else > + tst_brkm TBROK NULL "Failed to read result file" > + exit 2 > + fi > + else > + tst_brkm TBROK NULL "Failed to find result file" > + exit 2 > + fi > +} > + > +check_exit_status() > +{ > + if [ "$1" -ne "0" ]; then > + tst_brkm TBROK NULL "Last test has failed" > + exit $1; > + fi > +} > + > +export RC=0 > +export TST_TOTAL=1 > +export TCID="tcp_fastopen" > +export TST_COUNT=0 > + > +tfo_result_ms=0 > +bind_timeout=30 > + > +tst_kvercmp 3 7 0 > +if [ $? -eq 0 ]; then > + tst_brkm TCONF NULL "test must be run with kernel 3.7 or newer" > + exit 0 > +fi > + > +if [ -z $remote_addr ]; then > + tst_brkm TBROK NULL "you must specify server address" > + exit 2 > +fi > + > +tdir="${LTPROOT}/testcases/bin/" > +tfo_result="${TMPDIR}/tfo_result" > + > +trap "cleanup" EXIT > + > +# Run test without/with TFO > +tcp_api_opt=("-o -O" "") Arrays are unportable bash extension, please do not use them. > +# Time results for without/with TFO test > +vtime=(0 0) > + > +for (( i = 0; i < 2; ++i )); do > + # kill tcp server on remote machine > + run_remote_cmd "pkill -9 tcp_fastopen\$" > + > + sleep 2 > + > + # run tcp server on remote machine > + run_remote_cmd "${tdir}tcp_fastopen -R $max_requests \ > +${tcp_api_opt[$i]} -g $server_port > /dev/null 2>&1" > + > + sleep $bind_timeout > + > + # run local tcp client > + ${tdir}tcp_fastopen -a $clients_num -r $client_requests -l \ > +-H $remote_addr ${tcp_api_opt[$i]} -g $server_port -d $tfo_result > + > + check_exit_status $? > + > + vtime[$i]=`read_result_file` Here as well. > + if [ -z ${vtime[$i]} -o ${vtime[$i]} -eq "0" ]; then > + tst_brkm TBROK NULL "Last test result isn't valid: ${vtime[$i]}" > + exit 2 > + fi > + server_port=$[ $server_port + 1 ] > +done > + > +tfo_cmp=$[ 100 - (${vtime[1]} * 100) / ${vtime[0]} ] Here as well (the $[]). > +if (( $tfo_cmp < 3 )); then > + tst_resm TFAIL "TFO performance result is $tfo_cmp percent" > + exit 1 > +fi The (( expression )) is bashishm and will not work in most shells. Please use [ $tfo_cmp -lt 3 ] instead. > +tst_resm TPASS "TFO performance result is $tfo_cmp percent" > +exit 0 Otherwise it looks OK, sorry for not catching the bashishms earlier. -- Cyril Hrubis ch...@su... |