Add start of client, start of real protocol
Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/server.c b/server.c
index 5ef0fe0..f393873 100644
--- a/server.c
+++ b/server.c
@@ -2,33 +2,275 @@
#include <stdlib.h>
#include <unistd.h>
#include <limits.h>
-#include <string.h>
-#include <getopt.h>
#include <errno.h>
#include <fcntl.h>
#include <sys/poll.h>
-#include <sys/stat.h>
#include <sys/types.h>
#include <sys/wait.h>
-#include <sys/time.h>
#include <sys/mman.h>
-#include <signal.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
#include "fio.h"
+#include "server.h"
+#include "crc/crc32.h"
-static int net_port = 8765;
+int fio_net_port = 8765;
int exit_backend = 0;
+static char *job_buf;
+static unsigned int job_cur_len;
+static unsigned int job_max_len;
+
+int fio_send_data(int sk, const void *p, unsigned int len)
+{
+ do {
+ int ret = send(sk, p, len, 0);
+
+ if (ret > 0) {
+ len -= ret;
+ if (!len)
+ break;
+ p += ret;
+ continue;
+ } else if (!ret)
+ break;
+ else if (errno == EAGAIN || errno == EINTR)
+ continue;
+ } while (!exit_backend);
+
+ if (!len)
+ return 0;
+
+ return 1;
+}
+
+int fio_recv_data(int sk, void *p, unsigned int len)
+{
+ do {
+ int ret = recv(sk, p, len, MSG_WAITALL);
+
+ if (ret > 0) {
+ len -= ret;
+ if (!len)
+ break;
+ p += ret;
+ continue;
+ } else if (!ret)
+ break;
+ else if (errno == EAGAIN || errno == EINTR)
+ continue;
+ } while (!exit_backend);
+
+ if (!len)
+ return 0;
+
+ return -1;
+}
+
+static int verify_convert_cmd(struct fio_net_cmd *cmd)
+{
+ uint32_t crc;
+
+ cmd->cmd_crc32 = le32_to_cpu(cmd->cmd_crc32);
+ cmd->pdu_crc32 = le32_to_cpu(cmd->pdu_crc32);
+
+ crc = crc32(cmd, sizeof(*cmd) - 2 * sizeof(uint32_t));
+ if (crc != cmd->cmd_crc32) {
+ log_err("fio: server bad crc on command (got %x, wanted %x)\n",
+ cmd->cmd_crc32, crc);
+ return 1;
+ }
+
+ cmd->version = le16_to_cpu(cmd->version);
+ cmd->opcode = le16_to_cpu(cmd->opcode);
+ cmd->flags = le32_to_cpu(cmd->flags);
+ cmd->serial = le64_to_cpu(cmd->serial);
+ cmd->pdu_len = le32_to_cpu(cmd->pdu_len);
+
+ switch (cmd->version) {
+ case FIO_SERVER_VER1:
+ break;
+ default:
+ log_err("fio: bad server cmd version %d\n", cmd->version);
+ return 1;
+ }
+
+ if (cmd->pdu_len > FIO_SERVER_MAX_PDU) {
+ log_err("fio: command payload too large: %u\n", cmd->pdu_len);
+ return 1;
+ }
+
+ return 0;
+}
+
+static struct fio_net_cmd *read_command(int sk)
+{
+ struct fio_net_cmd cmd, *ret = NULL;
+ uint32_t crc;
+
+ if (fio_recv_data(sk, &cmd, sizeof(cmd)))
+ return NULL;
+
+ /* We have a command, verify it and swap if need be */
+ if (verify_convert_cmd(&cmd))
+ return NULL;
+
+ /* Command checks out, alloc real command and fill in */
+ ret = malloc(sizeof(cmd) + cmd.pdu_len);
+ memcpy(ret, &cmd, sizeof(cmd));
+
+ if (!ret->pdu_len)
+ return ret;
+
+ /* There's payload, get it */
+ if (fio_recv_data(sk, (void *) ret + sizeof(*ret), ret->pdu_len)) {
+ free(ret);
+ return NULL;
+ }
+
+ /* Verify payload crc */
+ crc = crc32(ret->payload, ret->pdu_len);
+ if (crc != ret->pdu_crc32) {
+ log_err("fio: server bad crc on payload (got %x, wanted %x)\n",
+ ret->pdu_crc32, crc);
+ free(ret);
+ return NULL;
+ }
+
+
+ return ret;
+}
+
+void fio_net_cmd_crc(struct fio_net_cmd *cmd)
+{
+ uint32_t pdu_len;
+
+ cmd->cmd_crc32 = cpu_to_le32(crc32(cmd,
+ sizeof(*cmd) - 2 * sizeof(uint32_t)));
+
+ pdu_len = le32_to_cpu(cmd->pdu_len);
+ if (pdu_len)
+ cmd->pdu_crc32 = cpu_to_le32(crc32(cmd->payload, pdu_len));
+}
+
+static int send_simple_command(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_le16(serial),
+ };
+
+ fio_net_cmd_crc(&cmd);
+
+ return fio_send_data(sk, &cmd, sizeof(cmd));
+}
+
+/*
+ * Send an ack for this command
+ */
+static int ack_command(int sk, struct fio_net_cmd *cmd)
+{
+ return send_simple_command(sk, FIO_NET_CMD_ACK, cmd->serial);
+}
+
+#if 0
+static int nak_command(int sk, struct fio_net_cmd *cmd)
+{
+ return send_simple_command(sk, FIO_NET_CMD_NAK, cmd->serial);
+}
+#endif
+
+static int handle_cur_job(struct fio_net_cmd *cmd, int done)
+{
+ unsigned int left = job_max_len - job_cur_len;
+ int ret = 0;
+
+ if (left < cmd->pdu_len) {
+ job_buf = realloc(job_buf, job_max_len + 2 * cmd->pdu_len);
+ job_max_len += 2 * cmd->pdu_len;
+ }
+
+ memcpy(job_buf + job_cur_len, cmd->payload, cmd->pdu_len);
+ job_cur_len += cmd->pdu_len;
+
+ if (done) {
+ parse_jobs_ini(job_buf, 1, 0);
+ ret = exec_run();
+ reset_fio_state();
+ free(job_buf);
+ job_buf = NULL;
+ job_cur_len = job_max_len = 0;
+ }
+
+ return ret;
+}
+
+static int handle_command(struct fio_net_cmd *cmd)
+{
+ int ret;
+
+ switch (cmd->opcode) {
+ case FIO_NET_CMD_QUIT:
+ exit_backend = 1;
+ return 1;
+ case FIO_NET_CMD_ACK:
+ return 0;
+ case FIO_NET_CMD_NAK:
+ return 1;
+ case FIO_NET_CMD_JOB:
+ ret = handle_cur_job(cmd, 0);
+ break;
+ case FIO_NET_CMD_JOB_END:
+ ret = handle_cur_job(cmd, 1);
+ break;
+ default:
+ log_err("fio: unknown opcode: %d\n", cmd->opcode);
+ ret = 1;
+ }
+
+ return ret;
+}
+
+static int handle_connection(int sk)
+{
+ struct fio_net_cmd *cmd = NULL;
+ int ret = 0;
+
+ /* read forever */
+ while (!exit_backend) {
+ cmd = read_command(sk);
+ if (!cmd) {
+ ret = 1;
+ break;
+ }
+
+ ret = ack_command(sk, cmd);
+ if (ret)
+ break;
+
+ ret = handle_command(cmd);
+ if (ret)
+ break;
+
+ free(cmd);
+ }
+
+ if (cmd)
+ free(cmd);
+
+ return ret;
+}
+
static int accept_loop(int listen_sk)
{
struct sockaddr addr;
unsigned int len = sizeof(addr);
struct pollfd pfd;
- int ret, sk, flags;
+ int ret, sk, flags, exitval = 0;
flags = fcntl(listen_sk, F_GETFL);
flags |= O_NONBLOCK;
@@ -59,26 +301,7 @@
return -1;
}
- /* read forever */
- while (!exit_backend) {
- char buf[131072];
-
- ret = recv(sk, buf, 4096, 0);
- if (ret > 0) {
- if (!strncmp("FIO_QUIT", buf, 8)) {
- exit_backend = 1;
- break;
- }
- parse_jobs_ini(buf, 1, 0);
- exec_run();
- reset_fio_state();
- break;
- } else if (!ret)
- break;
- if (errno == EAGAIN || errno == EINTR)
- continue;
- break;
- }
+ exitval = handle_connection(sk);
close(sk);
@@ -86,7 +309,7 @@
goto again;
out:
- return 0;
+ return exitval;
}
int fio_server(void)
@@ -116,7 +339,7 @@
saddr_in.sin_family = AF_INET;
saddr_in.sin_addr.s_addr = htonl(INADDR_ANY);
- saddr_in.sin_port = htons(net_port);
+ 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));