X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=server.c;h=61bbe44edd245d91d5bd476a8d44d451031b5b04;hp=4edb7e84d257a72c98d6d90959626f733f4e3ff0;hb=9bae26e8a220ab28b59d6710c6f7aa6e28b86171;hpb=ca12aa636d488d43ab79c474618d1a0fddf4b78c diff --git a/server.c b/server.c index 4edb7e84..61bbe44e 100644 --- a/server.c +++ b/server.c @@ -8,21 +8,28 @@ #include #include #include -#include +#include +#include +#include #include #include #include #include +#include #include "fio.h" #include "server.h" #include "crc/crc16.h" +#include "ieee754.h" int fio_net_port = 8765; int exit_backend = 0; static int server_fd = -1; +static char *fio_server_arg; +static char *bind_sock; +static struct sockaddr_in saddr_in; int fio_send_data(int sk, const void *p, unsigned int len) { @@ -93,7 +100,7 @@ static int verify_convert_cmd(struct fio_net_cmd *cmd) cmd->pdu_len = le32_to_cpu(cmd->pdu_len); switch (cmd->version) { - case FIO_SERVER_VER1: + case FIO_SERVER_VER2: break; default: log_err("fio: bad server cmd version %d\n", cmd->version); @@ -120,32 +127,6 @@ struct fio_net_cmd *fio_net_recv_cmd(int sk) void *pdu = NULL; do { - struct pollfd pfd; - - pfd.fd = sk; - pfd.events = POLLIN; - ret = 0; - do { - ret = poll(&pfd, 1, 100); - if (ret < 0) { - if (errno == EINTR) - break; - log_err("fio: poll: %s\n", strerror(errno)); - break; - } else if (!ret) - continue; - - if (pfd.revents & POLLIN) - break; - if (pfd.revents & (POLLERR|POLLHUP)) { - ret = 1; - break; - } - } while (ret >= 0); - - if (ret < 0) - break; - ret = fio_recv_data(sk, &cmd, sizeof(cmd)); if (ret) break; @@ -155,9 +136,11 @@ struct fio_net_cmd *fio_net_recv_cmd(int sk) if (ret) break; - if (first) - cmd_size = sizeof(cmd) + cmd.pdu_len; - else + if (first) { + /* if this is text, add room for \0 at the end */ + cmd_size = sizeof(cmd) + cmd.pdu_len + 1; + assert(!cmdret); + } else cmd_size += cmd.pdu_len; cmdret = realloc(cmdret, cmd_size); @@ -194,8 +177,17 @@ struct fio_net_cmd *fio_net_recv_cmd(int sk) if (ret) { free(cmdret); cmdret = NULL; - } else if (cmdret) + } else if (cmdret) { + /* zero-terminate text input */ + if (cmdret->pdu_len && (cmdret->opcode == FIO_NET_CMD_TEXT || + cmdret->opcode == FIO_NET_CMD_JOB)) { + char *buf = (char *) cmdret->payload; + + buf[cmdret->pdu_len ] = '\0'; + } + /* frag flag is internal */ cmdret->flags &= ~FIO_NET_CMD_F_MORE; + } return cmdret; } @@ -242,35 +234,82 @@ int fio_net_send_cmd(int fd, uint16_t opcode, const void *buf, off_t size) int fio_net_send_simple_cmd(int sk, uint16_t opcode, uint64_t serial) { - struct fio_net_cmd cmd = { - .version = __cpu_to_le16(FIO_SERVER_VER1), - .opcode = cpu_to_le16(opcode), - .serial = cpu_to_le64(serial), - }; + struct fio_net_cmd cmd; + fio_init_net_cmd(&cmd, opcode, NULL, 0); fio_net_cmd_crc(&cmd); return fio_send_data(sk, &cmd, sizeof(cmd)); } -static int send_quit_command(void) +static int fio_server_send_quit_cmd(void) { dprint(FD_NET, "server: sending quit\n"); return fio_net_send_simple_cmd(server_fd, FIO_NET_CMD_QUIT, 0); } -static int handle_cur_job(struct fio_net_cmd *cmd) +static int handle_job_cmd(struct fio_net_cmd *cmd) { - void *buf = cmd->payload; + char *buf = (char *) cmd->payload; int ret; - parse_jobs_ini(buf, 1, 0); + if (parse_jobs_ini(buf, 1, 0)) { + fio_server_send_quit_cmd(); + return -1; + } + + fio_net_send_simple_cmd(server_fd, FIO_NET_CMD_START, 0); + + ret = exec_run(); + fio_server_send_quit_cmd(); + reset_fio_state(); + return ret; +} + +static int handle_jobline_cmd(struct fio_net_cmd *cmd) +{ + struct cmd_line_pdu *pdu = (struct cmd_line_pdu *) cmd->payload; + char *argv[FIO_NET_CMD_JOBLINE_ARGV]; + int ret, i; + + pdu->argc = le16_to_cpu(pdu->argc); + + dprint(FD_NET, "server: %d command line args\n", pdu->argc); + + for (i = 0; i < pdu->argc; i++) { + argv[i] = (char *) pdu->argv[i]; + dprint(FD_NET, "server: %d: %s\n", i, argv[i]); + } + + if (parse_cmd_line(pdu->argc, argv)) { + fio_server_send_quit_cmd(); + return -1; + } + + fio_net_send_simple_cmd(server_fd, FIO_NET_CMD_START, 0); + ret = exec_run(); - send_quit_command(); + fio_server_send_quit_cmd(); reset_fio_state(); return ret; } +static int handle_probe_cmd(struct fio_net_cmd *cmd) +{ + struct cmd_probe_pdu probe; + + memset(&probe, 0, sizeof(probe)); + gethostname((char *) probe.hostname, sizeof(probe.hostname)); +#ifdef FIO_BIG_ENDIAN + probe.bigendian = 1; +#endif + probe.fio_major = FIO_MAJOR; + probe.fio_minor = FIO_MINOR; + probe.fio_patch = FIO_PATCH; + + return fio_net_send_cmd(server_fd, FIO_NET_CMD_PROBE, &probe, sizeof(probe)); +} + static int handle_command(struct fio_net_cmd *cmd) { int ret; @@ -280,16 +319,18 @@ static int handle_command(struct fio_net_cmd *cmd) switch (cmd->opcode) { case FIO_NET_CMD_QUIT: fio_terminate_threads(TERMINATE_ALL); - return 1; + return -1; case FIO_NET_CMD_EXIT: exit_backend = 1; - return 1; - case FIO_NET_CMD_ACK: - return 0; - case FIO_NET_CMD_NAK: - return 1; + return -1; case FIO_NET_CMD_JOB: - ret = handle_cur_job(cmd); + ret = handle_job_cmd(cmd); + break; + case FIO_NET_CMD_JOBLINE: + ret = handle_jobline_cmd(cmd); + break; + case FIO_NET_CMD_PROBE: + ret = handle_probe_cmd(cmd); break; default: log_err("fio: unknown opcode: %d\n", cmd->opcode); @@ -299,16 +340,46 @@ static int handle_command(struct fio_net_cmd *cmd) return ret; } -static int handle_connection(int sk) +static int handle_connection(int sk, int block) { struct fio_net_cmd *cmd = NULL; int ret = 0; /* read forever */ while (!exit_backend) { + struct pollfd pfd = { + .fd = sk, + .events = POLLIN, + }; + + ret = 0; + do { + ret = poll(&pfd, 1, 100); + if (ret < 0) { + if (errno == EINTR) + break; + log_err("fio: poll: %s\n", strerror(errno)); + break; + } else if (!ret) { + if (!block) + return 0; + continue; + } + + if (pfd.revents & POLLIN) + break; + if (pfd.revents & (POLLERR|POLLHUP)) { + ret = 1; + break; + } + } while (!exit_backend); + + if (ret < 0) + break; + cmd = fio_net_recv_cmd(sk); if (!cmd) { - ret = 1; + ret = -1; break; } @@ -329,16 +400,18 @@ static int handle_connection(int sk) void fio_server_idle_loop(void) { if (server_fd != -1) - handle_connection(server_fd); + handle_connection(server_fd, 0); } static int accept_loop(int listen_sk) { - struct sockaddr addr; - unsigned int len = sizeof(addr); + struct sockaddr_in addr; + fio_socklen_t len = sizeof(addr); struct pollfd pfd; int ret, sk, flags, exitval = 0; + dprint(FD_NET, "server enter accept loop\n"); + flags = fcntl(listen_sk, F_GETFL); flags |= O_NONBLOCK; fcntl(listen_sk, F_SETFL, flags); @@ -362,17 +435,17 @@ again: if (exit_backend) goto out; - sk = accept(listen_sk, &addr, &len); + sk = accept(listen_sk, (struct sockaddr *) &addr, &len); if (sk < 0) { log_err("fio: accept: %s\n", strerror(errno)); return -1; } - dprint(FD_NET, "server got a connection\n"); + dprint(FD_NET, "server: connect from %s\n", inet_ntoa(addr.sin_addr)); server_fd = sk; - exitval = handle_connection(sk); + exitval = handle_connection(sk, 1); server_fd = -1; close(sk); @@ -384,64 +457,12 @@ out: return exitval; } -static int fio_server(void) -{ - struct sockaddr_in saddr_in; - struct sockaddr addr; - unsigned int len; - int sk, opt, ret; - - dprint(FD_NET, "starting server\n"); - - sk = socket(AF_INET, SOCK_STREAM, 0); - if (sk < 0) { - log_err("fio: socket: %s\n", strerror(errno)); - return -1; - } - - opt = 1; - if (setsockopt(sk, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) { - log_err("fio: setsockopt: %s\n", strerror(errno)); - return -1; - } -#ifdef SO_REUSEPORT - if (setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt)) < 0) { - log_err("fio: setsockopt: %s\n", strerror(errno)); - return 1; - } -#endif - - saddr_in.sin_family = AF_INET; - saddr_in.sin_addr.s_addr = htonl(INADDR_ANY); - saddr_in.sin_port = htons(fio_net_port); - - if (bind(sk, (struct sockaddr *) &saddr_in, sizeof(saddr_in)) < 0) { - log_err("fio: bind: %s\n", strerror(errno)); - return -1; - } - - if (listen(sk, 1) < 0) { - log_err("fio: listen: %s\n", strerror(errno)); - return -1; - } - - len = sizeof(addr); - if (getsockname(sk, &addr, &len) < 0) { - log_err("fio: getsockname: %s\n", strerror(errno)); - return -1; - } - - ret = accept_loop(sk); - close(sk); - return ret; -} - int fio_server_text_output(const char *buf, unsigned int len) { if (server_fd != -1) return fio_net_send_cmd(server_fd, FIO_NET_CMD_TEXT, buf, len); - return 0; + return fwrite(buf, len, 1, f_err); } static void convert_io_stat(struct io_stat *dst, struct io_stat *src) @@ -449,9 +470,12 @@ static void convert_io_stat(struct io_stat *dst, struct io_stat *src) dst->max_val = cpu_to_le64(src->max_val); dst->min_val = cpu_to_le64(src->min_val); dst->samples = cpu_to_le64(src->samples); - /* FIXME */ - dst->mean = __cpu_to_le64(src->mean); - dst->S = __cpu_to_le64(src->S); + + /* + * Encode to IEEE 754 for network transfer + */ + dst->mean.u.i = __cpu_to_le64(fio_double_to_uint64(src->mean.u.f)); + dst->S.u.i = __cpu_to_le64(fio_double_to_uint64(src->S.u.f)); } static void convert_gs(struct group_run_stats *dst, struct group_run_stats *src) @@ -480,6 +504,10 @@ void fio_server_send_ts(struct thread_stat *ts, struct group_run_stats *rs) struct cmd_ts_pdu p; int i, j; + dprint(FD_NET, "server sending end stats\n"); + + memset(&p, 0, sizeof(p)); + strcpy(p.ts.name, ts->name); strcpy(p.ts.verror, ts->verror); strcpy(p.ts.description, ts->description); @@ -502,7 +530,12 @@ void fio_server_send_ts(struct thread_stat *ts, struct group_run_stats *rs) p.ts.minf = cpu_to_le64(ts->minf); p.ts.majf = cpu_to_le64(ts->majf); p.ts.clat_percentiles = cpu_to_le64(ts->clat_percentiles); - p.ts.percentile_list = NULL; + + for (i = 0; i < FIO_IO_U_LIST_MAX_LEN; i++) { + fio_fp64_t *fp = &p.ts.percentile_list[i]; + + fp->u.i = __cpu_to_le64(fio_double_to_uint64(fp->u.f)); + } for (i = 0; i < FIO_IO_U_MAP_NR; i++) { p.ts.io_u_map[i] = cpu_to_le32(ts->io_u_map[i]); @@ -547,6 +580,8 @@ void fio_server_send_gs(struct group_run_stats *rs) { struct group_run_stats gs; + dprint(FD_NET, "server sending group run stats\n"); + convert_gs(&gs, rs); fio_net_send_cmd(server_fd, FIO_NET_CMD_GS, &gs, sizeof(gs)); } @@ -568,6 +603,8 @@ void fio_server_send_status(void) return; } + dprint(FD_NET, "server sending status\n"); + je->nr_running = cpu_to_le32(je->nr_running); je->nr_ramp = cpu_to_le32(je->nr_ramp); je->nr_pending = cpu_to_le32(je->nr_pending); @@ -595,6 +632,8 @@ int fio_server_log(const char *format, ...) va_list args; size_t len; + dprint(FD_NET, "server log\n"); + va_start(args, format); len = vsnprintf(buffer, sizeof(buffer), format, args); va_end(args); @@ -602,10 +641,265 @@ int fio_server_log(const char *format, ...) return fio_server_text_output(buffer, len); } +static int fio_init_server_ip(void) +{ + int sk, opt; + + sk = socket(AF_INET, SOCK_STREAM, 0); + if (sk < 0) { + log_err("fio: socket: %s\n", strerror(errno)); + return -1; + } + + opt = 1; + if (setsockopt(sk, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) { + log_err("fio: setsockopt: %s\n", strerror(errno)); + close(sk); + return -1; + } +#ifdef SO_REUSEPORT + if (setsockopt(sk, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt)) < 0) { + log_err("fio: setsockopt: %s\n", strerror(errno)); + close(sk); + return -1; + } +#endif + + saddr_in.sin_family = AF_INET; + + if (bind(sk, (struct sockaddr *) &saddr_in, sizeof(saddr_in)) < 0) { + log_err("fio: bind: %s\n", strerror(errno)); + close(sk); + return -1; + } + + return sk; +} + +static int fio_init_server_sock(void) +{ + struct sockaddr_un addr; + fio_socklen_t len; + mode_t mode; + int sk; + + sk = socket(AF_UNIX, SOCK_STREAM, 0); + if (sk < 0) { + log_err("fio: socket: %s\n", strerror(errno)); + return -1; + } + + mode = umask(000); + + memset(&addr, 0, sizeof(addr)); + addr.sun_family = AF_UNIX; + strcpy(addr.sun_path, bind_sock); + unlink(bind_sock); + + len = sizeof(addr.sun_family) + strlen(bind_sock) + 1; + + if (bind(sk, (struct sockaddr *) &addr, len) < 0) { + log_err("fio: bind: %s\n", strerror(errno)); + close(sk); + return -1; + } + + umask(mode); + return sk; +} + +static int fio_init_server_connection(void) +{ + char bind_str[128]; + int sk; + + dprint(FD_NET, "starting server\n"); + + if (!bind_sock) + sk = fio_init_server_ip(); + else + sk = fio_init_server_sock(); + + if (sk < 0) + return sk; + + if (!bind_sock) + sprintf(bind_str, "%s:%u", inet_ntoa(saddr_in.sin_addr), fio_net_port); + else + strcpy(bind_str, bind_sock); + + log_info("fio: server listening on %s\n", bind_str); + + if (listen(sk, 1) < 0) { + log_err("fio: listen: %s\n", strerror(errno)); + return -1; + } + + return sk; +} + +int fio_server_parse_string(const char *str, char **ptr, int *is_sock, + int *port, struct in_addr *inp) +{ + *ptr = NULL; + *is_sock = 0; + *port = 0; + + if (!strncmp(str, "sock:", 5)) { + *ptr = strdup(str + 5); + *is_sock = 1; + } else { + const char *host = str; + char *portp; + int lport = 0; + + /* + * Is it ip::port + */ + if (!strncmp(host, "ip:", 3)) + host += 3; + else if (host[0] == ':') { + /* String is :port */ + host++; + lport = atoi(host); + if (!lport || lport > 65535) { + log_err("fio: bad server port %u\n", port); + return 1; + } + /* no hostname given, we are done */ + *port = lport; + return 0; + } + + /* + * If no port seen yet, check if there's a last ':' at the end + */ + if (!lport) { + portp = strchr(host, ':'); + if (portp) { + *portp = '\0'; + portp++; + lport = atoi(portp); + if (!lport || lport > 65535) { + log_err("fio: bad server port %u\n", port); + return 1; + } + } + } + + if (lport) + *port = lport; + + *ptr = strdup(host); + + if (inet_aton(host, inp) != 1) { + struct hostent *hent; + + hent = gethostbyname(host); + if (!hent) { + printf("FAIL\n"); + free(*ptr); + *ptr = NULL; + return 1; + } + + memcpy(inp, hent->h_addr, 4); + } + } + + if (*port == 0) + *port = fio_net_port; + + return 0; +} + +/* + * Server arg should be one of: + * + * sock:/path/to/socket + * ip:1.2.3.4 + * 1.2.3.4 + * + * Where sock uses unix domain sockets, and ip binds the server to + * a specific interface. If no arguments are given to the server, it + * uses IP and binds to 0.0.0.0. + * + */ +static int fio_handle_server_arg(void) +{ + int is_sock, ret; + + saddr_in.sin_addr.s_addr = htonl(INADDR_ANY); + saddr_in.sin_port = htons(fio_net_port); + + if (!fio_server_arg) + return 0; + + ret = fio_server_parse_string(fio_server_arg, &bind_sock, &is_sock, + &fio_net_port, &saddr_in.sin_addr); + + if (!is_sock && bind_sock) { + free(bind_sock); + bind_sock = NULL; + } + + return ret; +} + +static int fio_server(void) +{ + int sk, ret; + + dprint(FD_NET, "starting server\n"); + + if (fio_handle_server_arg()) + return -1; + + sk = fio_init_server_connection(); + if (sk < 0) + return -1; + + ret = accept_loop(sk); + + close(sk); + + if (fio_server_arg) { + free(fio_server_arg); + fio_server_arg = NULL; + } + if (bind_sock) + free(bind_sock); + + return ret; +} + +static void sig_int(int sig) +{ + fio_terminate_threads(TERMINATE_ALL); + exit_backend = 1; +} + +static void server_signal_handler(void) +{ + struct sigaction act; + + memset(&act, 0, sizeof(act)); + act.sa_handler = sig_int; + act.sa_flags = SA_RESTART; + sigaction(SIGINT, &act, NULL); + + memset(&act, 0, sizeof(act)); + act.sa_handler = sig_int; + act.sa_flags = SA_RESTART; + sigaction(SIGTERM, &act, NULL); +} + int fio_start_server(int daemonize) { pid_t pid; + server_signal_handler(); + if (!daemonize) return fio_server(); @@ -613,7 +907,7 @@ int fio_start_server(int daemonize) pid = fork(); if (pid < 0) { syslog(LOG_ERR, "failed server fork"); - return 1; + return -1; } else if (pid) exit(0); @@ -626,3 +920,8 @@ int fio_start_server(int daemonize) log_syslog = 1; return fio_server(); } + +void fio_server_set_arg(const char *arg) +{ + fio_server_arg = strdup(arg); +}