From: Jérémie Galarneau Date: Wed, 21 Feb 2018 05:57:26 +0000 (-0500) Subject: Use non-blocking recvmsg() for data/ctrl connections of lttng-relayd X-Git-Tag: v2.11.0-rc1~264 X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=5312a3edd938117cb5670de711f237e7b6f2e68c Use non-blocking recvmsg() for data/ctrl connections of lttng-relayd The relay daemon's use of blocking network I/O can cause severe performance degradation when interacting with unresponsive peers. This patch changes the recvmsg() calls to use the MSG_DONTWAIT flag which makes the call non-blocking. The connection classes are modified to handle the partial reception of buffers. The sendmsg() calls are still blocking, but this is assumed to represent a fairly minimal risk of actually blocking given that the control protocol's replies consist of 4-byte status codes. A similar approach could be used to make the live connections non-blocking as that side may also suffer from the same resiliancy problems. So far, no users have reported this problem so it is not prioritised. Signed-off-by: Jérémie Galarneau --- diff --git a/src/bin/lttng-relayd/Makefile.am b/src/bin/lttng-relayd/Makefile.am index 5125c7219..751b5766c 100644 --- a/src/bin/lttng-relayd/Makefile.am +++ b/src/bin/lttng-relayd/Makefile.am @@ -9,7 +9,6 @@ bin_PROGRAMS = lttng-relayd lttng_relayd_SOURCES = main.c lttng-relayd.h utils.h utils.c cmd.h \ index.c index.h live.c live.h ctf-trace.c ctf-trace.h \ - cmd-generic.c cmd-generic.h \ cmd-2-1.c cmd-2-1.h \ cmd-2-2.c cmd-2-2.h \ cmd-2-4.c cmd-2-4.h \ diff --git a/src/bin/lttng-relayd/cmd-2-1.c b/src/bin/lttng-relayd/cmd-2-1.c index 080dc173f..99aa86668 100644 --- a/src/bin/lttng-relayd/cmd-2-1.c +++ b/src/bin/lttng-relayd/cmd-2-1.c @@ -25,14 +25,13 @@ #include #include -#include "cmd-generic.h" #include "cmd-2-1.h" #include "utils.h" /* * cmd_recv_stream_2_1 allocates path_name and channel_name. */ -int cmd_recv_stream_2_1(struct relay_connection *conn, +int cmd_recv_stream_2_1(const struct lttng_buffer_view *payload, char **ret_path_name, char **ret_channel_name) { int ret; @@ -41,11 +40,13 @@ int cmd_recv_stream_2_1(struct relay_connection *conn, char *channel_name = NULL; size_t len; - ret = cmd_recv(conn->sock, &stream_info, sizeof(stream_info)); - if (ret < 0) { - ERR("Unable to recv stream version 2.1"); + if (payload->size < sizeof(stream_info)) { + ERR("Unexpected payload size in \"cmd_recv_stream_2_1\": expected >= %zu bytes, got %zu bytes", + sizeof(stream_info), payload->size); + ret = -1; goto error; } + memcpy(&stream_info, payload->data, sizeof(stream_info)); len = lttng_strnlen(stream_info.pathname, sizeof(stream_info.pathname)); /* Ensure that NULL-terminated and fits in local filename length. */ diff --git a/src/bin/lttng-relayd/cmd-2-1.h b/src/bin/lttng-relayd/cmd-2-1.h index 46283dc5a..c1eb6b327 100644 --- a/src/bin/lttng-relayd/cmd-2-1.h +++ b/src/bin/lttng-relayd/cmd-2-1.h @@ -21,8 +21,9 @@ */ #include "lttng-relayd.h" +#include -int cmd_recv_stream_2_1(struct relay_connection *conn, +int cmd_recv_stream_2_1(const struct lttng_buffer_view *payload, char **path_name, char **channel_name); #endif /* RELAYD_CMD_2_1_H */ diff --git a/src/bin/lttng-relayd/cmd-2-2.c b/src/bin/lttng-relayd/cmd-2-2.c index 4f34d8b66..5ff628050 100644 --- a/src/bin/lttng-relayd/cmd-2-2.c +++ b/src/bin/lttng-relayd/cmd-2-2.c @@ -27,14 +27,13 @@ #include #include -#include "cmd-generic.h" #include "cmd-2-1.h" #include "utils.h" /* * cmd_recv_stream_2_2 allocates path_name and channel_name. */ -int cmd_recv_stream_2_2(struct relay_connection *conn, +int cmd_recv_stream_2_2(const struct lttng_buffer_view *payload, char **ret_path_name, char **ret_channel_name, uint64_t *tracefile_size, uint64_t *tracefile_count) { @@ -44,11 +43,13 @@ int cmd_recv_stream_2_2(struct relay_connection *conn, char *channel_name = NULL; size_t len; - ret = cmd_recv(conn->sock, &stream_info, sizeof(stream_info)); - if (ret < 0) { - ERR("Unable to recv stream version 2.2"); + if (payload->size < sizeof(stream_info)) { + ERR("Unexpected payload size in \"cmd_recv_stream_2_2\": expected >= %zu bytes, got %zu bytes", + sizeof(stream_info), payload->size); + ret = -1; goto error; } + memcpy(&stream_info, payload->data, sizeof(stream_info)); len = lttng_strnlen(stream_info.pathname, sizeof(stream_info.pathname)); /* Ensure that NULL-terminated and fits in local filename length. */ diff --git a/src/bin/lttng-relayd/cmd-2-2.h b/src/bin/lttng-relayd/cmd-2-2.h index 894a63a1e..822f627b1 100644 --- a/src/bin/lttng-relayd/cmd-2-2.h +++ b/src/bin/lttng-relayd/cmd-2-2.h @@ -21,8 +21,9 @@ */ #include "lttng-relayd.h" +#include -int cmd_recv_stream_2_2(struct relay_connection *conn, +int cmd_recv_stream_2_2(const struct lttng_buffer_view *payload, char **path_name, char **channel_name, uint64_t *tracefile_size, uint64_t *tracefile_count); diff --git a/src/bin/lttng-relayd/cmd-2-4.c b/src/bin/lttng-relayd/cmd-2-4.c index b269bc68a..aeb760a04 100644 --- a/src/bin/lttng-relayd/cmd-2-4.c +++ b/src/bin/lttng-relayd/cmd-2-4.c @@ -27,10 +27,10 @@ #include #include -#include "cmd-generic.h" +#include "cmd-2-4.h" #include "lttng-relayd.h" -int cmd_create_session_2_4(struct relay_connection *conn, +int cmd_create_session_2_4(const struct lttng_buffer_view *payload, char *session_name, char *hostname, uint32_t *live_timer, bool *snapshot) { @@ -38,11 +38,14 @@ int cmd_create_session_2_4(struct relay_connection *conn, struct lttcomm_relayd_create_session_2_4 session_info; size_t len; - ret = cmd_recv(conn->sock, &session_info, sizeof(session_info)); - if (ret < 0) { - ERR("Unable to recv session info version 2.4"); + if (payload->size < sizeof(session_info)) { + ERR("Unexpected payload size in \"cmd_create_session_2_4\": expected >= %zu bytes, got %zu bytes", + sizeof(session_info), payload->size); + ret = -1; goto error; } + memcpy(&session_info, payload->data, sizeof(session_info)); + len = lttng_strnlen(session_info.session_name, sizeof(session_info.session_name)); /* Ensure that NULL-terminated and fits in local filename length. */ if (len == sizeof(session_info.session_name) || len >= LTTNG_NAME_MAX) { diff --git a/src/bin/lttng-relayd/cmd-2-4.h b/src/bin/lttng-relayd/cmd-2-4.h index ab7347897..d2cd2c6df 100644 --- a/src/bin/lttng-relayd/cmd-2-4.h +++ b/src/bin/lttng-relayd/cmd-2-4.h @@ -21,8 +21,9 @@ */ #include "lttng-relayd.h" +#include -int cmd_create_session_2_4(struct relay_connection *conn, +int cmd_create_session_2_4(const struct lttng_buffer_view *payload, char *session_name, char *hostname, uint32_t *live_timer, bool *snapshot); diff --git a/src/bin/lttng-relayd/cmd-generic.c b/src/bin/lttng-relayd/cmd-generic.c deleted file mode 100644 index 89ae69e7a..000000000 --- a/src/bin/lttng-relayd/cmd-generic.c +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright (C) 2013 - Julien Desfossez - * David Goulet - * 2015 - Mathieu Desnoyers - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License, version 2 only, as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will 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 to the Free Software Foundation, Inc., 51 - * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#define _LGPL_SOURCE -#include - -#include - -#include "cmd-generic.h" - -int cmd_recv(struct lttcomm_sock *sock, void *buf, size_t len) -{ - int ret; - - assert(sock); - assert(buf); - - ret = sock->ops->recvmsg(sock, buf, len, 0); - if (ret < len) { - if (ret == 0) { - /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", sock->fd); - } else { - ERR("Relay didn't receive valid add_stream struct size. " - "Expected %zu, got %d", len, ret); - } - ret = -1; - goto error; - } - -error: - return ret; -} diff --git a/src/bin/lttng-relayd/cmd-generic.h b/src/bin/lttng-relayd/cmd-generic.h deleted file mode 100644 index 4551f0aa1..000000000 --- a/src/bin/lttng-relayd/cmd-generic.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef RELAYD_CMD_GENERIC_H -#define RELAYD_CMD_GENERIC_H - -/* - * Copyright (C) 2013 - Julien Desfossez - * David Goulet - * 2015 - Mathieu Desnoyers - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License, version 2 only, as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will 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 to the Free Software Foundation, Inc., 51 - * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include - -#include "connection.h" - -int cmd_recv(struct lttcomm_sock *sock, void *buf, size_t len); - -#endif /* RELAYD_CMD_GENERIC_H */ diff --git a/src/bin/lttng-relayd/cmd.h b/src/bin/lttng-relayd/cmd.h index 88db09aed..468a693e5 100644 --- a/src/bin/lttng-relayd/cmd.h +++ b/src/bin/lttng-relayd/cmd.h @@ -20,7 +20,6 @@ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "cmd-generic.h" #include "cmd-2-1.h" #include "cmd-2-2.h" #include "cmd-2-4.h" diff --git a/src/bin/lttng-relayd/connection.c b/src/bin/lttng-relayd/connection.c index e8c3d4bea..dab794147 100644 --- a/src/bin/lttng-relayd/connection.c +++ b/src/bin/lttng-relayd/connection.c @@ -56,6 +56,45 @@ end: return conn; } +int connection_reset_protocol_state(struct relay_connection *connection) +{ + int ret = 0; + + switch (connection->type) { + case RELAY_DATA: + connection->protocol.data.state_id = + DATA_CONNECTION_STATE_RECEIVE_HEADER; + memset(&connection->protocol.data.state.receive_header, + 0, + sizeof(connection->protocol.data.state.receive_header)); + connection->protocol.data.state.receive_header.left_to_receive = + sizeof(struct lttcomm_relayd_data_hdr); + break; + case RELAY_CONTROL: + connection->protocol.ctrl.state_id = + CTRL_CONNECTION_STATE_RECEIVE_HEADER; + memset(&connection->protocol.ctrl.state.receive_header, + 0, + sizeof(connection->protocol.ctrl.state.receive_header)); + connection->protocol.data.state.receive_header.left_to_receive = + sizeof(struct lttcomm_relayd_hdr); + ret = lttng_dynamic_buffer_set_size( + &connection->protocol.ctrl.reception_buffer, + sizeof(struct lttcomm_relayd_hdr)); + if (ret) { + ERR("Failed to reinitialize control connection reception buffer size to %zu bytes.", sizeof(struct lttcomm_relayd_hdr)); + goto end; + } + break; + default: + goto end; + } + DBG("Reset communication state of relay connection (fd = %i)", + connection->sock->fd); +end: + return ret; +} + struct relay_connection *connection_create(struct lttcomm_sock *sock, enum connection_type type) { @@ -70,6 +109,10 @@ struct relay_connection *connection_create(struct lttcomm_sock *sock, conn->type = type; conn->sock = sock; lttng_ht_node_init_ulong(&conn->sock_n, (unsigned long) conn->sock->fd); + if (conn->type == RELAY_CONTROL) { + lttng_dynamic_buffer_init(&conn->protocol.ctrl.reception_buffer); + } + connection_reset_protocol_state(conn); end: return conn; } diff --git a/src/bin/lttng-relayd/connection.h b/src/bin/lttng-relayd/connection.h index 43e8a1de6..444195dff 100644 --- a/src/bin/lttng-relayd/connection.h +++ b/src/bin/lttng-relayd/connection.h @@ -29,6 +29,8 @@ #include #include +#include +#include #include "session.h" @@ -40,6 +42,36 @@ enum connection_type { RELAY_VIEWER_NOTIFICATION = 4, }; +enum data_connection_state { + DATA_CONNECTION_STATE_RECEIVE_HEADER = 0, + DATA_CONNECTION_STATE_RECEIVE_PAYLOAD = 1, +}; + +enum ctrl_connection_state { + CTRL_CONNECTION_STATE_RECEIVE_HEADER = 0, + CTRL_CONNECTION_STATE_RECEIVE_PAYLOAD = 1, +}; + +struct data_connection_state_receive_header { + uint64_t received, left_to_receive; + char header_reception_buffer[sizeof(struct lttcomm_relayd_data_hdr)]; +}; + +struct data_connection_state_receive_payload { + uint64_t received, left_to_receive; + struct lttcomm_relayd_data_hdr header; + bool rotate_index; +}; + +struct ctrl_connection_state_receive_header { + uint64_t received, left_to_receive; +}; + +struct ctrl_connection_state_receive_payload { + uint64_t received, left_to_receive; + struct lttcomm_relayd_hdr header; +}; + /* * Internal structure to map a socket with the corresponding session. * A hashtable indexed on the socket FD is used for the lookups. @@ -87,12 +119,31 @@ struct relay_connection { bool in_socket_ht; struct lttng_ht *socket_ht; /* HACK: Contained within this hash table. */ struct rcu_head rcu_node; /* For call_rcu teardown. */ + + union { + struct { + enum data_connection_state state_id; + union { + struct data_connection_state_receive_header receive_header; + struct data_connection_state_receive_payload receive_payload; + } state; + } data; + struct { + enum ctrl_connection_state state_id; + union { + struct ctrl_connection_state_receive_header receive_header; + struct ctrl_connection_state_receive_payload receive_payload; + } state; + struct lttng_dynamic_buffer reception_buffer; + } ctrl; + } protocol; }; struct relay_connection *connection_create(struct lttcomm_sock *sock, enum connection_type type); struct relay_connection *connection_get_by_sock(struct lttng_ht *relay_connections_ht, int sock); +int connection_reset_protocol_state(struct relay_connection *connection); bool connection_get(struct relay_connection *connection); void connection_put(struct relay_connection *connection); void connection_ht_add(struct lttng_ht *relay_connections_ht, diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c index f5f1ad3b4..44ea6cdee 100644 --- a/src/bin/lttng-relayd/main.c +++ b/src/bin/lttng-relayd/main.c @@ -56,6 +56,8 @@ #include #include #include +#include +#include #include #include "cmd.h" @@ -145,10 +147,6 @@ static uint64_t last_relay_stream_id; */ static struct relay_conn_queue relay_conn_queue; -/* buffer allocated at startup, used to store the trace data */ -static char *data_buffer; -static unsigned int data_buffer_size; - /* Global relay stream hash table. */ struct lttng_ht *relay_streams_ht; @@ -1060,21 +1058,18 @@ static int set_index_control_data(struct relay_index *index, struct ctf_packet_index index_data; /* - * The index on disk is encoded in big endian, so we don't need - * to convert the data received on the network. The data_offset - * value is NEVER modified here and is updated by the data - * thread. + * The index on disk is encoded in big endian. */ - index_data.packet_size = data->packet_size; - index_data.content_size = data->content_size; - index_data.timestamp_begin = data->timestamp_begin; - index_data.timestamp_end = data->timestamp_end; - index_data.events_discarded = data->events_discarded; - index_data.stream_id = data->stream_id; + index_data.packet_size = htobe64(data->packet_size); + index_data.content_size = htobe64(data->content_size); + index_data.timestamp_begin = htobe64(data->timestamp_begin); + index_data.timestamp_end = htobe64(data->timestamp_end); + index_data.events_discarded = htobe64(data->events_discarded); + index_data.stream_id = htobe64(data->stream_id); if (conn->minor >= 8) { - index->index_data.stream_instance_id = data->stream_instance_id; - index->index_data.packet_seq_num = data->packet_seq_num; + index->index_data.stream_instance_id = htobe64(data->stream_instance_id); + index->index_data.packet_seq_num = htobe64(data->packet_seq_num); } return relay_index_set_data(index, &index_data); @@ -1085,10 +1080,12 @@ static int set_index_control_data(struct relay_index *index, * * On success, send back the session id or else return a negative value. */ -static int relay_create_session(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_connection *conn) +static int relay_create_session(const struct lttcomm_relayd_hdr *recv_hdr, + struct relay_connection *conn, + const struct lttng_buffer_view *payload) { - int ret = 0, send_ret; + int ret = 0; + ssize_t send_ret; struct relay_session *session; struct lttcomm_relayd_status_session reply; char session_name[LTTNG_NAME_MAX]; @@ -1108,7 +1105,7 @@ static int relay_create_session(struct lttcomm_relayd_hdr *recv_hdr, break; case 4: /* LTTng sessiond 2.4 */ default: - ret = cmd_create_session_2_4(conn, session_name, + ret = cmd_create_session_2_4(payload, session_name, hostname, &live_timer, &snapshot); } if (ret < 0) { @@ -1135,9 +1132,10 @@ send_reply: } send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0); - if (send_ret < 0) { - ERR("Relayd sending session id"); - ret = send_ret; + if (send_ret < (ssize_t) sizeof(reply)) { + ERR("Failed to send \"create session\" command reply (ret = %zd)", + send_ret); + ret = -1; } return ret; @@ -1176,8 +1174,9 @@ static void publish_connection_local_streams(struct relay_connection *conn) /* * relay_add_stream: allocate a new stream for a session */ -static int relay_add_stream(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_connection *conn) +static int relay_add_stream(const struct lttcomm_relayd_hdr *recv_hdr, + struct relay_connection *conn, + const struct lttng_buffer_view *payload) { int ret; ssize_t send_ret; @@ -1189,7 +1188,7 @@ static int relay_add_stream(struct lttcomm_relayd_hdr *recv_hdr, char *path_name = NULL, *channel_name = NULL; uint64_t tracefile_size = 0, tracefile_count = 0; - if (!session || conn->version_check_done == 0) { + if (!session || !conn->version_check_done) { ERR("Trying to add a stream before version check"); ret = -1; goto end_no_session; @@ -1197,12 +1196,12 @@ static int relay_add_stream(struct lttcomm_relayd_hdr *recv_hdr, switch (session->minor) { case 1: /* LTTng sessiond 2.1. Allocates path_name and channel_name. */ - ret = cmd_recv_stream_2_1(conn, &path_name, + ret = cmd_recv_stream_2_1(payload, &path_name, &channel_name); break; case 2: /* LTTng sessiond 2.2. Allocates path_name and channel_name. */ default: - ret = cmd_recv_stream_2_2(conn, &path_name, + ret = cmd_recv_stream_2_2(payload, &path_name, &channel_name, &tracefile_size, &tracefile_count); break; } @@ -1243,9 +1242,10 @@ send_reply: send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(struct lttcomm_relayd_status_stream), 0); - if (send_ret < 0) { - ERR("Relay sending stream id"); - ret = (int) send_ret; + if (send_ret < (ssize_t) sizeof(reply)) { + ERR("Failed to send \"add stream\" command reply (ret = %zd)", + send_ret); + ret = -1; } end_no_session: @@ -1257,10 +1257,12 @@ end_no_session: /* * relay_close_stream: close a specific stream */ -static int relay_close_stream(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_connection *conn) +static int relay_close_stream(const struct lttcomm_relayd_hdr *recv_hdr, + struct relay_connection *conn, + const struct lttng_buffer_view *payload) { - int ret, send_ret; + int ret; + ssize_t send_ret; struct relay_session *session = conn->session; struct lttcomm_relayd_close_stream stream_info; struct lttcomm_relayd_generic_reply reply; @@ -1268,26 +1270,23 @@ static int relay_close_stream(struct lttcomm_relayd_hdr *recv_hdr, DBG("Close stream received"); - if (!session || conn->version_check_done == 0) { + if (!session || !conn->version_check_done) { ERR("Trying to close a stream before version check"); ret = -1; goto end_no_session; } - ret = conn->sock->ops->recvmsg(conn->sock, &stream_info, - sizeof(struct lttcomm_relayd_close_stream), 0); - if (ret < sizeof(struct lttcomm_relayd_close_stream)) { - if (ret == 0) { - /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", conn->sock->fd); - } else { - ERR("Relay didn't receive valid add_stream struct size : %d", ret); - } + if (payload->size < sizeof(stream_info)) { + ERR("Unexpected payload size in \"relay_close_stream\": expected >= %zu bytes, got %zu bytes", + sizeof(stream_info), payload->size); ret = -1; goto end_no_session; } + memcpy(&stream_info, payload->data, sizeof(stream_info)); + stream_info.stream_id = be64toh(stream_info.stream_id); + stream_info.last_net_seq_num = be64toh(stream_info.last_net_seq_num); - stream = stream_get_by_id(be64toh(stream_info.stream_id)); + stream = stream_get_by_id(stream_info.stream_id); if (!stream) { ret = -1; goto end; @@ -1298,7 +1297,7 @@ static int relay_close_stream(struct lttcomm_relayd_hdr *recv_hdr, * pending check. */ pthread_mutex_lock(&stream->lock); - stream->last_net_seq_num = be64toh(stream_info.last_net_seq_num); + stream->last_net_seq_num = stream_info.last_net_seq_num; pthread_mutex_unlock(&stream->lock); /* @@ -1329,6 +1328,7 @@ static int relay_close_stream(struct lttcomm_relayd_hdr *recv_hdr, } } stream_put(stream); + ret = 0; end: memset(&reply, 0, sizeof(reply)); @@ -1339,9 +1339,10 @@ end: } send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(struct lttcomm_relayd_generic_reply), 0); - if (send_ret < 0) { - ERR("Relay sending stream id"); - ret = send_ret; + if (send_ret < (ssize_t) sizeof(reply)) { + ERR("Failed to send \"close stream\" command reply (ret = %zd)", + send_ret); + ret = -1; } end_no_session: @@ -1352,10 +1353,12 @@ end_no_session: * relay_reset_metadata: reset a metadata stream */ static -int relay_reset_metadata(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_connection *conn) +int relay_reset_metadata(const struct lttcomm_relayd_hdr *recv_hdr, + struct relay_connection *conn, + const struct lttng_buffer_view *payload) { - int ret, send_ret; + int ret; + ssize_t send_ret; struct relay_session *session = conn->session; struct lttcomm_relayd_reset_metadata stream_info; struct lttcomm_relayd_generic_reply reply; @@ -1363,26 +1366,23 @@ int relay_reset_metadata(struct lttcomm_relayd_hdr *recv_hdr, DBG("Reset metadata received"); - if (!session || conn->version_check_done == 0) { + if (!session || !conn->version_check_done) { ERR("Trying to reset a metadata stream before version check"); ret = -1; goto end_no_session; } - ret = conn->sock->ops->recvmsg(conn->sock, &stream_info, - sizeof(struct lttcomm_relayd_reset_metadata), 0); - if (ret < sizeof(struct lttcomm_relayd_reset_metadata)) { - if (ret == 0) { - /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", conn->sock->fd); - } else { - ERR("Relay didn't receive valid reset_metadata struct " - "size : %d", ret); - } + if (payload->size < sizeof(stream_info)) { + ERR("Unexpected payload size in \"relay_reset_metadata\": expected >= %zu bytes, got %zu bytes", + sizeof(stream_info), payload->size); ret = -1; goto end_no_session; } - DBG("Update metadata to version %" PRIu64, be64toh(stream_info.version)); + memcpy(&stream_info, payload->data, sizeof(stream_info)); + stream_info.stream_id = be64toh(stream_info.stream_id); + stream_info.version = be64toh(stream_info.version); + + DBG("Update metadata to version %" PRIu64, stream_info.version); /* Unsupported for live sessions for now. */ if (session->live_timer != 0) { @@ -1390,7 +1390,7 @@ int relay_reset_metadata(struct lttcomm_relayd_hdr *recv_hdr, goto end; } - stream = stream_get_by_id(be64toh(stream_info.stream_id)); + stream = stream_get_by_id(stream_info.stream_id); if (!stream) { ret = -1; goto end; @@ -1423,9 +1423,10 @@ end: } send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(struct lttcomm_relayd_generic_reply), 0); - if (send_ret < 0) { - ERR("Relay sending reset metadata reply"); - ret = send_ret; + if (send_ret < (ssize_t) sizeof(reply)) { + ERR("Failed to send \"reset metadata\" command reply (ret = %zd)", + send_ret); + ret = -1; } end_no_session: @@ -1438,14 +1439,13 @@ end_no_session: static void relay_unknown_command(struct relay_connection *conn) { struct lttcomm_relayd_generic_reply reply; - int ret; + ssize_t send_ret; memset(&reply, 0, sizeof(reply)); reply.ret_code = htobe32(LTTNG_ERR_UNK); - ret = conn->sock->ops->sendmsg(conn->sock, &reply, - sizeof(struct lttcomm_relayd_generic_reply), 0); - if (ret < 0) { - ERR("Relay sending unknown command"); + send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0); + if (send_ret < sizeof(reply)) { + ERR("Failed to send \"unknown command\" command reply (ret = %zd)", send_ret); } } @@ -1453,10 +1453,12 @@ static void relay_unknown_command(struct relay_connection *conn) * relay_start: send an acknowledgment to the client to tell if we are * ready to receive data. We are ready if a session is established. */ -static int relay_start(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_connection *conn) +static int relay_start(const struct lttcomm_relayd_hdr *recv_hdr, + struct relay_connection *conn, + const struct lttng_buffer_view *payload) { - int ret = htobe32(LTTNG_OK); + int ret = 0; + ssize_t send_ret; struct lttcomm_relayd_generic_reply reply; struct relay_session *session = conn->session; @@ -1466,11 +1468,13 @@ static int relay_start(struct lttcomm_relayd_hdr *recv_hdr, } memset(&reply, 0, sizeof(reply)); - reply.ret_code = ret; - ret = conn->sock->ops->sendmsg(conn->sock, &reply, - sizeof(struct lttcomm_relayd_generic_reply), 0); - if (ret < 0) { - ERR("Relay sending start ack"); + reply.ret_code = htobe32(LTTNG_OK); + send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, + sizeof(reply), 0); + if (send_ret < (ssize_t) sizeof(reply)) { + ERR("Failed to send \"relay_start\" command reply (ret = %zd)", + send_ret); + ret = -1; } return ret; @@ -1753,15 +1757,16 @@ end: /* * relay_recv_metadata: receive the metadata for the session. */ -static int relay_recv_metadata(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_connection *conn) +static int relay_recv_metadata(const struct lttcomm_relayd_hdr *recv_hdr, + struct relay_connection *conn, + const struct lttng_buffer_view *payload) { int ret = 0; ssize_t size_ret; struct relay_session *session = conn->session; - struct lttcomm_relayd_metadata_payload *metadata_struct; + struct lttcomm_relayd_metadata_payload metadata_payload_header; struct relay_stream *metadata_stream; - uint64_t data_size, payload_size; + uint64_t metadata_payload_size; if (!session) { ERR("Metadata sent before version check"); @@ -1769,44 +1774,22 @@ static int relay_recv_metadata(struct lttcomm_relayd_hdr *recv_hdr, goto end; } - data_size = payload_size = be64toh(recv_hdr->data_size); - if (data_size < sizeof(struct lttcomm_relayd_metadata_payload)) { + if (recv_hdr->data_size < sizeof(struct lttcomm_relayd_metadata_payload)) { ERR("Incorrect data size"); ret = -1; goto end; } - payload_size -= sizeof(struct lttcomm_relayd_metadata_payload); + metadata_payload_size = recv_hdr->data_size - + sizeof(struct lttcomm_relayd_metadata_payload); - if (data_buffer_size < data_size) { - /* In case the realloc fails, we can free the memory */ - char *tmp_data_ptr; - - tmp_data_ptr = realloc(data_buffer, data_size); - if (!tmp_data_ptr) { - ERR("Allocating data buffer"); - free(data_buffer); - ret = -1; - goto end; - } - data_buffer = tmp_data_ptr; - data_buffer_size = data_size; - } - memset(data_buffer, 0, data_size); - DBG2("Relay receiving metadata, waiting for %" PRIu64 " bytes", data_size); - size_ret = conn->sock->ops->recvmsg(conn->sock, data_buffer, data_size, 0); - if (size_ret < 0 || size_ret != data_size) { - if (size_ret == 0) { - /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", conn->sock->fd); - } else { - ERR("Relay didn't receive the whole metadata"); - } - ret = -1; - goto end; - } - metadata_struct = (struct lttcomm_relayd_metadata_payload *) data_buffer; + memcpy(&metadata_payload_header, payload->data, + sizeof(metadata_payload_header)); + metadata_payload_header.stream_id = be64toh( + metadata_payload_header.stream_id); + metadata_payload_header.padding_size = be32toh( + metadata_payload_header.padding_size); - metadata_stream = stream_get_by_id(be64toh(metadata_struct->stream_id)); + metadata_stream = stream_get_by_id(metadata_payload_header.stream_id); if (!metadata_stream) { ret = -1; goto end; @@ -1814,22 +1797,24 @@ static int relay_recv_metadata(struct lttcomm_relayd_hdr *recv_hdr, pthread_mutex_lock(&metadata_stream->lock); - size_ret = lttng_write(metadata_stream->stream_fd->fd, metadata_struct->payload, - payload_size); - if (size_ret < payload_size) { + size_ret = lttng_write(metadata_stream->stream_fd->fd, + payload->data + sizeof(metadata_payload_header), + metadata_payload_size); + if (size_ret < metadata_payload_size) { ERR("Relay error writing metadata on file"); ret = -1; goto end_put; } size_ret = write_padding_to_file(metadata_stream->stream_fd->fd, - be32toh(metadata_struct->padding_size)); + metadata_payload_header.padding_size); if (size_ret < 0) { + ret = -1; goto end_put; } metadata_stream->metadata_received += - payload_size + be32toh(metadata_struct->padding_size); + metadata_payload_size + metadata_payload_header.padding_size; DBG2("Relay metadata written. Updated metadata_received %" PRIu64, metadata_stream->metadata_received); @@ -1848,53 +1833,59 @@ end: /* * relay_send_version: send relayd version number */ -static int relay_send_version(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_connection *conn) +static int relay_send_version(const struct lttcomm_relayd_hdr *recv_hdr, + struct relay_connection *conn, + const struct lttng_buffer_view *payload) { int ret; + ssize_t send_ret; struct lttcomm_relayd_version reply, msg; bool compatible = true; - conn->version_check_done = 1; + conn->version_check_done = true; /* Get version from the other side. */ - ret = conn->sock->ops->recvmsg(conn->sock, &msg, sizeof(msg), 0); - if (ret < 0 || ret != sizeof(msg)) { - if (ret == 0) { - /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", conn->sock->fd); - } else { - ERR("Relay failed to receive the version values."); - } + if (payload->size < sizeof(msg)) { + ERR("Unexpected payload size in \"relay_send_version\": expected >= %zu bytes, got %zu bytes", + sizeof(msg), payload->size); ret = -1; goto end; } + memcpy(&msg, payload->data, sizeof(msg)); + msg.major = be32toh(msg.major); + msg.minor = be32toh(msg.minor); + memset(&reply, 0, sizeof(reply)); reply.major = RELAYD_VERSION_COMM_MAJOR; reply.minor = RELAYD_VERSION_COMM_MINOR; /* Major versions must be the same */ - if (reply.major != be32toh(msg.major)) { + if (reply.major != msg.major) { DBG("Incompatible major versions (%u vs %u), deleting session", - reply.major, be32toh(msg.major)); + reply.major, msg.major); compatible = false; } conn->major = reply.major; /* We adapt to the lowest compatible version */ - if (reply.minor <= be32toh(msg.minor)) { + if (reply.minor <= msg.minor) { conn->minor = reply.minor; } else { - conn->minor = be32toh(msg.minor); + conn->minor = msg.minor; } reply.major = htobe32(reply.major); reply.minor = htobe32(reply.minor); - ret = conn->sock->ops->sendmsg(conn->sock, &reply, - sizeof(struct lttcomm_relayd_version), 0); - if (ret < 0) { - ERR("Relay sending version"); + send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, + sizeof(reply), 0); + if (send_ret < (ssize_t) sizeof(reply)) { + ERR("Failed to send \"send version\" command reply (ret = %zd)", + send_ret); + ret = -1; + goto end; + } else { + ret = 0; } if (!compatible) { @@ -1912,41 +1903,36 @@ end: /* * Check for data pending for a given stream id from the session daemon. */ -static int relay_data_pending(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_connection *conn) +static int relay_data_pending(const struct lttcomm_relayd_hdr *recv_hdr, + struct relay_connection *conn, + const struct lttng_buffer_view *payload) { struct relay_session *session = conn->session; struct lttcomm_relayd_data_pending msg; struct lttcomm_relayd_generic_reply reply; struct relay_stream *stream; + ssize_t send_ret; int ret; - uint64_t last_net_seq_num, stream_id; DBG("Data pending command received"); - if (!session || conn->version_check_done == 0) { + if (!session || !conn->version_check_done) { ERR("Trying to check for data before version check"); ret = -1; goto end_no_session; } - ret = conn->sock->ops->recvmsg(conn->sock, &msg, sizeof(msg), 0); - if (ret < sizeof(msg)) { - if (ret == 0) { - /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", conn->sock->fd); - } else { - ERR("Relay didn't receive valid data_pending struct size : %d", - ret); - } + if (payload->size < sizeof(msg)) { + ERR("Unexpected payload size in \"relay_data_pending\": expected >= %zu bytes, got %zu bytes", + sizeof(msg), payload->size); ret = -1; goto end_no_session; } + memcpy(&msg, payload->data, sizeof(msg)); + msg.stream_id = be64toh(msg.stream_id); + msg.last_net_seq_num = be64toh(msg.last_net_seq_num); - stream_id = be64toh(msg.stream_id); - last_net_seq_num = be64toh(msg.last_net_seq_num); - - stream = stream_get_by_id(stream_id); + stream = stream_get_by_id(msg.stream_id); if (stream == NULL) { ret = -1; goto end; @@ -1955,11 +1941,11 @@ static int relay_data_pending(struct lttcomm_relayd_hdr *recv_hdr, pthread_mutex_lock(&stream->lock); DBG("Data pending for stream id %" PRIu64 " prev_seq %" PRIu64 - " and last_seq %" PRIu64, stream_id, stream->prev_seq, - last_net_seq_num); + " and last_seq %" PRIu64, msg.stream_id, + stream->prev_seq, msg.last_net_seq_num); /* Avoid wrapping issue */ - if (((int64_t) (stream->prev_seq - last_net_seq_num)) >= 0) { + if (((int64_t) (stream->prev_seq - msg.last_net_seq_num)) >= 0) { /* Data has in fact been written and is NOT pending */ ret = 0; } else { @@ -1975,9 +1961,11 @@ end: memset(&reply, 0, sizeof(reply)); reply.ret_code = htobe32(ret); - ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0); - if (ret < 0) { - ERR("Relay data pending ret code failed"); + send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0); + if (send_ret < (ssize_t) sizeof(reply)) { + ERR("Failed to send \"data pending\" command reply (ret = %zd)", + send_ret); + ret = -1; } end_no_session: @@ -1992,52 +1980,53 @@ end_no_session: * the control socket has been handled. So, this is why we simply return * OK here. */ -static int relay_quiescent_control(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_connection *conn) +static int relay_quiescent_control(const struct lttcomm_relayd_hdr *recv_hdr, + struct relay_connection *conn, + const struct lttng_buffer_view *payload) { int ret; - uint64_t stream_id; + ssize_t send_ret; struct relay_stream *stream; struct lttcomm_relayd_quiescent_control msg; struct lttcomm_relayd_generic_reply reply; DBG("Checking quiescent state on control socket"); - if (!conn->session || conn->version_check_done == 0) { + if (!conn->session || !conn->version_check_done) { ERR("Trying to check for data before version check"); ret = -1; goto end_no_session; } - ret = conn->sock->ops->recvmsg(conn->sock, &msg, sizeof(msg), 0); - if (ret < sizeof(msg)) { - if (ret == 0) { - /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", conn->sock->fd); - } else { - ERR("Relay didn't receive valid begin data_pending struct size: %d", - ret); - } + if (payload->size < sizeof(msg)) { + ERR("Unexpected payload size in \"relay_quiescent_control\": expected >= %zu bytes, got %zu bytes", + sizeof(msg), payload->size); ret = -1; goto end_no_session; } + memcpy(&msg, payload->data, sizeof(msg)); + msg.stream_id = be64toh(msg.stream_id); - stream_id = be64toh(msg.stream_id); - stream = stream_get_by_id(stream_id); + stream = stream_get_by_id(msg.stream_id); if (!stream) { goto reply; } pthread_mutex_lock(&stream->lock); stream->data_pending_check_done = true; pthread_mutex_unlock(&stream->lock); - DBG("Relay quiescent control pending flag set to %" PRIu64, stream_id); + + DBG("Relay quiescent control pending flag set to %" PRIu64, msg.stream_id); stream_put(stream); reply: memset(&reply, 0, sizeof(reply)); reply.ret_code = htobe32(LTTNG_OK); - ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0); - if (ret < 0) { - ERR("Relay data quiescent control ret code failed"); + send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0); + if (send_ret < (ssize_t) sizeof(reply)) { + ERR("Failed to send \"quiescent control\" command reply (ret = %zd)", + send_ret); + ret = -1; + } else { + ret = 0; } end_no_session: @@ -2051,41 +2040,36 @@ end_no_session: * * This command returns to the client a LTTNG_OK code. */ -static int relay_begin_data_pending(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_connection *conn) +static int relay_begin_data_pending(const struct lttcomm_relayd_hdr *recv_hdr, + struct relay_connection *conn, + const struct lttng_buffer_view *payload) { int ret; + ssize_t send_ret; struct lttng_ht_iter iter; struct lttcomm_relayd_begin_data_pending msg; struct lttcomm_relayd_generic_reply reply; struct relay_stream *stream; - uint64_t session_id; assert(recv_hdr); assert(conn); DBG("Init streams for data pending"); - if (!conn->session || conn->version_check_done == 0) { + if (!conn->session || !conn->version_check_done) { ERR("Trying to check for data before version check"); ret = -1; goto end_no_session; } - ret = conn->sock->ops->recvmsg(conn->sock, &msg, sizeof(msg), 0); - if (ret < sizeof(msg)) { - if (ret == 0) { - /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", conn->sock->fd); - } else { - ERR("Relay didn't receive valid begin data_pending struct size: %d", - ret); - } + if (payload->size < sizeof(msg)) { + ERR("Unexpected payload size in \"relay_begin_data_pending\": expected >= %zu bytes, got %zu bytes", + sizeof(msg), payload->size); ret = -1; goto end_no_session; } - - session_id = be64toh(msg.session_id); + memcpy(&msg, payload->data, sizeof(msg)); + msg.session_id = be64toh(msg.session_id); /* * Iterate over all streams to set the begin data pending flag. @@ -2099,7 +2083,7 @@ static int relay_begin_data_pending(struct lttcomm_relayd_hdr *recv_hdr, if (!stream_get(stream)) { continue; } - if (stream->trace->session->id == session_id) { + if (stream->trace->session->id == msg.session_id) { pthread_mutex_lock(&stream->lock); stream->data_pending_check_done = false; pthread_mutex_unlock(&stream->lock); @@ -2114,9 +2098,13 @@ static int relay_begin_data_pending(struct lttcomm_relayd_hdr *recv_hdr, /* All good, send back reply. */ reply.ret_code = htobe32(LTTNG_OK); - ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0); - if (ret < 0) { - ERR("Relay begin data pending send reply failed"); + send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0); + if (send_ret < (ssize_t) sizeof(reply)) { + ERR("Failed to send \"begin data pending\" command reply (ret = %zd)", + send_ret); + ret = -1; + } else { + ret = 0; } end_no_session: @@ -2132,39 +2120,34 @@ end_no_session: * * Return to the client if there is data in flight or not with a ret_code. */ -static int relay_end_data_pending(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_connection *conn) +static int relay_end_data_pending(const struct lttcomm_relayd_hdr *recv_hdr, + struct relay_connection *conn, + const struct lttng_buffer_view *payload) { int ret; + ssize_t send_ret; struct lttng_ht_iter iter; struct lttcomm_relayd_end_data_pending msg; struct lttcomm_relayd_generic_reply reply; struct relay_stream *stream; - uint64_t session_id; uint32_t is_data_inflight = 0; DBG("End data pending command"); - if (!conn->session || conn->version_check_done == 0) { + if (!conn->session || !conn->version_check_done) { ERR("Trying to check for data before version check"); ret = -1; goto end_no_session; } - ret = conn->sock->ops->recvmsg(conn->sock, &msg, sizeof(msg), 0); - if (ret < sizeof(msg)) { - if (ret == 0) { - /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", conn->sock->fd); - } else { - ERR("Relay didn't receive valid end data_pending struct size: %d", - ret); - } + if (payload->size < sizeof(msg)) { + ERR("Unexpected payload size in \"relay_end_data_pending\": expected >= %zu bytes, got %zu bytes", + sizeof(msg), payload->size); ret = -1; goto end_no_session; } - - session_id = be64toh(msg.session_id); + memcpy(&msg, payload->data, sizeof(msg)); + msg.session_id = be64toh(msg.session_id); /* * Iterate over all streams to see if the begin data pending @@ -2176,7 +2159,7 @@ static int relay_end_data_pending(struct lttcomm_relayd_hdr *recv_hdr, if (!stream_get(stream)) { continue; } - if (stream->trace->session->id != session_id) { + if (stream->trace->session->id != msg.session_id) { stream_put(stream); continue; } @@ -2200,9 +2183,13 @@ static int relay_end_data_pending(struct lttcomm_relayd_hdr *recv_hdr, /* All good, send back reply. */ reply.ret_code = htobe32(is_data_inflight); - ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0); - if (ret < 0) { - ERR("Relay end data pending send reply failed"); + send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0); + if (send_ret < (ssize_t) sizeof(reply)) { + ERR("Failed to send \"end data pending\" command reply (ret = %zd)", + send_ret); + ret = -1; + } else { + ret = 0; } end_no_session: @@ -2214,23 +2201,24 @@ end_no_session: * * Return 0 on success else a negative value. */ -static int relay_recv_index(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_connection *conn) +static int relay_recv_index(const struct lttcomm_relayd_hdr *recv_hdr, + struct relay_connection *conn, + const struct lttng_buffer_view *payload) { - int ret, send_ret; + int ret; + ssize_t send_ret; struct relay_session *session = conn->session; struct lttcomm_relayd_index index_info; struct relay_index *index; struct lttcomm_relayd_generic_reply reply; struct relay_stream *stream; - uint64_t net_seq_num; size_t msg_len; assert(conn); DBG("Relay receiving index"); - if (!session || conn->version_check_done == 0) { + if (!session || !conn->version_check_done) { ERR("Trying to close a stream before version check"); ret = -1; goto end_no_session; @@ -2239,22 +2227,25 @@ static int relay_recv_index(struct lttcomm_relayd_hdr *recv_hdr, msg_len = lttcomm_relayd_index_len( lttng_to_index_major(conn->major, conn->minor), lttng_to_index_minor(conn->major, conn->minor)); - ret = conn->sock->ops->recvmsg(conn->sock, &index_info, - msg_len, 0); - if (ret < msg_len) { - if (ret == 0) { - /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", conn->sock->fd); - } else { - ERR("Relay didn't receive valid index struct size : %d", ret); - } + if (payload->size < msg_len) { + ERR("Unexpected payload size in \"relay_recv_index\": expected >= %zu bytes, got %zu bytes", + msg_len, payload->size); ret = -1; goto end_no_session; } - - net_seq_num = be64toh(index_info.net_seq_num); - - stream = stream_get_by_id(be64toh(index_info.relay_stream_id)); + memcpy(&index_info, payload->data, msg_len); + index_info.relay_stream_id = be64toh(index_info.relay_stream_id); + index_info.net_seq_num = be64toh(index_info.net_seq_num); + index_info.packet_size = be64toh(index_info.packet_size); + index_info.content_size = be64toh(index_info.content_size); + index_info.timestamp_begin = be64toh(index_info.timestamp_begin); + index_info.timestamp_end = be64toh(index_info.timestamp_end); + index_info.events_discarded = be64toh(index_info.events_discarded); + index_info.stream_id = be64toh(index_info.stream_id); + index_info.stream_instance_id = be64toh(index_info.stream_instance_id); + index_info.packet_seq_num = be64toh(index_info.packet_seq_num); + + stream = stream_get_by_id(index_info.relay_stream_id); if (!stream) { ERR("stream_get_by_id not found"); ret = -1; @@ -2273,8 +2264,7 @@ static int relay_recv_index(struct lttcomm_relayd_hdr *recv_hdr, */ if (stream->index_received_seqcount > 0 && stream->indexes_in_flight == 0) { - stream->beacon_ts_end = - be64toh(index_info.timestamp_end); + stream->beacon_ts_end = index_info.timestamp_end; } ret = 0; goto end_stream_put; @@ -2283,9 +2273,9 @@ static int relay_recv_index(struct lttcomm_relayd_hdr *recv_hdr, } if (stream->ctf_stream_id == -1ULL) { - stream->ctf_stream_id = be64toh(index_info.stream_id); + stream->ctf_stream_id = index_info.stream_id; } - index = relay_index_get_by_id_or_create(stream, net_seq_num); + index = relay_index_get_by_id_or_create(stream, index_info.net_seq_num); if (!index) { ret = -1; ERR("relay_index_get_by_id_or_create index NULL"); @@ -2324,9 +2314,9 @@ end: reply.ret_code = htobe32(LTTNG_OK); } send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0); - if (send_ret < 0) { - ERR("Relay sending close index id reply"); - ret = send_ret; + if (send_ret < (ssize_t) sizeof(reply)) { + ERR("Failed to send \"recv index\" command reply (ret = %zd)", send_ret); + ret = -1; } end_no_session: @@ -2338,17 +2328,19 @@ end_no_session: * * Return 0 on success else a negative value. */ -static int relay_streams_sent(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_connection *conn) +static int relay_streams_sent(const struct lttcomm_relayd_hdr *recv_hdr, + struct relay_connection *conn, + const struct lttng_buffer_view *payload) { - int ret, send_ret; + int ret; + ssize_t send_ret; struct lttcomm_relayd_generic_reply reply; assert(conn); DBG("Relay receiving streams_sent"); - if (!conn->session || conn->version_check_done == 0) { + if (!conn->session || !conn->version_check_done) { ERR("Trying to close a stream before version check"); ret = -1; goto end_no_session; @@ -2363,9 +2355,10 @@ static int relay_streams_sent(struct lttcomm_relayd_hdr *recv_hdr, memset(&reply, 0, sizeof(reply)); reply.ret_code = htobe32(LTTNG_OK); send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0); - if (send_ret < 0) { - ERR("Relay sending sent_stream reply"); - ret = send_ret; + if (send_ret < (ssize_t) sizeof(reply)) { + ERR("Failed to send \"streams sent\" command reply (ret = %zd)", + send_ret); + ret = -1; } else { /* Success. */ ret = 0; @@ -2376,19 +2369,22 @@ end_no_session: } /* - * relay_rotate_stream: rotate a stream to a new tracefile for the session + * relay_rotate_session_stream: rotate a stream to a new tracefile for the session * rotation feature (not the tracefile rotation feature). */ -static int relay_rotate_session_stream(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_connection *conn) +static int relay_rotate_session_stream(const struct lttcomm_relayd_hdr *recv_hdr, + struct relay_connection *conn, + const struct lttng_buffer_view *payload) { - int ret, send_ret; + int ret; + ssize_t send_ret; struct relay_session *session = conn->session; struct lttcomm_relayd_rotate_stream stream_info; struct lttcomm_relayd_generic_reply reply; struct relay_stream *stream; - size_t len; - char *new_pathname = NULL; + size_t header_len; + size_t path_len; + struct lttng_buffer_view new_path_view; DBG("Rotate stream received"); @@ -2404,57 +2400,46 @@ static int relay_rotate_session_stream(struct lttcomm_relayd_hdr *recv_hdr, goto end_no_reply; } - memset(&stream_info, 0, sizeof(struct lttcomm_relayd_rotate_stream)); + header_len = sizeof(struct lttcomm_relayd_rotate_stream); - /* - * Receive the struct up to the new_pathname member since we don't know - * its size yet. - */ - ret = conn->sock->ops->recvmsg(conn->sock, &stream_info, - sizeof(struct lttcomm_relayd_rotate_stream), 0); - if (ret < sizeof(struct lttcomm_relayd_rotate_stream)) { - if (ret == 0) { - /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", conn->sock->fd); - } else { - ERR("Relay didn't receive valid rotate_stream struct size : %d", ret); - } + if (payload->size < header_len) { + ERR("Unexpected payload size in \"relay_rotate_session_stream\": expected >= %zu bytes, got %zu bytes", + header_len, payload->size); ret = -1; goto end_no_reply; } - stream = stream_get_by_id(be64toh(stream_info.stream_id)); - if (!stream) { - ret = -1; - goto end; - } + memcpy(&stream_info, payload->data, header_len); + + /* Convert to host */ + stream_info.pathname_length = be32toh(stream_info.pathname_length); + stream_info.stream_id = be64toh(stream_info.stream_id); + stream_info.new_chunk_id = be64toh(stream_info.new_chunk_id); + stream_info.rotate_at_seq_num = be64toh(stream_info.rotate_at_seq_num); - len = be32toh(stream_info.pathname_length); + path_len = stream_info.pathname_length; + if (payload->size < header_len + path_len) { + ERR("Unexpected payload size in \"relay_rotate_session_stream\" including path: expected >= %zu bytes, got %zu bytes", + header_len + path_len, payload->size); + ret = -1; + goto end_no_reply; + } + /* Ensure it fits in local filename length. */ - if (len >= LTTNG_PATH_MAX) { + if (path_len >= LTTNG_PATH_MAX) { ret = -ENAMETOOLONG; ERR("Length of relay_rotate_session_stream command's path name (%zu bytes) exceeds the maximal allowed length of %i bytes", - len, LTTNG_PATH_MAX); + path_len, LTTNG_PATH_MAX); goto end; } - new_pathname = zmalloc(len); - if (!new_pathname) { - PERROR("Failed to allocation new path name of relay_rotate_session_stream command"); - ret = -1; - goto end; - } + new_path_view = lttng_buffer_view_from_view(payload, header_len, + stream_info.pathname_length); - ret = conn->sock->ops->recvmsg(conn->sock, new_pathname, len, 0); - if (ret < len) { - if (ret == 0) { - /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", conn->sock->fd); - } else { - ERR("Relay didn't receive valid rotate_stream struct size : %d", ret); - } + stream = stream_get_by_id(stream_info.stream_id); + if (!stream) { ret = -1; - goto end_no_reply; + goto end; } pthread_mutex_lock(&stream->lock); @@ -2464,18 +2449,21 @@ static int relay_rotate_session_stream(struct lttcomm_relayd_hdr *recv_hdr, * change). */ free(stream->path_name); - stream->path_name = create_output_path(new_pathname); + stream->path_name = create_output_path(new_path_view.data); if (!stream->path_name) { ERR("Failed to create a new output path"); + ret = -1; goto end_stream_unlock; } ret = utils_mkdir_recursive(stream->path_name, S_IRWXU | S_IRWXG, -1, -1); if (ret < 0) { ERR("relay creating output directory"); + ret = -1; goto end_stream_unlock; } - stream->chunk_id = be64toh(stream_info.new_chunk_id); + + stream->chunk_id = stream_info.new_chunk_id; if (stream->is_metadata) { /* @@ -2485,7 +2473,7 @@ static int relay_rotate_session_stream(struct lttcomm_relayd_hdr *recv_hdr, */ ret = do_rotate_stream(stream); } else { - stream->rotate_at_seq_num = be64toh(stream_info.rotate_at_seq_num); + stream->rotate_at_seq_num = stream_info.rotate_at_seq_num; ret = try_rotate_stream(stream); } if (ret < 0) { @@ -2504,29 +2492,31 @@ end: } send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(struct lttcomm_relayd_generic_reply), 0); - if (send_ret < 0) { - ERR("Failed to send reply of rotate session stream command"); - ret = send_ret; + if (send_ret < (ssize_t) sizeof(reply)) { + ERR("Failed to send \"rotate session stream\" command reply (ret = %zd)", + send_ret); + ret = -1; } end_no_reply: - free(new_pathname); return ret; } /* * relay_mkdir: Create a folder on the disk. */ -static int relay_mkdir(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_connection *conn) +static int relay_mkdir(const struct lttcomm_relayd_hdr *recv_hdr, + struct relay_connection *conn, + const struct lttng_buffer_view *payload) { int ret; - ssize_t network_ret; struct relay_session *session = conn->session; struct lttcomm_relayd_mkdir path_info_header; - struct lttcomm_relayd_mkdir *path_info = NULL; struct lttcomm_relayd_generic_reply reply; char *path = NULL; + size_t header_len; + ssize_t send_ret; + struct lttng_buffer_view path_view; if (!session || !conn->version_check_done) { ERR("Trying to create a directory before version check"); @@ -2544,22 +2534,25 @@ static int relay_mkdir(struct lttcomm_relayd_hdr *recv_hdr, goto end_no_session; } - network_ret = conn->sock->ops->recvmsg(conn->sock, &path_info_header, - sizeof(path_info_header), 0); - if (network_ret < (ssize_t) sizeof(path_info_header)) { - if (network_ret == 0) { - /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", conn->sock->fd); - } else { - ERR("Reception of mkdir command argument length failed with ret = %zi, expected %zu", - network_ret, sizeof(path_info_header)); - } + header_len = sizeof(path_info_header); + if (payload->size < header_len) { + ERR("Unexpected payload size in \"relay_mkdir\": expected >= %zu bytes, got %zu bytes", + header_len, payload->size); ret = -1; goto end_no_session; } + memcpy(&path_info_header, payload->data, header_len); + path_info_header.length = be32toh(path_info_header.length); + if (payload->size < header_len + path_info_header.length) { + ERR("Unexpected payload size in \"relay_mkdir\" including path: expected >= %zu bytes, got %zu bytes", + header_len + path_info_header.length, payload->size); + ret = -1; + goto end_no_session; + } + /* Ensure that it fits in local path length. */ if (path_info_header.length >= LTTNG_PATH_MAX) { ret = -ENAMETOOLONG; @@ -2568,28 +2561,10 @@ static int relay_mkdir(struct lttcomm_relayd_hdr *recv_hdr, goto end; } - path_info = zmalloc(sizeof(path_info_header) + path_info_header.length); - if (!path_info) { - PERROR("zmalloc of mkdir command path"); - ret = -1; - goto end; - } - - network_ret = conn->sock->ops->recvmsg(conn->sock, path_info->path, - path_info_header.length, 0); - if (network_ret < (ssize_t) path_info_header.length) { - if (network_ret == 0) { - /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", conn->sock->fd); - } else { - ERR("Reception of mkdir path argument failed with ret = %zi, expected %" PRIu32, - network_ret, path_info_header.length); - } - ret = -1; - goto end_no_session; - } + path_view = lttng_buffer_view_from_view(payload, header_len, + path_info_header.length); - path = create_output_path(path_info->path); + path = create_output_path(path_view.data); if (!path) { ERR("Failed to create output path"); ret = -1; @@ -2611,18 +2586,14 @@ end: } else { reply.ret_code = htobe32(LTTNG_OK); } - network_ret = conn->sock->ops->sendmsg(conn->sock, &reply, - sizeof(struct lttcomm_relayd_generic_reply), 0); - if (network_ret < (ssize_t) sizeof(struct lttcomm_relayd_generic_reply)) { - ERR("Failed to send mkdir command status code with ret = %zi, expected %zu", - network_ret, - sizeof(struct lttcomm_relayd_generic_reply)); + send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0); + if (send_ret < (ssize_t) sizeof(reply)) { + ERR("Failed to send \"mkdir\" command reply (ret = %zd)", send_ret); ret = -1; } end_no_session: free(path); - free(path_info); return ret; } @@ -2647,18 +2618,20 @@ static int validate_rotate_rename_path_length(const char *path_type, * completed. We are not closing any fd here, just moving the folder, so it * works even if data is still in-flight. */ -static int relay_rotate_rename(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_connection *conn) +static int relay_rotate_rename(const struct lttcomm_relayd_hdr *recv_hdr, + struct relay_connection *conn, + const struct lttng_buffer_view *payload) { int ret; - ssize_t network_ret; + ssize_t send_ret; struct relay_session *session = conn->session; struct lttcomm_relayd_generic_reply reply; struct lttcomm_relayd_rotate_rename header; - char *received_paths = NULL; + size_t header_len; size_t received_paths_size; - const char *received_old_path, *received_new_path; char *complete_old_path = NULL, *complete_new_path = NULL; + struct lttng_buffer_view old_path_view; + struct lttng_buffer_view new_path_view; if (!session || !conn->version_check_done) { ERR("Trying to rename a trace folder before version check"); @@ -2672,25 +2645,27 @@ static int relay_rotate_rename(struct lttcomm_relayd_hdr *recv_hdr, goto end_no_reply; } - network_ret = conn->sock->ops->recvmsg(conn->sock, &header, - sizeof(header), 0); - if (network_ret < (ssize_t) sizeof(header)) { - if (network_ret == 0) { - /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", - conn->sock->fd); - } else { - ERR("Relay didn't receive a valid rotate_rename command header: expected %zu bytes, recvmsg() returned %zi", - sizeof(header), network_ret); - } + header_len = sizeof(header); + if (payload->size < header_len) { + ERR("Unexpected payload size in \"relay_rotate_rename\": expected >= %zu bytes, got %zu bytes", + header_len, payload->size); ret = -1; goto end_no_reply; } + memcpy(&header, payload->data, header_len); + header.old_path_length = be32toh(header.old_path_length); header.new_path_length = be32toh(header.new_path_length); received_paths_size = header.old_path_length + header.new_path_length; + if (payload->size < header_len + received_paths_size) { + ERR("Unexpected payload size in \"relay_rotate_rename\" including paths: expected >= %zu bytes, got %zu bytes", + header_len, payload->size); + ret = -1; + goto end_no_reply; + } + /* Ensure the paths don't exceed their allowed size. */ ret = validate_rotate_rename_path_length("old", header.old_path_length); if (ret) { @@ -2701,51 +2676,32 @@ static int relay_rotate_rename(struct lttcomm_relayd_hdr *recv_hdr, goto end; } - received_paths = zmalloc(received_paths_size); - if (!received_paths) { - PERROR("Could not allocate rotate commands paths reception buffer"); - ret = -1; - goto end; - } - - network_ret = conn->sock->ops->recvmsg(conn->sock, received_paths, - received_paths_size, 0); - if (network_ret < (ssize_t) received_paths_size) { - if (network_ret == 0) { - /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", - conn->sock->fd); - } else { - ERR("Relay failed to received rename command paths (%zu bytes): recvmsg() returned %zi", - received_paths_size, network_ret); - } - ret = -1; - goto end_no_reply; - } + old_path_view = lttng_buffer_view_from_view(payload, header_len, + header.old_path_length); + new_path_view = lttng_buffer_view_from_view(payload, + header_len + header.old_path_length, + header.new_path_length); /* Validate that both paths received are NULL terminated. */ - if (received_paths[header.old_path_length - 1] != '\0') { + if (old_path_view.data[old_path_view.size - 1] != '\0') { ERR("relay_rotate_rename command's \"old\" path is invalid (not NULL terminated)"); ret = -1; goto end; } - if (received_paths[received_paths_size - 1] != '\0') { + if (new_path_view.data[new_path_view.size - 1] != '\0') { ERR("relay_rotate_rename command's \"new\" path is invalid (not NULL terminated)"); ret = -1; goto end; } - received_old_path = received_paths; - received_new_path = received_paths + header.old_path_length; - - complete_old_path = create_output_path(received_old_path); + complete_old_path = create_output_path(old_path_view.data); if (!complete_old_path) { ERR("Failed to build old output path in rotate_rename command"); ret = -1; goto end; } - complete_new_path = create_output_path(received_new_path); + complete_new_path = create_output_path(new_path_view.data); if (!complete_new_path) { ERR("Failed to build new output path in rotate_rename command"); ret = -1; @@ -2779,15 +2735,15 @@ end: } else { reply.ret_code = htobe32(LTTNG_OK); } - network_ret = conn->sock->ops->sendmsg(conn->sock, &reply, - sizeof(struct lttcomm_relayd_generic_reply), 0); - if (network_ret < sizeof(struct lttcomm_relayd_generic_reply)) { - ERR("Relay sending stream id"); + send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, + sizeof(reply), 0); + if (send_ret < sizeof(reply)) { + ERR("Failed to send \"rotate rename\" command reply (ret = %zd)", + send_ret); ret = -1; } end_no_reply: - free(received_paths); free(complete_old_path); free(complete_new_path); return ret; @@ -2802,8 +2758,9 @@ end_no_reply: * new chunk folder). */ static -int relay_rotate_pending(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_connection *conn) +int relay_rotate_pending(const struct lttcomm_relayd_hdr *recv_hdr, + struct relay_connection *conn, + const struct lttng_buffer_view *payload) { struct relay_session *session = conn->session; struct lttcomm_relayd_rotate_pending msg; @@ -2811,7 +2768,7 @@ int relay_rotate_pending(struct lttcomm_relayd_hdr *recv_hdr, struct lttng_ht_iter iter; struct relay_stream *stream; int ret = 0; - ssize_t network_ret; + ssize_t send_ret; uint64_t chunk_id; bool rotate_pending = false; @@ -2829,20 +2786,17 @@ int relay_rotate_pending(struct lttcomm_relayd_hdr *recv_hdr, goto end_no_reply; } - network_ret = conn->sock->ops->recvmsg(conn->sock, &msg, sizeof(msg), 0); - if (network_ret < (ssize_t) sizeof(msg)) { - if (network_ret == 0) { - /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", conn->sock->fd); - } else { - ERR("Relay didn't receive valid rotate_pending struct size : %zi", - network_ret); - } + if (payload->size < sizeof(msg)) { + ERR("Unexpected payload size in \"relay_rotate_pending\": expected >= %zu bytes, got %zu bytes", + sizeof(msg), payload->size); ret = -1; goto end_no_reply; } + memcpy(&msg, payload->data, sizeof(msg)); + chunk_id = be64toh(msg.chunk_id); + DBG("Evaluating rotate pending for chunk id %" PRIu64, chunk_id); /* @@ -2889,10 +2843,11 @@ send_reply: memset(&reply, 0, sizeof(reply)); reply.generic.ret_code = htobe32((uint32_t) LTTNG_OK); reply.is_pending = (uint8_t) !!rotate_pending; - network_ret = conn->sock->ops->sendmsg(conn->sock, &reply, + send_ret = conn->sock->ops->sendmsg(conn->sock, &reply, sizeof(reply), 0); - if (network_ret < (ssize_t) sizeof(reply)) { - ERR("Relay rotate pending ret code failed"); + if (send_ret < (ssize_t) sizeof(reply)) { + ERR("Failed to send \"rotate pending\" command reply (ret = %zd)", + send_ret); ret = -1; } @@ -2900,69 +2855,87 @@ end_no_reply: return ret; } -/* - * Process the commands received on the control socket - */ -static int relay_process_control(struct lttcomm_relayd_hdr *recv_hdr, - struct relay_connection *conn) +#define DBG_CMD(cmd_name, conn) \ + DBG3("Processing \"%s\" command for socket %i", cmd_name, conn->sock->fd); + +static int relay_process_control_command(struct relay_connection *conn, + const struct lttcomm_relayd_hdr *header, + const struct lttng_buffer_view *payload) { int ret = 0; - switch (be32toh(recv_hdr->cmd)) { + switch (header->cmd) { case RELAYD_CREATE_SESSION: - ret = relay_create_session(recv_hdr, conn); + DBG_CMD("RELAYD_CREATE_SESSION", conn); + ret = relay_create_session(header, conn, payload); break; case RELAYD_ADD_STREAM: - ret = relay_add_stream(recv_hdr, conn); + DBG_CMD("RELAYD_ADD_STREAM", conn); + ret = relay_add_stream(header, conn, payload); break; case RELAYD_START_DATA: - ret = relay_start(recv_hdr, conn); + DBG_CMD("RELAYD_START_DATA", conn); + ret = relay_start(header, conn, payload); break; case RELAYD_SEND_METADATA: - ret = relay_recv_metadata(recv_hdr, conn); + DBG_CMD("RELAYD_SEND_METADATA", conn); + ret = relay_recv_metadata(header, conn, payload); break; case RELAYD_VERSION: - ret = relay_send_version(recv_hdr, conn); + DBG_CMD("RELAYD_VERSION", conn); + ret = relay_send_version(header, conn, payload); break; case RELAYD_CLOSE_STREAM: - ret = relay_close_stream(recv_hdr, conn); + DBG_CMD("RELAYD_CLOSE_STREAM", conn); + ret = relay_close_stream(header, conn, payload); break; case RELAYD_DATA_PENDING: - ret = relay_data_pending(recv_hdr, conn); + DBG_CMD("RELAYD_DATA_PENDING", conn); + ret = relay_data_pending(header, conn, payload); break; case RELAYD_QUIESCENT_CONTROL: - ret = relay_quiescent_control(recv_hdr, conn); + DBG_CMD("RELAYD_QUIESCENT_CONTROL", conn); + ret = relay_quiescent_control(header, conn, payload); break; case RELAYD_BEGIN_DATA_PENDING: - ret = relay_begin_data_pending(recv_hdr, conn); + DBG_CMD("RELAYD_BEGIN_DATA_PENDING", conn); + ret = relay_begin_data_pending(header, conn, payload); break; case RELAYD_END_DATA_PENDING: - ret = relay_end_data_pending(recv_hdr, conn); + DBG_CMD("RELAYD_END_DATA_PENDING", conn); + ret = relay_end_data_pending(header, conn, payload); break; case RELAYD_SEND_INDEX: - ret = relay_recv_index(recv_hdr, conn); + DBG_CMD("RELAYD_SEND_INDEX", conn); + ret = relay_recv_index(header, conn, payload); break; case RELAYD_STREAMS_SENT: - ret = relay_streams_sent(recv_hdr, conn); + DBG_CMD("RELAYD_STREAMS_SENT", conn); + ret = relay_streams_sent(header, conn, payload); break; case RELAYD_RESET_METADATA: - ret = relay_reset_metadata(recv_hdr, conn); + DBG_CMD("RELAYD_RESET_METADATA", conn); + ret = relay_reset_metadata(header, conn, payload); break; case RELAYD_ROTATE_STREAM: - ret = relay_rotate_session_stream(recv_hdr, conn); + DBG_CMD("RELAYD_ROTATE_STREAM", conn); + ret = relay_rotate_session_stream(header, conn, payload); break; case RELAYD_ROTATE_RENAME: - ret = relay_rotate_rename(recv_hdr, conn); + DBG_CMD("RELAYD_ROTATE_RENAME", conn); + ret = relay_rotate_rename(header, conn, payload); break; case RELAYD_ROTATE_PENDING: - ret = relay_rotate_pending(recv_hdr, conn); + DBG_CMD("RELAYD_ROTATE_PENDING", conn); + ret = relay_rotate_pending(header, conn, payload); break; case RELAYD_MKDIR: - ret = relay_mkdir(recv_hdr, conn); + DBG_CMD("RELAYD_MKDIR", conn); + ret = relay_mkdir(header, conn, payload); break; case RELAYD_UPDATE_SYNC_INFO: default: - ERR("Received unknown command (%u)", be32toh(recv_hdr->cmd)); + ERR("Received unknown command (%u)", header->cmd); relay_unknown_command(conn); ret = -1; goto end; @@ -2972,6 +2945,179 @@ end: return ret; } +static int relay_process_control_receive_payload(struct relay_connection *conn) +{ + int ret = 0; + struct lttng_dynamic_buffer *reception_buffer = + &conn->protocol.ctrl.reception_buffer; + struct ctrl_connection_state_receive_payload *state = + &conn->protocol.ctrl.state.receive_payload; + struct lttng_buffer_view payload_view; + + if (state->left_to_receive == 0) { + /* Short-circuit for payload-less commands. */ + goto reception_complete; + } + + ret = conn->sock->ops->recvmsg(conn->sock, + reception_buffer->data + state->received, + state->left_to_receive, MSG_DONTWAIT); + if (ret < 0) { + ERR("Unable to receive command payload on sock %d", conn->sock->fd); + goto end; + } else if (ret == 0) { + DBG("Socket %d performed an orderly shutdown (received EOF)", conn->sock->fd); + ret = -1; + goto end; + } + + assert(ret > 0); + assert(ret <= state->left_to_receive); + + state->left_to_receive -= ret; + state->received += ret; + + if (state->left_to_receive > 0) { + /* + * Can't transition to the protocol's next state, wait to + * receive the rest of the header. + */ + DBG3("Partial reception of control connection protocol payload (received %" PRIu64 " bytes, %" PRIu64 " bytes left to receive, fd = %i)", + state->received, state->left_to_receive, + conn->sock->fd); + ret = 0; + goto end; + } + +reception_complete: + DBG("Done receiving control command payload: fd = %i, payload size = %" PRIu64 " bytes", + conn->sock->fd, state->received); + /* + * The payload required to process the command has been received. + * A view to the reception buffer is forwarded to the various + * commands and the state of the control is reset on success. + * + * Commands are responsible for sending their reply to the peer. + */ + payload_view = lttng_buffer_view_from_dynamic_buffer(reception_buffer, + 0, -1); + ret = relay_process_control_command(conn, + &state->header, &payload_view); + if (ret < 0) { + goto end; + } + + ret = connection_reset_protocol_state(conn); +end: + return ret; +} + +static int relay_process_control_receive_header(struct relay_connection *conn) +{ + int ret = 0; + struct lttcomm_relayd_hdr header; + struct lttng_dynamic_buffer *reception_buffer = + &conn->protocol.ctrl.reception_buffer; + struct ctrl_connection_state_receive_header *state = + &conn->protocol.ctrl.state.receive_header; + + assert(state->left_to_receive != 0); + + ret = conn->sock->ops->recvmsg(conn->sock, + reception_buffer->data + state->received, + state->left_to_receive, MSG_DONTWAIT); + if (ret < 0) { + ERR("Unable to receive control command header on sock %d", conn->sock->fd); + goto end; + } else if (ret == 0) { + DBG("Socket %d performed an orderly shutdown (received EOF)", conn->sock->fd); + ret = -1; + goto end; + } + + assert(ret > 0); + assert(ret <= state->left_to_receive); + + state->left_to_receive -= ret; + state->received += ret; + + if (state->left_to_receive > 0) { + /* + * Can't transition to the protocol's next state, wait to + * receive the rest of the header. + */ + DBG3("Partial reception of control connection protocol header (received %" PRIu64 " bytes, %" PRIu64 " bytes left to receive, fd = %i)", + state->received, state->left_to_receive, + conn->sock->fd); + ret = 0; + goto end; + } + + /* Transition to next state: receiving the command's payload. */ + conn->protocol.ctrl.state_id = + CTRL_CONNECTION_STATE_RECEIVE_PAYLOAD; + memcpy(&header, reception_buffer->data, sizeof(header)); + header.circuit_id = be64toh(header.circuit_id); + header.data_size = be64toh(header.data_size); + header.cmd = be32toh(header.cmd); + header.cmd_version = be32toh(header.cmd_version); + memcpy(&conn->protocol.ctrl.state.receive_payload.header, + &header, sizeof(header)); + + DBG("Done receiving control command header: fd = %i, cmd = %" PRIu32 ", cmd_version = %" PRIu32 ", payload size = %" PRIu64 " bytes", + conn->sock->fd, header.cmd, header.cmd_version, + header.data_size); + + /* FIXME temporary arbitrary limit on data size. */ + if (header.data_size > (128 * 1024 * 1024)) { + ERR("Command header indicates a payload (%" PRIu64 " bytes) that exceeds the maximal payload size allowed on a control connection.", + header.data_size); + ret = -1; + goto end; + } + + conn->protocol.ctrl.state.receive_payload.left_to_receive = + header.data_size; + conn->protocol.ctrl.state.receive_payload.received = 0; + ret = lttng_dynamic_buffer_set_size(reception_buffer, + header.data_size); + if (ret) { + goto end; + } + + if (header.data_size == 0) { + /* + * Manually invoke the next state as the poll loop + * will not wake-up to allow us to proceed further. + */ + ret = relay_process_control_receive_payload(conn); + } +end: + return ret; +} + +/* + * Process the commands received on the control socket + */ +static int relay_process_control(struct relay_connection *conn) +{ + int ret = 0; + + switch (conn->protocol.ctrl.state_id) { + case CTRL_CONNECTION_STATE_RECEIVE_HEADER: + ret = relay_process_control_receive_header(conn); + break; + case CTRL_CONNECTION_STATE_RECEIVE_PAYLOAD: + ret = relay_process_control_receive_payload(conn); + break; + default: + ERR("Unknown control connection protocol state encountered."); + abort(); + } + + return ret; +} + /* * Handle index for a data stream. * @@ -2980,7 +3126,7 @@ end: * Return 0 on success else a negative value. */ static int handle_index_data(struct relay_stream *stream, uint64_t net_seq_num, - int rotate_index, bool *flushed, uint64_t total_size) + bool rotate_index, bool *flushed, uint64_t total_size) { int ret = 0; uint64_t data_offset; @@ -3041,58 +3187,81 @@ end: return ret; } -/* - * relay_process_data: Process the data received on the data socket - */ -static int relay_process_data(struct relay_connection *conn) +static int relay_process_data_receive_header(struct relay_connection *conn) { - int ret = 0, rotate_index = 0; - ssize_t size_ret; + int ret; + struct data_connection_state_receive_header *state = + &conn->protocol.data.state.receive_header; + struct lttcomm_relayd_data_hdr header; struct relay_stream *stream; - struct lttcomm_relayd_data_hdr data_hdr; - uint64_t stream_id; - uint64_t net_seq_num; - uint32_t data_size; - struct relay_session *session; - bool new_stream = false, close_requested = false; - size_t chunk_size = RECV_DATA_BUFFER_SIZE; - size_t recv_off = 0; - char data_buffer[chunk_size]; - bool index_flushed = false; - - ret = conn->sock->ops->recvmsg(conn->sock, &data_hdr, - sizeof(struct lttcomm_relayd_data_hdr), 0); - if (ret <= 0) { - if (ret == 0) { - /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", conn->sock->fd); - } else { - ERR("Unable to receive data header on sock %d", conn->sock->fd); - } + + assert(state->left_to_receive != 0); + + ret = conn->sock->ops->recvmsg(conn->sock, + state->header_reception_buffer + state->received, + state->left_to_receive, MSG_DONTWAIT); + if (ret < 0) { + ERR("Unable to receive data header on sock %d", conn->sock->fd); + goto end; + } else if (ret == 0) { + /* Orderly shutdown. Not necessary to print an error. */ + DBG("Socket %d performed an orderly shutdown (received EOF)", conn->sock->fd); ret = -1; goto end; } - stream_id = be64toh(data_hdr.stream_id); - stream = stream_get_by_id(stream_id); - if (!stream) { - ERR("relay_process_data: Cannot find stream %" PRIu64, stream_id); - ret = -1; + assert(ret > 0); + assert(ret <= state->left_to_receive); + + state->left_to_receive -= ret; + state->received += ret; + + if (state->left_to_receive > 0) { + /* + * Can't transition to the protocol's next state, wait to + * receive the rest of the header. + */ + DBG3("Partial reception of data connection header (received %" PRIu64 " bytes, %" PRIu64 " bytes left to receive, fd = %i)", + state->received, state->left_to_receive, + conn->sock->fd); + ret = 0; goto end; } - session = stream->trace->session; - data_size = be32toh(data_hdr.data_size); - net_seq_num = be64toh(data_hdr.net_seq_num); + /* Transition to next state: receiving the payload. */ + conn->protocol.data.state_id = DATA_CONNECTION_STATE_RECEIVE_PAYLOAD; - DBG3("Receiving data of size %u for stream id %" PRIu64 " seqnum %" PRIu64, - data_size, stream_id, net_seq_num); + memcpy(&header, state->header_reception_buffer, sizeof(header)); + header.circuit_id = be64toh(header.circuit_id); + header.stream_id = be64toh(header.stream_id); + header.data_size = be32toh(header.data_size); + header.net_seq_num = be64toh(header.net_seq_num); + header.padding_size = be32toh(header.padding_size); + memcpy(&conn->protocol.data.state.receive_payload.header, &header, sizeof(header)); + + conn->protocol.data.state.receive_payload.left_to_receive = + header.data_size; + conn->protocol.data.state.receive_payload.received = 0; + conn->protocol.data.state.receive_payload.rotate_index = false; + + DBG("Received data connection header on fd %i: circuit_id = %" PRIu64 ", stream_id = %" PRIu64 ", data_size = %" PRIu32 ", net_seq_num = %" PRIu64 ", padding_size = %" PRIu32, + conn->sock->fd, header.circuit_id, + header.stream_id, header.data_size, + header.net_seq_num, header.padding_size); + + stream = stream_get_by_id(header.stream_id); + if (!stream) { + DBG("relay_process_data_receive_payload: Cannot find stream %" PRIu64, + header.stream_id); + ret = 0; + goto end; + } pthread_mutex_lock(&stream->lock); /* Check if a rotation is needed. */ if (stream->tracefile_size > 0 && - (stream->tracefile_size_current + data_size) > + (stream->tracefile_size_current + header.data_size) > stream->tracefile_size) { uint64_t old_id, new_id; @@ -3108,69 +3277,138 @@ static int relay_process_data(struct relay_connection *conn) -1, stream->stream_fd->fd, &new_id, &stream->stream_fd->fd); if (ret < 0) { - ERR("Rotating stream output file"); + ERR("Failed to rotate stream output file"); goto end_stream_unlock; } + /* * Reset current size because we just performed a stream * rotation. */ stream->tracefile_size_current = 0; - rotate_index = 1; + conn->protocol.data.state.receive_payload.rotate_index = true; } - /* - * Index are handled in protocol version 2.4 and above. Also, - * snapshot and index are NOT supported. - */ - if (session->minor >= 4 && !session->snapshot) { - ret = handle_index_data(stream, net_seq_num, rotate_index, - &index_flushed, - data_size + be32toh(data_hdr.padding_size)); - if (ret < 0) { - ERR("handle_index_data: fail stream %" PRIu64 " net_seq_num %" PRIu64 " ret %d", - stream->stream_handle, net_seq_num, ret); - goto end_stream_unlock; - } + ret = 0; +end_stream_unlock: + pthread_mutex_unlock(&stream->lock); + stream_put(stream); +end: + return ret; +} + +static int relay_process_data_receive_payload(struct relay_connection *conn) +{ + int ret; + struct relay_stream *stream; + struct data_connection_state_receive_payload *state = + &conn->protocol.data.state.receive_payload; + const size_t chunk_size = RECV_DATA_BUFFER_SIZE; + char data_buffer[chunk_size]; + bool partial_recv = false; + bool new_stream = false, close_requested = false, index_flushed = false; + uint64_t left_to_receive = state->left_to_receive; + struct relay_session *session; + + stream = stream_get_by_id(state->header.stream_id); + if (!stream) { + DBG("relay_process_data_receive_payload: Cannot find stream %" PRIu64, + state->header.stream_id); + ret = 0; + goto end; } - for (recv_off = 0; recv_off < data_size; recv_off += chunk_size) { - size_t recv_size = min(data_size - recv_off, chunk_size); + pthread_mutex_lock(&stream->lock); + session = stream->trace->session; - ret = conn->sock->ops->recvmsg(conn->sock, data_buffer, recv_size, 0); - if (ret <= 0) { - if (ret == 0) { - /* Orderly shutdown. Not necessary to print an error. */ - DBG("Socket %d did an orderly shutdown", conn->sock->fd); - } else { - ERR("Socket %d error %d", conn->sock->fd, ret); - } + DBG3("Receiving data for stream id %" PRIu64 " seqnum %" PRIu64 ", %" PRIu64" bytes received, %" PRIu64 " bytes left to receive", + state->header.stream_id, state->header.net_seq_num, + state->received, left_to_receive); + + /* + * The size of the "chunk" received on any iteration is bounded by: + * - the data left to receive, + * - the data immediately available on the socket, + * - the on-stack data buffer + */ + while (left_to_receive > 0 && !partial_recv) { + ssize_t write_ret; + size_t recv_size = min(left_to_receive, chunk_size); + + ret = conn->sock->ops->recvmsg(conn->sock, data_buffer, + recv_size, MSG_DONTWAIT); + if (ret < 0) { + ERR("Socket %d error %d", conn->sock->fd, ret); ret = -1; goto end_stream_unlock; + } else if (ret == 0) { + /* No more data ready to be consumed on socket. */ + DBG3("No more data ready for consumption on data socket of stream id %" PRIu64, + state->header.stream_id); + break; + } else if (ret < (int) recv_size) { + /* + * All the data available on the socket has been + * consumed. + */ + partial_recv = true; } + recv_size = ret; + /* Write data to stream output fd. */ - size_ret = lttng_write(stream->stream_fd->fd, data_buffer, + write_ret = lttng_write(stream->stream_fd->fd, data_buffer, recv_size); - if (size_ret < recv_size) { + if (write_ret < (ssize_t) recv_size) { ERR("Relay error writing data to file"); ret = -1; goto end_stream_unlock; } + left_to_receive -= recv_size; + state->received += recv_size; + state->left_to_receive = left_to_receive; + DBG2("Relay wrote %zd bytes to tracefile for stream id %" PRIu64, - size_ret, stream->stream_handle); + write_ret, stream->stream_handle); + } + + if (state->left_to_receive > 0) { + /* + * Did not receive all the data expected, wait for more data to + * become available on the socket. + */ + DBG3("Partial receive on data connection of stream id %" PRIu64 ", %" PRIu64 " bytes received, %" PRIu64 " bytes left to receive", + state->header.stream_id, state->received, + state->left_to_receive); + ret = 0; + goto end_stream_unlock; } ret = write_padding_to_file(stream->stream_fd->fd, - be32toh(data_hdr.padding_size)); + state->header.padding_size); if (ret < 0) { ERR("write_padding_to_file: fail stream %" PRIu64 " net_seq_num %" PRIu64 " ret %d", - stream->stream_handle, net_seq_num, ret); + stream->stream_handle, + state->header.net_seq_num, ret); goto end_stream_unlock; } - stream->tracefile_size_current += - data_size + be32toh(data_hdr.padding_size); + + + if (session->minor >= 4 && !session->snapshot) { + ret = handle_index_data(stream, state->header.net_seq_num, + state->rotate_index, &index_flushed, state->header.data_size + state->header.padding_size); + if (ret < 0) { + ERR("handle_index_data: fail stream %" PRIu64 " net_seq_num %" PRIu64 " ret %d", + stream->stream_handle, + state->header.net_seq_num, ret); + goto end_stream_unlock; + } + } + + stream->tracefile_size_current += state->header.data_size + + state->header.padding_size; + if (stream->prev_seq == -1ULL) { new_stream = true; } @@ -3179,7 +3417,15 @@ static int relay_process_data(struct relay_connection *conn) stream->tracefile_size_current; } - stream->prev_seq = net_seq_num; + stream->prev_seq = state->header.net_seq_num; + + /* + * Resetting the protocol state (to RECEIVE_HEADER) will trash the + * contents of *state which are aliased (union) to the same location as + * the new state. Don't use it beyond this point. + */ + connection_reset_protocol_state(conn); + state = NULL; ret = try_rotate_stream(stream); if (ret < 0) { @@ -3189,7 +3435,7 @@ static int relay_process_data(struct relay_connection *conn) end_stream_unlock: close_requested = stream->close_requested; pthread_mutex_unlock(&stream->lock); - if (close_requested) { + if (close_requested && left_to_receive == 0) { try_stream_close(stream); } @@ -3198,11 +3444,34 @@ end_stream_unlock: uatomic_set(&session->new_streams, 1); pthread_mutex_unlock(&session->lock); } + stream_put(stream); end: return ret; } +/* + * relay_process_data: Process the data received on the data socket + */ +static int relay_process_data(struct relay_connection *conn) +{ + int ret; + + switch (conn->protocol.data.state_id) { + case DATA_CONNECTION_STATE_RECEIVE_HEADER: + ret = relay_process_data_receive_header(conn); + break; + case DATA_CONNECTION_STATE_RECEIVE_PAYLOAD: + ret = relay_process_data_receive_payload(conn); + break; + default: + ERR("Unexpected data connection communication state."); + abort(); + } + + return ret; +} + static void cleanup_connection_pollfd(struct lttng_poll_event *events, int pollfd) { int ret; @@ -3251,7 +3520,6 @@ static void *relay_thread_worker(void *data) struct lttng_poll_event events; struct lttng_ht *relay_connections_ht; struct lttng_ht_iter iter; - struct lttcomm_relayd_hdr recv_hdr; struct relay_connection *destroy_conn = NULL; DBG("[thread] Relay worker started"); @@ -3373,21 +3641,14 @@ restart: assert(ctrl_conn->type == RELAY_CONTROL); if (revents & LPOLLIN) { - ret = ctrl_conn->sock->ops->recvmsg(ctrl_conn->sock, - &recv_hdr, sizeof(recv_hdr), 0); - if (ret <= 0) { - /* Connection closed */ - relay_thread_close_connection(&events, pollfd, + ret = relay_process_control(ctrl_conn); + if (ret < 0) { + /* Clear the connection on error. */ + relay_thread_close_connection(&events, + pollfd, ctrl_conn); - } else { - ret = relay_process_control(&recv_hdr, ctrl_conn); - if (ret < 0) { - /* Clear the session on error. */ - relay_thread_close_connection(&events, - pollfd, ctrl_conn); - } - seen_control = 1; } + seen_control = 1; } else if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) { relay_thread_close_connection(&events, pollfd, ctrl_conn); diff --git a/src/bin/lttng-relayd/stream.c b/src/bin/lttng-relayd/stream.c index 5ed37c58e..709b3b1f5 100644 --- a/src/bin/lttng-relayd/stream.c +++ b/src/bin/lttng-relayd/stream.c @@ -361,6 +361,7 @@ void try_stream_close(struct relay_stream *stream) * a packet. Since those are sent in that order, we take * care of consumerd crashes. */ + DBG("relay_index_close_partial_fd"); relay_index_close_partial_fd(stream); /* * Use the highest net_seq_num we currently have pending @@ -368,6 +369,7 @@ void try_stream_close(struct relay_stream *stream) * at -1ULL if we cannot find any index. */ stream->last_net_seq_num = relay_index_find_last(stream); + DBG("Updating stream->last_net_seq_num to %" PRIu64, stream->last_net_seq_num); /* Fall-through into the next check. */ } diff --git a/src/common/sessiond-comm/inet.c b/src/common/sessiond-comm/inet.c index e48f2c9ad..e0b3e7a96 100644 --- a/src/common/sessiond-comm/inet.c +++ b/src/common/sessiond-comm/inet.c @@ -384,18 +384,22 @@ ssize_t lttcomm_recvmsg_inet_sock(struct lttcomm_sock *sock, void *buf, len_last = iov[0].iov_len; ret = recvmsg(sock->fd, &msg, flags); if (ret > 0) { + if (flags & MSG_DONTWAIT) { + goto end; + } iov[0].iov_base += ret; iov[0].iov_len -= ret; assert(ret <= len_last); } } while ((ret > 0 && ret < len_last) || (ret < 0 && errno == EINTR)); + if (ret < 0) { PERROR("recvmsg inet"); } else if (ret > 0) { ret = len; } /* Else ret = 0 meaning an orderly shutdown. */ - +end: return ret; } diff --git a/src/common/sessiond-comm/inet6.c b/src/common/sessiond-comm/inet6.c index e71b55ad1..dfb5fc5d1 100644 --- a/src/common/sessiond-comm/inet6.c +++ b/src/common/sessiond-comm/inet6.c @@ -364,6 +364,9 @@ ssize_t lttcomm_recvmsg_inet6_sock(struct lttcomm_sock *sock, void *buf, len_last = iov[0].iov_len; ret = recvmsg(sock->fd, &msg, flags); if (ret > 0) { + if (flags & MSG_DONTWAIT) { + goto end; + } iov[0].iov_base += ret; iov[0].iov_len -= ret; assert(ret <= len_last); @@ -375,7 +378,7 @@ ssize_t lttcomm_recvmsg_inet6_sock(struct lttcomm_sock *sock, void *buf, ret = len; } /* Else ret = 0 meaning an orderly shutdown. */ - +end: return ret; }