X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fclient.c;h=689dc258a604cff0f3d7816f72ff8778523f8cd5;hp=870277534ec2e1f50dc614b1884f73460f984299;hb=2eb1b01fe26f98294e39385df56250ddc58ea9b4;hpb=189720830e2fc291831674419c1f303d91d10657

diff --git a/src/bin/lttng-sessiond/client.c b/src/bin/lttng-sessiond/client.c
index 870277534..689dc258a 100644
--- a/src/bin/lttng-sessiond/client.c
+++ b/src/bin/lttng-sessiond/client.c
@@ -1,33 +1,36 @@
 /*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
- *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *               2013 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2013 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * 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.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * 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 <stddef.h>
-#include <pthread.h>
-#include <signal.h>
-#include <sys/stat.h>
+#include "common/buffer-view.h"
+#include "common/compat/socket.h"
+#include "common/dynamic-buffer.h"
+#include "common/dynamic-array.h"
+#include "common/payload.h"
+#include "common/payload-view.h"
+#include "common/fd-handle.h"
+#include "common/sessiond-comm/sessiond-comm.h"
+#include "common/payload.h"
+#include "common/payload-view.h"
+#include "lttng/lttng-error.h"
+#include "lttng/tracker.h"
 #include <common/compat/getenv.h>
+#include <common/tracker.h>
 #include <common/unix.h>
 #include <common/utils.h>
-#include <lttng/userspace-probe-internal.h>
 #include <lttng/event-internal.h>
-#include <lttng/session-internal.h>
 #include <lttng/session-descriptor-internal.h>
+#include <lttng/session-internal.h>
+#include <lttng/userspace-probe-internal.h>
+#include <pthread.h>
+#include <signal.h>
+#include <stddef.h>
+#include <sys/stat.h>
 
 #include "client.h"
 #include "lttng-sessiond.h"
@@ -38,12 +41,14 @@
 #include "testpoint.h"
 #include "utils.h"
 #include "manage-consumer.h"
+#include "clear.h"
 
 static bool is_root;
 
 static struct thread_state {
 	sem_t ready;
 	bool running;
+	int client_sock;
 } thread_state;
 
 static void set_thread_status(bool running)
@@ -79,42 +84,99 @@ static int setup_lttng_msg(struct command_ctx *cmd_ctx,
 {
 	int ret = 0;
 	const size_t header_len = sizeof(struct lttcomm_lttng_msg);
-	const size_t cmd_header_offset = header_len;
-	const size_t payload_offset = cmd_header_offset + cmd_header_len;
 	const size_t total_msg_size = header_len + cmd_header_len + payload_len;
-
-	free(cmd_ctx->llm);
-	cmd_ctx->llm = zmalloc(total_msg_size);
-
-	if (cmd_ctx->llm == NULL) {
-		PERROR("zmalloc");
-		ret = -ENOMEM;
+	const struct lttcomm_lttng_msg llm = {
+		.cmd_type = cmd_ctx->lsm.cmd_type,
+		.pid = cmd_ctx->lsm.domain.attr.pid,
+		.cmd_header_size = cmd_header_len,
+		.data_size = payload_len,
+	};
+
+	ret = lttng_dynamic_buffer_set_size(&cmd_ctx->reply_payload.buffer, 0);
+	if (ret) {
 		goto end;
 	}
 
-	/* Copy common data */
-	cmd_ctx->llm->cmd_type = cmd_ctx->lsm->cmd_type;
-	cmd_ctx->llm->pid = cmd_ctx->lsm->domain.attr.pid;
-	cmd_ctx->llm->cmd_header_size = cmd_header_len;
-	cmd_ctx->llm->data_size = payload_len;
+	lttng_dynamic_pointer_array_clear(&cmd_ctx->reply_payload._fd_handles);
+
 	cmd_ctx->lttng_msg_size = total_msg_size;
 
-	/* Copy command header */
+	/* Append reply header. */
+	ret = lttng_dynamic_buffer_append(
+			&cmd_ctx->reply_payload.buffer, &llm, sizeof(llm));
+	if (ret) {
+		goto end;
+	}
+
+	/* Append command header. */
 	if (cmd_header_len) {
-		memcpy(((uint8_t *) cmd_ctx->llm) + cmd_header_offset, cmd_header_buf,
-			cmd_header_len);
+		ret = lttng_dynamic_buffer_append(
+				&cmd_ctx->reply_payload.buffer, cmd_header_buf,
+				cmd_header_len);
+		if (ret) {
+			goto end;
+		}
 	}
 
-	/* Copy payload */
+	/* Append payload. */
 	if (payload_len) {
-		memcpy(((uint8_t *) cmd_ctx->llm) + payload_offset, payload_buf,
-			payload_len);
+		ret = lttng_dynamic_buffer_append(
+				&cmd_ctx->reply_payload.buffer, payload_buf,
+				payload_len);
+		if (ret) {
+			goto end;
+		}
 	}
 
 end:
 	return ret;
 }
 
+static int setup_empty_lttng_msg(struct command_ctx *cmd_ctx)
+{
+	int ret;
+	const struct lttcomm_lttng_msg llm = {};
+
+	ret = lttng_dynamic_buffer_set_size(&cmd_ctx->reply_payload.buffer, 0);
+	if (ret) {
+		goto end;
+	}
+
+	/* Append place-holder reply header. */
+	ret = lttng_dynamic_buffer_append(
+			&cmd_ctx->reply_payload.buffer, &llm, sizeof(llm));
+	if (ret) {
+		goto end;
+	}
+
+	cmd_ctx->lttng_msg_size = sizeof(llm);
+end:
+	return ret;
+}
+
+static void update_lttng_msg(struct command_ctx *cmd_ctx, size_t cmd_header_len,
+		size_t payload_len)
+{
+	const size_t header_len = sizeof(struct lttcomm_lttng_msg);
+	const size_t total_msg_size = header_len + cmd_header_len + payload_len;
+	const struct lttcomm_lttng_msg llm = {
+		.cmd_type = cmd_ctx->lsm.cmd_type,
+		.pid = cmd_ctx->lsm.domain.attr.pid,
+		.cmd_header_size = cmd_header_len,
+		.data_size = payload_len,
+	};
+	struct lttcomm_lttng_msg *p_llm;
+
+	assert(cmd_ctx->reply_payload.buffer.size >= sizeof(llm));
+
+	p_llm = (typeof(p_llm)) cmd_ctx->reply_payload.buffer.data;
+
+	/* Update existing header. */
+	memcpy(p_llm, &llm, sizeof(llm));
+
+	cmd_ctx->lttng_msg_size = total_msg_size;
+}
+
 /*
  * Start the thread_manage_consumer. This must be done after a lttng-consumerd
  * exec or it will fail.
@@ -189,7 +251,7 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 		case LTTNG_CONSUMER64_UST:
 		{
 			if (config.consumerd64_lib_dir.value) {
-				char *tmp;
+				const char *tmp;
 				size_t tmplen;
 				char *tmpnew;
 
@@ -226,7 +288,7 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 		case LTTNG_CONSUMER32_UST:
 		{
 			if (config.consumerd32_lib_dir.value) {
-				char *tmp;
+				const char *tmp;
 				size_t tmplen;
 				char *tmpnew;
 
@@ -497,6 +559,7 @@ static int create_kernel_session(struct ltt_session *session)
 	session->kernel_session->gid = session->gid;
 	session->kernel_session->output_traces = session->output_traces;
 	session->kernel_session->snapshot_mode = session->snapshot_mode;
+	session->kernel_session->is_live_session = session->live_timer != 0;
 
 	return LTTNG_OK;
 
@@ -537,19 +600,19 @@ static unsigned int lttng_sessions_count(uid_t uid, gid_t gid)
 static int receive_userspace_probe(struct command_ctx *cmd_ctx, int sock,
 		int *sock_error, struct lttng_event *event)
 {
-	int fd, ret;
+	int fd = -1, ret;
 	struct lttng_userspace_probe_location *probe_location;
-	const struct lttng_userspace_probe_location_lookup_method *lookup = NULL;
-	struct lttng_dynamic_buffer probe_location_buffer;
-	struct lttng_buffer_view buffer_view;
+	struct lttng_payload probe_location_payload;
+	struct fd_handle *handle = NULL;
 
 	/*
-	 * Create a buffer to store the serialized version of the probe
+	 * Create a payload to store the serialized version of the probe
 	 * location.
 	 */
-	lttng_dynamic_buffer_init(&probe_location_buffer);
-	ret = lttng_dynamic_buffer_set_size(&probe_location_buffer,
-			cmd_ctx->lsm->u.enable.userspace_probe_location_len);
+	lttng_payload_init(&probe_location_payload);
+
+	ret = lttng_dynamic_buffer_set_size(&probe_location_payload.buffer,
+			cmd_ctx->lsm.u.enable.userspace_probe_location_len);
 	if (ret) {
 		ret = LTTNG_ERR_NOMEM;
 		goto error;
@@ -558,27 +621,11 @@ static int receive_userspace_probe(struct command_ctx *cmd_ctx, int sock,
 	/*
 	 * Receive the probe location.
 	 */
-	ret = lttcomm_recv_unix_sock(sock, probe_location_buffer.data,
-			probe_location_buffer.size);
+	ret = lttcomm_recv_unix_sock(sock, probe_location_payload.buffer.data,
+			probe_location_payload.buffer.size);
 	if (ret <= 0) {
 		DBG("Nothing recv() from client var len data... continuing");
 		*sock_error = 1;
-		lttng_dynamic_buffer_reset(&probe_location_buffer);
-		ret = LTTNG_ERR_PROBE_LOCATION_INVAL;
-		goto error;
-	}
-
-	buffer_view = lttng_buffer_view_from_dynamic_buffer(
-			&probe_location_buffer, 0, probe_location_buffer.size);
-
-	/*
-	 * Extract the probe location from the serialized version.
-	 */
-	ret = lttng_userspace_probe_location_create_from_buffer(
-				&buffer_view, &probe_location);
-	if (ret < 0) {
-		WARN("Failed to create a userspace probe location from the received buffer");
-		lttng_dynamic_buffer_reset( &probe_location_buffer);
 		ret = LTTNG_ERR_PROBE_LOCATION_INVAL;
 		goto error;
 	}
@@ -595,35 +642,35 @@ static int receive_userspace_probe(struct command_ctx *cmd_ctx, int sock,
 		goto error;
 	}
 
-	/*
-	 * Set the file descriptor received from the client through the unix
-	 * socket in the probe location.
-	 */
-	lookup = lttng_userspace_probe_location_get_lookup_method(probe_location);
-	if (!lookup) {
-		ret = LTTNG_ERR_PROBE_LOCATION_INVAL;
+	handle = fd_handle_create(fd);
+	if (!handle) {
+		ret = LTTNG_ERR_NOMEM;
 		goto error;
 	}
 
-	/*
-	 * From the kernel tracer's perspective, all userspace probe event types
-	 * are all the same: a file and an offset.
-	 */
-	switch (lttng_userspace_probe_location_lookup_method_get_type(lookup)) {
-	case LTTNG_USERSPACE_PROBE_LOCATION_LOOKUP_METHOD_TYPE_FUNCTION_ELF:
-		ret = lttng_userspace_probe_location_function_set_binary_fd(
-				probe_location, fd);
-		break;
-	case LTTNG_USERSPACE_PROBE_LOCATION_LOOKUP_METHOD_TYPE_TRACEPOINT_SDT:
-		ret = lttng_userspace_probe_location_tracepoint_set_binary_fd(
-				probe_location, fd);
-		break;
-	default:
-		ret = LTTNG_ERR_PROBE_LOCATION_INVAL;
+	/* Transferred to the handle. */
+	fd = -1;
+
+	ret = lttng_payload_push_fd_handle(&probe_location_payload, handle);
+	if (ret) {
+		ERR("Failed to add userspace probe file descriptor to payload");
+		ret = LTTNG_ERR_NOMEM;
 		goto error;
 	}
 
-	if (ret) {
+	fd_handle_put(handle);
+	handle = NULL;
+
+	{
+		struct lttng_payload_view view = lttng_payload_view_from_payload(
+			&probe_location_payload, 0, -1);
+
+		/* Extract the probe location from the serialized version. */
+		ret = lttng_userspace_probe_location_create_from_payload(
+				&view, &probe_location);
+	}
+	if (ret < 0) {
+		WARN("Failed to create a userspace probe location from the received buffer");
 		ret = LTTNG_ERR_PROBE_LOCATION_INVAL;
 		goto error;
 	}
@@ -635,8 +682,15 @@ static int receive_userspace_probe(struct command_ctx *cmd_ctx, int sock,
 		goto error;
 	}
 
-	lttng_dynamic_buffer_reset(&probe_location_buffer);
 error:
+	if (fd >= 0) {
+		if (close(fd)) {
+			PERROR("Failed to close userspace probe location binary fd");
+		}
+	}
+
+	fd_handle_put(handle);
+	lttng_payload_reset(&probe_location_payload);
 	return ret;
 }
 
@@ -649,24 +703,6 @@ static int setup_lttng_msg_no_cmd_header(struct command_ctx *cmd_ctx,
 	return setup_lttng_msg(cmd_ctx, payload_buf, payload_len, NULL, 0);
 }
 
-/*
- * Free memory of a command context structure.
- */
-static void clean_command_ctx(struct command_ctx **cmd_ctx)
-{
-	DBG("Clean command context structure");
-	if (*cmd_ctx) {
-		if ((*cmd_ctx)->llm) {
-			free((*cmd_ctx)->llm);
-		}
-		if ((*cmd_ctx)->lsm) {
-			free((*cmd_ctx)->lsm);
-		}
-		free(*cmd_ctx);
-		*cmd_ctx = NULL;
-	}
-}
-
 /*
  * Check if the current kernel tracer supports the session rotation feature.
  * Return 1 if it does, 0 otherwise.
@@ -688,14 +724,32 @@ static int check_rotate_compatible(void)
  *
  * Return lttcomm error code.
  */
-static int send_unix_sock(int sock, void *buf, size_t len)
+static int send_unix_sock(int sock, struct lttng_payload_view *view)
 {
+	int ret;
+	const int fd_count = lttng_payload_view_get_fd_handle_count(view);
+
 	/* Check valid length */
-	if (len == 0) {
-		return -1;
+	if (view->buffer.size == 0) {
+		ret = -1;
+		goto end;
+	}
+
+	ret = lttcomm_send_unix_sock(
+			sock, view->buffer.data, view->buffer.size);
+	if (ret < 0) {
+		goto end;
 	}
 
-	return lttcomm_send_unix_sock(sock, buf, len);
+	if (fd_count > 0) {
+		ret = lttcomm_send_payload_view_fds_unix_sock(sock, view);
+		if (ret < 0) {
+			goto end;
+		}
+	}
+
+end:
+	return ret;
 }
 
 /*
@@ -718,13 +772,13 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 	int need_tracing_session = 1;
 	int need_domain;
 
-	DBG("Processing client command %d", cmd_ctx->lsm->cmd_type);
+	DBG("Processing client command %d", cmd_ctx->lsm.cmd_type);
 
 	assert(!rcu_read_ongoing());
 
 	*sock_error = 0;
 
-	switch (cmd_ctx->lsm->cmd_type) {
+	switch (cmd_ctx->lsm.cmd_type) {
 	case LTTNG_CREATE_SESSION_EXT:
 	case LTTNG_DESTROY_SESSION:
 	case LTTNG_LIST_SESSIONS:
@@ -746,6 +800,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 	case LTTNG_ROTATION_GET_INFO:
 	case LTTNG_ROTATION_SET_SCHEDULE:
 	case LTTNG_SESSION_LIST_ROTATION_SCHEDULES:
+	case LTTNG_CLEAR_SESSION:
 		need_domain = 0;
 		break;
 	default:
@@ -753,7 +808,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 	}
 
 	if (config.no_kernel && need_domain
-			&& cmd_ctx->lsm->domain.type == LTTNG_DOMAIN_KERNEL) {
+			&& cmd_ctx->lsm.domain.type == LTTNG_DOMAIN_KERNEL) {
 		if (!is_root) {
 			ret = LTTNG_ERR_NEED_ROOT_SESSIOND;
 		} else {
@@ -763,7 +818,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 	}
 
 	/* Deny register consumer if we already have a spawned consumer. */
-	if (cmd_ctx->lsm->cmd_type == LTTNG_REGISTER_CONSUMER) {
+	if (cmd_ctx->lsm.cmd_type == LTTNG_REGISTER_CONSUMER) {
 		pthread_mutex_lock(&kconsumer_data.pid_mutex);
 		if (kconsumer_data.pid > 0) {
 			ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
@@ -778,7 +833,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 	 * this here so we don't have to make the call for no payload at each
 	 * command.
 	 */
-	switch(cmd_ctx->lsm->cmd_type) {
+	switch(cmd_ctx->lsm.cmd_type) {
 	case LTTNG_LIST_SESSIONS:
 	case LTTNG_LIST_TRACEPOINTS:
 	case LTTNG_LIST_TRACEPOINT_FIELDS:
@@ -786,11 +841,12 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 	case LTTNG_LIST_CHANNELS:
 	case LTTNG_LIST_EVENTS:
 	case LTTNG_LIST_SYSCALLS:
-	case LTTNG_LIST_TRACKER_PIDS:
+	case LTTNG_SESSION_LIST_ROTATION_SCHEDULES:
+	case LTTNG_PROCESS_ATTR_TRACKER_GET_POLICY:
+	case LTTNG_PROCESS_ATTR_TRACKER_GET_INCLUSION_SET:
 	case LTTNG_DATA_PENDING:
 	case LTTNG_ROTATE_SESSION:
 	case LTTNG_ROTATION_GET_INFO:
-	case LTTNG_SESSION_LIST_ROTATION_SCHEDULES:
 		break;
 	default:
 		/* Setup lttng message with no payload */
@@ -802,7 +858,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 	}
 
 	/* Commands that DO NOT need a session. */
-	switch (cmd_ctx->lsm->cmd_type) {
+	switch (cmd_ctx->lsm.cmd_type) {
 	case LTTNG_CREATE_SESSION_EXT:
 	case LTTNG_LIST_SESSIONS:
 	case LTTNG_LIST_TRACEPOINTS:
@@ -814,14 +870,14 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 		need_tracing_session = 0;
 		break;
 	default:
-		DBG("Getting session %s by name", cmd_ctx->lsm->session.name);
+		DBG("Getting session %s by name", cmd_ctx->lsm.session.name);
 		/*
 		 * We keep the session list lock across _all_ commands
 		 * for now, because the per-session lock does not
 		 * handle teardown properly.
 		 */
 		session_lock_list();
-		cmd_ctx->session = session_find_by_name(cmd_ctx->lsm->session.name);
+		cmd_ctx->session = session_find_by_name(cmd_ctx->lsm.session.name);
 		if (cmd_ctx->session == NULL) {
 			ret = LTTNG_ERR_SESS_NOT_FOUND;
 			goto error;
@@ -838,10 +894,10 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 	 * handled, process that right before so we save some round trip in useless
 	 * code path.
 	 */
-	switch (cmd_ctx->lsm->cmd_type) {
+	switch (cmd_ctx->lsm.cmd_type) {
 	case LTTNG_DISABLE_CHANNEL:
 	case LTTNG_DISABLE_EVENT:
-		switch (cmd_ctx->lsm->domain.type) {
+		switch (cmd_ctx->lsm.domain.type) {
 		case LTTNG_DOMAIN_KERNEL:
 			if (!cmd_ctx->session->kernel_session) {
 				ret = LTTNG_ERR_NO_CHANNEL;
@@ -872,7 +928,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 	/*
 	 * Check domain type for specific "pre-action".
 	 */
-	switch (cmd_ctx->lsm->domain.type) {
+	switch (cmd_ctx->lsm.domain.type) {
 	case LTTNG_DOMAIN_KERNEL:
 		if (!is_root) {
 			ret = LTTNG_ERR_NEED_ROOT_SESSIOND;
@@ -907,7 +963,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 			/* Start the kernel consumer daemon */
 			pthread_mutex_lock(&kconsumer_data.pid_mutex);
 			if (kconsumer_data.pid == 0 &&
-					cmd_ctx->lsm->cmd_type != LTTNG_REGISTER_CONSUMER) {
+					cmd_ctx->lsm.cmd_type != LTTNG_REGISTER_CONSUMER) {
 				pthread_mutex_unlock(&kconsumer_data.pid_mutex);
 				ret = start_consumerd(&kconsumer_data);
 				if (ret < 0) {
@@ -950,7 +1006,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 			/* Create UST session if none exist. */
 			if (cmd_ctx->session->ust_session == NULL) {
 				ret = create_ust_session(cmd_ctx->session,
-						ALIGNED_CONST_PTR(cmd_ctx->lsm->domain));
+						ALIGNED_CONST_PTR(cmd_ctx->lsm.domain));
 				if (ret != LTTNG_OK) {
 					goto error;
 				}
@@ -961,7 +1017,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 			pthread_mutex_lock(&ustconsumer64_data.pid_mutex);
 			if (config.consumerd64_bin_path.value &&
 					ustconsumer64_data.pid == 0 &&
-					cmd_ctx->lsm->cmd_type != LTTNG_REGISTER_CONSUMER) {
+					cmd_ctx->lsm.cmd_type != LTTNG_REGISTER_CONSUMER) {
 				pthread_mutex_unlock(&ustconsumer64_data.pid_mutex);
 				ret = start_consumerd(&ustconsumer64_data);
 				if (ret < 0) {
@@ -990,7 +1046,7 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 			pthread_mutex_lock(&ustconsumer32_data.pid_mutex);
 			if (config.consumerd32_bin_path.value &&
 					ustconsumer32_data.pid == 0 &&
-					cmd_ctx->lsm->cmd_type != LTTNG_REGISTER_CONSUMER) {
+					cmd_ctx->lsm.cmd_type != LTTNG_REGISTER_CONSUMER) {
 				pthread_mutex_unlock(&ustconsumer32_data.pid_mutex);
 				ret = start_consumerd(&ustconsumer32_data);
 				if (ret < 0) {
@@ -1023,9 +1079,9 @@ static int process_client_msg(struct command_ctx *cmd_ctx, int *sock,
 skip_domain:
 
 	/* Validate consumer daemon state when start/stop trace command */
-	if (cmd_ctx->lsm->cmd_type == LTTNG_START_TRACE ||
-			cmd_ctx->lsm->cmd_type == LTTNG_STOP_TRACE) {
-		switch (cmd_ctx->lsm->domain.type) {
+	if (cmd_ctx->lsm.cmd_type == LTTNG_START_TRACE ||
+			cmd_ctx->lsm.cmd_type == LTTNG_STOP_TRACE) {
+		switch (cmd_ctx->lsm.domain.type) {
 		case LTTNG_DOMAIN_NONE:
 			break;
 		case LTTNG_DOMAIN_JUL:
@@ -1079,20 +1135,20 @@ skip_domain:
 	}
 
 	/* Process by command type */
-	switch (cmd_ctx->lsm->cmd_type) {
+	switch (cmd_ctx->lsm.cmd_type) {
 	case LTTNG_ADD_CONTEXT:
 	{
 		/*
 		 * An LTTNG_ADD_CONTEXT command might have a supplementary
 		 * payload if the context being added is an application context.
 		 */
-		if (cmd_ctx->lsm->u.context.ctx.ctx ==
+		if (cmd_ctx->lsm.u.context.ctx.ctx ==
 				LTTNG_EVENT_CONTEXT_APP_CONTEXT) {
 			char *provider_name = NULL, *context_name = NULL;
 			size_t provider_name_len =
-					cmd_ctx->lsm->u.context.provider_name_len;
+					cmd_ctx->lsm.u.context.provider_name_len;
 			size_t context_name_len =
-					cmd_ctx->lsm->u.context.context_name_len;
+					cmd_ctx->lsm.u.context.context_name_len;
 
 			if (provider_name_len == 0 || context_name_len == 0) {
 				/*
@@ -1108,7 +1164,7 @@ skip_domain:
 				ret = -LTTNG_ERR_NOMEM;
 				goto error;
 			}
-			cmd_ctx->lsm->u.context.ctx.u.app_ctx.provider_name =
+			cmd_ctx->lsm.u.context.ctx.u.app_ctx.provider_name =
 					provider_name;
 
 			context_name = zmalloc(context_name_len + 1);
@@ -1116,7 +1172,7 @@ skip_domain:
 				ret = -LTTNG_ERR_NOMEM;
 				goto error_add_context;
 			}
-			cmd_ctx->lsm->u.context.ctx.u.app_ctx.ctx_name =
+			cmd_ctx->lsm.u.context.ctx.u.app_ctx.ctx_name =
 					context_name;
 
 			ret = lttcomm_recv_unix_sock(*sock, provider_name,
@@ -1137,16 +1193,16 @@ skip_domain:
 		 * names.
 		 */
 		ret = cmd_add_context(cmd_ctx->session,
-				cmd_ctx->lsm->domain.type,
-				cmd_ctx->lsm->u.context.channel_name,
-				ALIGNED_CONST_PTR(cmd_ctx->lsm->u.context.ctx),
+				cmd_ctx->lsm.domain.type,
+				cmd_ctx->lsm.u.context.channel_name,
+				ALIGNED_CONST_PTR(cmd_ctx->lsm.u.context.ctx),
 				kernel_poll_pipe[1]);
 
-		cmd_ctx->lsm->u.context.ctx.u.app_ctx.provider_name = NULL;
-		cmd_ctx->lsm->u.context.ctx.u.app_ctx.ctx_name = NULL;
+		cmd_ctx->lsm.u.context.ctx.u.app_ctx.provider_name = NULL;
+		cmd_ctx->lsm.u.context.ctx.u.app_ctx.ctx_name = NULL;
 error_add_context:
-		free(cmd_ctx->lsm->u.context.ctx.u.app_ctx.provider_name);
-		free(cmd_ctx->lsm->u.context.ctx.u.app_ctx.ctx_name);
+		free(cmd_ctx->lsm.u.context.ctx.u.app_ctx.provider_name);
+		free(cmd_ctx->lsm.u.context.ctx.u.app_ctx.ctx_name);
 		if (ret < 0) {
 			goto error;
 		}
@@ -1154,8 +1210,8 @@ error_add_context:
 	}
 	case LTTNG_DISABLE_CHANNEL:
 	{
-		ret = cmd_disable_channel(cmd_ctx->session, cmd_ctx->lsm->domain.type,
-				cmd_ctx->lsm->u.disable.channel_name);
+		ret = cmd_disable_channel(cmd_ctx->session, cmd_ctx->lsm.domain.type,
+				cmd_ctx->lsm.u.disable.channel_name);
 		break;
 	}
 	case LTTNG_DISABLE_EVENT:
@@ -1170,8 +1226,8 @@ error_add_context:
 		 * the filter payload and encounter an error because the session
 		 * daemon closes the socket without ever handling this data.
 		 */
-		size_t count = cmd_ctx->lsm->u.disable.expression_len +
-			cmd_ctx->lsm->u.disable.bytecode_len;
+		size_t count = cmd_ctx->lsm.u.disable.expression_len +
+			cmd_ctx->lsm.u.disable.bytecode_len;
 
 		if (count) {
 			char data[LTTNG_FILTER_MAX_LEN];
@@ -1187,33 +1243,204 @@ error_add_context:
 				count -= (size_t) ret;
 			}
 		}
-		ret = cmd_disable_event(cmd_ctx->session, cmd_ctx->lsm->domain.type,
-				cmd_ctx->lsm->u.disable.channel_name,
-				ALIGNED_CONST_PTR(cmd_ctx->lsm->u.disable.event));
+		ret = cmd_disable_event(cmd_ctx->session, cmd_ctx->lsm.domain.type,
+				cmd_ctx->lsm.u.disable.channel_name,
+				ALIGNED_CONST_PTR(cmd_ctx->lsm.u.disable.event));
 		break;
 	}
 	case LTTNG_ENABLE_CHANNEL:
 	{
-		cmd_ctx->lsm->u.channel.chan.attr.extended.ptr =
-				(struct lttng_channel_extended *) &cmd_ctx->lsm->u.channel.extended;
+		cmd_ctx->lsm.u.channel.chan.attr.extended.ptr =
+				(struct lttng_channel_extended *) &cmd_ctx->lsm.u.channel.extended;
 		ret = cmd_enable_channel(cmd_ctx->session,
-				ALIGNED_CONST_PTR(cmd_ctx->lsm->domain),
-				ALIGNED_CONST_PTR(cmd_ctx->lsm->u.channel.chan),
+				ALIGNED_CONST_PTR(cmd_ctx->lsm.domain),
+				ALIGNED_CONST_PTR(cmd_ctx->lsm.u.channel.chan),
 				kernel_poll_pipe[1]);
 		break;
 	}
-	case LTTNG_TRACK_PID:
+	case LTTNG_PROCESS_ATTR_TRACKER_ADD_INCLUDE_VALUE:
+	case LTTNG_PROCESS_ATTR_TRACKER_REMOVE_INCLUDE_VALUE:
+	{
+		struct lttng_dynamic_buffer payload;
+		struct lttng_buffer_view payload_view;
+		const bool add_value =
+				cmd_ctx->lsm.cmd_type ==
+				LTTNG_PROCESS_ATTR_TRACKER_ADD_INCLUDE_VALUE;
+		const size_t name_len =
+				cmd_ctx->lsm.u.process_attr_tracker_add_remove_include_value
+						.name_len;
+		const enum lttng_domain_type domain_type =
+				(enum lttng_domain_type)
+						cmd_ctx->lsm.domain.type;
+		const enum lttng_process_attr process_attr =
+				(enum lttng_process_attr) cmd_ctx->lsm.u
+						.process_attr_tracker_add_remove_include_value
+						.process_attr;
+		const enum lttng_process_attr_value_type value_type =
+				(enum lttng_process_attr_value_type) cmd_ctx
+						->lsm.u
+						.process_attr_tracker_add_remove_include_value
+						.value_type;
+		struct process_attr_value *value;
+		enum lttng_error_code ret_code;
+
+		/* Receive remaining variable length payload if applicable. */
+		if (name_len > LOGIN_NAME_MAX) {
+			/*
+			 * POSIX mandates user and group names that are at least
+			 * 8 characters long. Note that although shadow-utils
+			 * (useradd, groupaadd, etc.) use 32 chars as their
+			 * limit (from bits/utmp.h, UT_NAMESIZE),
+			 * LOGIN_NAME_MAX is defined to 256.
+			 */
+			ERR("Rejecting process attribute tracker value %s as the provided exceeds the maximal allowed length: argument length = %zu, maximal length = %d",
+					add_value ? "addition" : "removal",
+					name_len, LOGIN_NAME_MAX);
+			ret = LTTNG_ERR_INVALID;
+			goto error;
+		}
+
+		lttng_dynamic_buffer_init(&payload);
+		if (name_len != 0) {
+			/*
+			 * Receive variable payload for user/group name
+			 * arguments.
+			 */
+			ret = lttng_dynamic_buffer_set_size(&payload, name_len);
+			if (ret) {
+				ERR("Failed to allocate buffer to receive payload of %s process attribute tracker value argument",
+						add_value ? "add" : "remove");
+				ret = LTTNG_ERR_NOMEM;
+				goto error_add_remove_tracker_value;
+			}
+
+			ret = lttcomm_recv_unix_sock(
+					*sock, payload.data, name_len);
+			if (ret <= 0) {
+				ERR("Failed to receive payload of %s process attribute tracker value argument",
+						add_value ? "add" : "remove");
+				*sock_error = 1;
+				ret = LTTNG_ERR_INVALID_PROTOCOL;
+				goto error_add_remove_tracker_value;
+			}
+		}
+
+		payload_view = lttng_buffer_view_from_dynamic_buffer(
+				&payload, 0, name_len);
+		/*
+		 * Validate the value type and domains are legal for the process
+		 * attribute tracker that is specified and convert the value to
+		 * add/remove to the internal sessiond representation.
+		 */
+		ret_code = process_attr_value_from_comm(domain_type,
+				process_attr, value_type,
+				&cmd_ctx->lsm.u.process_attr_tracker_add_remove_include_value
+						 .integral_value,
+				&payload_view, &value);
+		if (ret_code != LTTNG_OK) {
+			ret = ret_code;
+			goto error_add_remove_tracker_value;
+		}
+
+		if (add_value) {
+			ret = cmd_process_attr_tracker_inclusion_set_add_value(
+					cmd_ctx->session, domain_type,
+					process_attr, value);
+		} else {
+			ret = cmd_process_attr_tracker_inclusion_set_remove_value(
+					cmd_ctx->session, domain_type,
+					process_attr, value);
+		}
+		process_attr_value_destroy(value);
+	error_add_remove_tracker_value:
+		lttng_dynamic_buffer_reset(&payload);
+		break;
+	}
+	case LTTNG_PROCESS_ATTR_TRACKER_GET_POLICY:
 	{
-		ret = cmd_track_pid(cmd_ctx->session,
-				cmd_ctx->lsm->domain.type,
-				cmd_ctx->lsm->u.pid_tracker.pid);
+		enum lttng_tracking_policy tracking_policy;
+		const enum lttng_domain_type domain_type =
+				(enum lttng_domain_type)
+						cmd_ctx->lsm.domain.type;
+		const enum lttng_process_attr process_attr =
+				(enum lttng_process_attr) cmd_ctx->lsm.u
+						.process_attr_tracker_get_tracking_policy
+						.process_attr;
+
+		ret = cmd_process_attr_tracker_get_tracking_policy(
+				cmd_ctx->session, domain_type, process_attr,
+				&tracking_policy);
+		if (ret != LTTNG_OK) {
+			goto error;
+		}
+
+		ret = setup_lttng_msg_no_cmd_header(cmd_ctx,
+				&(uint32_t){tracking_policy}, sizeof(uint32_t));
+		if (ret < 0) {
+			ret = LTTNG_ERR_NOMEM;
+			goto error;
+		}
+		ret = LTTNG_OK;
+		break;
+	}
+	case LTTNG_PROCESS_ATTR_TRACKER_SET_POLICY:
+	{
+		const enum lttng_tracking_policy tracking_policy =
+				(enum lttng_tracking_policy) cmd_ctx->lsm.u
+						.process_attr_tracker_set_tracking_policy
+						.tracking_policy;
+		const enum lttng_domain_type domain_type =
+				(enum lttng_domain_type)
+						cmd_ctx->lsm.domain.type;
+		const enum lttng_process_attr process_attr =
+				(enum lttng_process_attr) cmd_ctx->lsm.u
+						.process_attr_tracker_set_tracking_policy
+						.process_attr;
+
+		ret = cmd_process_attr_tracker_set_tracking_policy(
+				cmd_ctx->session, domain_type, process_attr,
+				tracking_policy);
+		if (ret != LTTNG_OK) {
+			goto error;
+		}
 		break;
 	}
-	case LTTNG_UNTRACK_PID:
+	case LTTNG_PROCESS_ATTR_TRACKER_GET_INCLUSION_SET:
 	{
-		ret = cmd_untrack_pid(cmd_ctx->session,
-				cmd_ctx->lsm->domain.type,
-				cmd_ctx->lsm->u.pid_tracker.pid);
+		struct lttng_process_attr_values *values;
+		struct lttng_dynamic_buffer reply;
+		const enum lttng_domain_type domain_type =
+				(enum lttng_domain_type)
+						cmd_ctx->lsm.domain.type;
+		const enum lttng_process_attr process_attr =
+				(enum lttng_process_attr) cmd_ctx->lsm.u
+						.process_attr_tracker_get_inclusion_set
+						.process_attr;
+
+		ret = cmd_process_attr_tracker_get_inclusion_set(
+				cmd_ctx->session, domain_type, process_attr,
+				&values);
+		if (ret != LTTNG_OK) {
+			goto error;
+		}
+
+		lttng_dynamic_buffer_init(&reply);
+		ret = lttng_process_attr_values_serialize(values, &reply);
+		if (ret < 0) {
+			goto error_tracker_get_inclusion_set;
+		}
+
+		ret = setup_lttng_msg_no_cmd_header(
+				cmd_ctx, reply.data, reply.size);
+		if (ret < 0) {
+			ret = LTTNG_ERR_NOMEM;
+			goto error_tracker_get_inclusion_set;
+		}
+		ret = LTTNG_OK;
+
+	error_tracker_get_inclusion_set:
+		lttng_process_attr_values_destroy(values);
+		lttng_dynamic_buffer_reset(&reply);
 		break;
 	}
 	case LTTNG_ENABLE_EVENT:
@@ -1224,8 +1451,8 @@ error_add_context:
 		char *filter_expression = NULL;
 
 		/* Handle exclusion events and receive it from the client. */
-		if (cmd_ctx->lsm->u.enable.exclusion_count > 0) {
-			size_t count = cmd_ctx->lsm->u.enable.exclusion_count;
+		if (cmd_ctx->lsm.u.enable.exclusion_count > 0) {
+			size_t count = cmd_ctx->lsm.u.enable.exclusion_count;
 
 			exclusion = zmalloc(sizeof(struct lttng_event_exclusion) +
 					(count * LTTNG_SYMBOL_NAME_LEN));
@@ -1248,9 +1475,9 @@ error_add_context:
 		}
 
 		/* Get filter expression from client. */
-		if (cmd_ctx->lsm->u.enable.expression_len > 0) {
+		if (cmd_ctx->lsm.u.enable.expression_len > 0) {
 			size_t expression_len =
-				cmd_ctx->lsm->u.enable.expression_len;
+				cmd_ctx->lsm.u.enable.expression_len;
 
 			if (expression_len > LTTNG_FILTER_MAX_LEN) {
 				ret = LTTNG_ERR_FILTER_INVAL;
@@ -1280,8 +1507,8 @@ error_add_context:
 		}
 
 		/* Handle filter and get bytecode from client. */
-		if (cmd_ctx->lsm->u.enable.bytecode_len > 0) {
-			size_t bytecode_len = cmd_ctx->lsm->u.enable.bytecode_len;
+		if (cmd_ctx->lsm.u.enable.bytecode_len > 0) {
+			size_t bytecode_len = cmd_ctx->lsm.u.enable.bytecode_len;
 
 			if (bytecode_len > LTTNG_FILTER_MAX_LEN) {
 				ret = LTTNG_ERR_FILTER_INVAL;
@@ -1320,10 +1547,10 @@ error_add_context:
 			}
 		}
 
-		ev = lttng_event_copy(ALIGNED_CONST_PTR(cmd_ctx->lsm->u.enable.event));
+		ev = lttng_event_copy(ALIGNED_CONST_PTR(cmd_ctx->lsm.u.enable.event));
 		if (!ev) {
 			DBG("Failed to copy event: %s",
-					cmd_ctx->lsm->u.enable.event.name);
+					cmd_ctx->lsm.u.enable.event.name);
 			free(filter_expression);
 			free(bytecode);
 			free(exclusion);
@@ -1332,7 +1559,7 @@ error_add_context:
 		}
 
 
-		if (cmd_ctx->lsm->u.enable.userspace_probe_location_len > 0) {
+		if (cmd_ctx->lsm.u.enable.userspace_probe_location_len > 0) {
 			/* Expect a userspace probe description. */
 			ret = receive_userspace_probe(cmd_ctx, *sock, sock_error, ev);
 			if (ret) {
@@ -1345,8 +1572,8 @@ error_add_context:
 		}
 
 		ret = cmd_enable_event(cmd_ctx->session,
-				ALIGNED_CONST_PTR(cmd_ctx->lsm->domain),
-				cmd_ctx->lsm->u.enable.channel_name,
+				ALIGNED_CONST_PTR(cmd_ctx->lsm.domain),
+				cmd_ctx->lsm.u.enable.channel_name,
 				ev,
 				filter_expression, bytecode, exclusion,
 				kernel_poll_pipe[1]);
@@ -1359,7 +1586,7 @@ error_add_context:
 		ssize_t nb_events;
 
 		session_lock_list();
-		nb_events = cmd_list_tracepoints(cmd_ctx->lsm->domain.type, &events);
+		nb_events = cmd_list_tracepoints(cmd_ctx->lsm.domain.type, &events);
 		session_unlock_list();
 		if (nb_events < 0) {
 			/* Return value is a negative lttng_error_code. */
@@ -1388,7 +1615,7 @@ error_add_context:
 		ssize_t nb_fields;
 
 		session_lock_list();
-		nb_fields = cmd_list_tracepoint_fields(cmd_ctx->lsm->domain.type,
+		nb_fields = cmd_list_tracepoint_fields(cmd_ctx->lsm.domain.type,
 				&fields);
 		session_unlock_list();
 		if (nb_fields < 0) {
@@ -1439,40 +1666,12 @@ error_add_context:
 		ret = LTTNG_OK;
 		break;
 	}
-	case LTTNG_LIST_TRACKER_PIDS:
-	{
-		int32_t *pids = NULL;
-		ssize_t nr_pids;
-
-		nr_pids = cmd_list_tracker_pids(cmd_ctx->session,
-				cmd_ctx->lsm->domain.type, &pids);
-		if (nr_pids < 0) {
-			/* Return value is a negative lttng_error_code. */
-			ret = -nr_pids;
-			goto error;
-		}
-
-		/*
-		 * Setup lttng message with payload size set to the event list size in
-		 * bytes and then copy list into the llm payload.
-		 */
-		ret = setup_lttng_msg_no_cmd_header(cmd_ctx, pids,
-			sizeof(int32_t) * nr_pids);
-		free(pids);
-
-		if (ret < 0) {
-			goto setup_error;
-		}
-
-		ret = LTTNG_OK;
-		break;
-	}
 	case LTTNG_SET_CONSUMER_URI:
 	{
 		size_t nb_uri, len;
 		struct lttng_uri *uris;
 
-		nb_uri = cmd_ctx->lsm->u.uri.size;
+		nb_uri = cmd_ctx->lsm.u.uri.size;
 		len = nb_uri * sizeof(struct lttng_uri);
 
 		if (nb_uri == 0) {
@@ -1565,7 +1764,7 @@ error_add_context:
 		ssize_t payload_size;
 		struct lttng_channel *channels = NULL;
 
-		payload_size = cmd_list_channels(cmd_ctx->lsm->domain.type,
+		payload_size = cmd_list_channels(cmd_ctx->lsm.domain.type,
 				cmd_ctx->session, &channels);
 		if (payload_size < 0) {
 			/* Return value is a negative lttng_error_code. */
@@ -1586,32 +1785,34 @@ error_add_context:
 	}
 	case LTTNG_LIST_EVENTS:
 	{
-		ssize_t nb_event;
-		struct lttng_event *events = NULL;
-		struct lttcomm_event_command_header cmd_header;
-		size_t total_size;
-
-		memset(&cmd_header, 0, sizeof(cmd_header));
-		/* Extended infos are included at the end of events */
-		nb_event = cmd_list_events(cmd_ctx->lsm->domain.type,
-			cmd_ctx->session, cmd_ctx->lsm->u.list.channel_name,
-			&events, &total_size);
-
-		if (nb_event < 0) {
-			/* Return value is a negative lttng_error_code. */
-			ret = -nb_event;
-			goto error;
+		ssize_t list_ret;
+		struct lttcomm_event_command_header cmd_header = {};
+		size_t original_payload_size;
+		size_t payload_size;
+
+		ret = setup_empty_lttng_msg(cmd_ctx);
+		if (ret) {
+			ret = LTTNG_ERR_NOMEM;
+			goto setup_error;
 		}
 
-		cmd_header.nb_events = nb_event;
-		ret = setup_lttng_msg(cmd_ctx, events, total_size,
-			&cmd_header, sizeof(cmd_header));
-		free(events);
+		original_payload_size = cmd_ctx->reply_payload.buffer.size;
 
-		if (ret < 0) {
-			goto setup_error;
+		/* Extended infos are included at the end of the payload. */
+		list_ret = cmd_list_events(cmd_ctx->lsm.domain.type,
+				cmd_ctx->session,
+				cmd_ctx->lsm.u.list.channel_name,
+				&cmd_ctx->reply_payload);
+		if (list_ret < 0) {
+			/* Return value is a negative lttng_error_code. */
+			ret = -list_ret;
+			goto error;
 		}
 
+		payload_size = cmd_ctx->reply_payload.buffer.size -
+				sizeof(cmd_header) - original_payload_size;
+		update_lttng_msg(cmd_ctx, sizeof(cmd_header), payload_size);
+
 		ret = LTTNG_OK;
 		break;
 	}
@@ -1656,7 +1857,7 @@ error_add_context:
 	{
 		struct consumer_data *cdata;
 
-		switch (cmd_ctx->lsm->domain.type) {
+		switch (cmd_ctx->lsm.domain.type) {
 		case LTTNG_DOMAIN_KERNEL:
 			cdata = &kconsumer_data;
 			break;
@@ -1665,8 +1866,8 @@ error_add_context:
 			goto error;
 		}
 
-		ret = cmd_register_consumer(cmd_ctx->session, cmd_ctx->lsm->domain.type,
-				cmd_ctx->lsm->u.reg.path, cdata);
+		ret = cmd_register_consumer(cmd_ctx->session, cmd_ctx->lsm.domain.type,
+				cmd_ctx->lsm.u.reg.path, cdata);
 		break;
 	}
 	case LTTNG_DATA_PENDING:
@@ -1717,7 +1918,7 @@ error_add_context:
 		struct lttcomm_lttng_output_id reply;
 
 		ret = cmd_snapshot_add_output(cmd_ctx->session,
-				ALIGNED_CONST_PTR(cmd_ctx->lsm->u.snapshot_output.output),
+				ALIGNED_CONST_PTR(cmd_ctx->lsm.u.snapshot_output.output),
 				&snapshot_id);
 		if (ret != LTTNG_OK) {
 			goto error;
@@ -1737,7 +1938,7 @@ error_add_context:
 	case LTTNG_SNAPSHOT_DEL_OUTPUT:
 	{
 		ret = cmd_snapshot_del_output(cmd_ctx->session,
-				ALIGNED_CONST_PTR(cmd_ctx->lsm->u.snapshot_output.output));
+				ALIGNED_CONST_PTR(cmd_ctx->lsm.u.snapshot_output.output));
 		break;
 	}
 	case LTTNG_SNAPSHOT_LIST_OUTPUT:
@@ -1766,8 +1967,8 @@ error_add_context:
 	case LTTNG_SNAPSHOT_RECORD:
 	{
 		ret = cmd_snapshot_record(cmd_ctx->session,
-				ALIGNED_CONST_PTR(cmd_ctx->lsm->u.snapshot_record.output),
-				cmd_ctx->lsm->u.snapshot_record.wait);
+				ALIGNED_CONST_PTR(cmd_ctx->lsm.u.snapshot_record.output),
+				cmd_ctx->lsm.u.snapshot_record.wait);
 		break;
 	}
 	case LTTNG_CREATE_SESSION_EXT:
@@ -1803,14 +2004,14 @@ error_add_context:
 	}
 	case LTTNG_SAVE_SESSION:
 	{
-		ret = cmd_save_sessions(&cmd_ctx->lsm->u.save_session.attr,
+		ret = cmd_save_sessions(&cmd_ctx->lsm.u.save_session.attr,
 			&cmd_ctx->creds);
 		break;
 	}
 	case LTTNG_SET_SESSION_SHM_PATH:
 	{
 		ret = cmd_set_session_shm_path(cmd_ctx->session,
-				cmd_ctx->lsm->u.set_shm_path.shm_path);
+				cmd_ctx->lsm.u.set_shm_path.shm_path);
 		break;
 	}
 	case LTTNG_REGENERATE_METADATA:
@@ -1849,7 +2050,8 @@ error_add_context:
 		}
 
 		ret = cmd_rotate_session(cmd_ctx->session, &rotate_return,
-				false);
+			false,
+			LTTNG_TRACE_CHUNK_COMMAND_TYPE_MOVE_TO_COMPLETED);
 		if (ret < 0) {
 			ret = -ret;
 			goto error;
@@ -1871,7 +2073,7 @@ error_add_context:
 
 		memset(&get_info_return, 0, sizeof(get_info_return));
 		ret = cmd_rotate_get_info(cmd_ctx->session, &get_info_return,
-				cmd_ctx->lsm->u.get_rotation_info.rotation_id);
+				cmd_ctx->lsm.u.get_rotation_info.rotation_id);
 		if (ret < 0) {
 			ret = -ret;
 			goto error;
@@ -1899,9 +2101,9 @@ error_add_context:
 			goto error;
 		}
 
-		set_schedule = cmd_ctx->lsm->u.rotation_set_schedule.set == 1;
-		schedule_type = (enum lttng_rotation_schedule_type) cmd_ctx->lsm->u.rotation_set_schedule.type;
-		value = cmd_ctx->lsm->u.rotation_set_schedule.value;
+		set_schedule = cmd_ctx->lsm.u.rotation_set_schedule.set == 1;
+		schedule_type = (enum lttng_rotation_schedule_type) cmd_ctx->lsm.u.rotation_set_schedule.type;
+		value = cmd_ctx->lsm.u.rotation_set_schedule.value;
 
 		ret = cmd_rotation_set_schedule(cmd_ctx->session,
 				set_schedule,
@@ -1933,20 +2135,25 @@ error_add_context:
 		ret = LTTNG_OK;
 		break;
 	}
+	case LTTNG_CLEAR_SESSION:
+	{
+		ret = cmd_clear_session(cmd_ctx->session, sock);
+		break;
+	}
 	default:
 		ret = LTTNG_ERR_UND;
 		break;
 	}
 
 error:
-	if (cmd_ctx->llm == NULL) {
-		DBG("Missing llm structure. Allocating one.");
+	if (cmd_ctx->reply_payload.buffer.size == 0) {
+		DBG("Missing llm header, creating one.");
 		if (setup_lttng_msg_no_cmd_header(cmd_ctx, NULL, 0) < 0) {
 			goto setup_error;
 		}
 	}
 	/* Set return code */
-	cmd_ctx->llm->ret_code = ret;
+	((struct lttcomm_lttng_msg *) (cmd_ctx->reply_payload.buffer.data))->ret_code = ret;
 setup_error:
 	if (cmd_ctx->session) {
 		session_unlock(cmd_ctx->session);
@@ -2020,21 +2227,19 @@ static void *thread_manage_clients(void *data)
 	int sock = -1, ret, i, pollfd, err = -1;
 	int sock_error;
 	uint32_t revents, nb_fd;
-	struct command_ctx *cmd_ctx = NULL;
 	struct lttng_poll_event events;
-	int client_sock = -1;
+	const int client_sock = thread_state.client_sock;
 	struct lttng_pipe *quit_pipe = data;
 	const int thread_quit_pipe_fd = lttng_pipe_get_readfd(quit_pipe);
+	struct command_ctx cmd_ctx = {};
 
 	DBG("[thread] Manage client started");
 
+	lttng_payload_init(&cmd_ctx.reply_payload);
+
 	is_root = (getuid() == 0);
 
 	pthread_cleanup_push(thread_init_cleanup, NULL);
-	client_sock = create_client_sock();
-	if (client_sock < 0) {
-		goto error_listen;
-	}
 
 	rcu_register_thread();
 
@@ -2069,7 +2274,7 @@ static void *thread_manage_clients(void *data)
 	}
 
 	/* Set state as running. */
-        set_thread_status(true);
+	set_thread_status(true);
 	pthread_cleanup_pop(0);
 
 	/* This testpoint is after we signal readiness to the parent. */
@@ -2086,6 +2291,14 @@ static void *thread_manage_clients(void *data)
 	while (1) {
 		const struct cmd_completion_handler *cmd_completion_handler;
 
+		cmd_ctx.creds = (lttng_sock_cred) {
+			.uid = UINT32_MAX,
+			.gid = UINT32_MAX,
+		};
+		cmd_ctx.session = NULL;
+		lttng_payload_clear(&cmd_ctx.reply_payload);
+		cmd_ctx.lttng_msg_size = 0;
+
 		DBG("Accepting client command ...");
 
 		/* Inifinite blocking call, waiting for transmission */
@@ -2149,23 +2362,6 @@ static void *thread_manage_clients(void *data)
 			goto error;
 		}
 
-		/* Allocate context command to process the client request */
-		cmd_ctx = zmalloc(sizeof(struct command_ctx));
-		if (cmd_ctx == NULL) {
-			PERROR("zmalloc cmd_ctx");
-			goto error;
-		}
-
-		/* Allocate data buffer for reception */
-		cmd_ctx->lsm = zmalloc(sizeof(struct lttcomm_session_msg));
-		if (cmd_ctx->lsm == NULL) {
-			PERROR("zmalloc cmd_ctx->lsm");
-			goto error;
-		}
-
-		cmd_ctx->llm = NULL;
-		cmd_ctx->session = NULL;
-
 		health_code_update();
 
 		/*
@@ -2174,16 +2370,15 @@ static void *thread_manage_clients(void *data)
 		 * the client.
 		 */
 		DBG("Receiving data from client ...");
-		ret = lttcomm_recv_creds_unix_sock(sock, cmd_ctx->lsm,
-				sizeof(struct lttcomm_session_msg), &cmd_ctx->creds);
-		if (ret <= 0) {
-			DBG("Nothing recv() from client... continuing");
+		ret = lttcomm_recv_creds_unix_sock(sock, &cmd_ctx.lsm,
+				sizeof(struct lttcomm_session_msg), &cmd_ctx.creds);
+		if (ret != sizeof(struct lttcomm_session_msg)) {
+			DBG("Incomplete recv() from client... continuing");
 			ret = close(sock);
 			if (ret) {
 				PERROR("close");
 			}
 			sock = -1;
-			clean_command_ctx(&cmd_ctx);
 			continue;
 		}
 
@@ -2199,7 +2394,7 @@ static void *thread_manage_clients(void *data)
 		 * informations for the client. The command context struct contains
 		 * everything this function may needs.
 		 */
-		ret = process_client_msg(cmd_ctx, &sock, &sock_error);
+		ret = process_client_msg(&cmd_ctx, &sock, &sock_error);
 		rcu_thread_offline();
 		if (ret < 0) {
 			if (sock >= 0) {
@@ -2207,8 +2402,8 @@ static void *thread_manage_clients(void *data)
 				if (ret) {
 					PERROR("close");
 				}
-                        }
-                        sock = -1;
+			}
+			sock = -1;
 			/*
 			 * TODO: Inform client somehow of the fatal error. At
 			 * this point, ret < 0 means that a zmalloc failed
@@ -2216,7 +2411,6 @@ static void *thread_manage_clients(void *data)
 			 * command, unless a socket error has been
 			 * detected.
 			 */
-			clean_command_ctx(&cmd_ctx);
 			continue;
 		}
 
@@ -2227,7 +2421,6 @@ static void *thread_manage_clients(void *data)
 			completion_code = cmd_completion_handler->run(
 					cmd_completion_handler->data);
 			if (completion_code != LTTNG_OK) {
-				clean_command_ctx(&cmd_ctx);
 				continue;
 			}
 		}
@@ -2235,12 +2428,24 @@ static void *thread_manage_clients(void *data)
 		health_code_update();
 
 		if (sock >= 0) {
+			struct lttng_payload_view view =
+					lttng_payload_view_from_payload(
+							&cmd_ctx.reply_payload,
+							0, -1);
+			struct lttcomm_lttng_msg *llm = (typeof(
+					llm)) cmd_ctx.reply_payload.buffer.data;
+
+			assert(cmd_ctx.reply_payload.buffer.size >=
+			       sizeof(llm));
+			assert(cmd_ctx.lttng_msg_size == cmd_ctx.reply_payload.buffer.size);
+
+			llm->fd_count = lttng_payload_view_get_fd_handle_count(&view);
+
 			DBG("Sending response (size: %d, retcode: %s (%d))",
-					cmd_ctx->lttng_msg_size,
-					lttng_strerror(-cmd_ctx->llm->ret_code),
-					cmd_ctx->llm->ret_code);
-			ret = send_unix_sock(sock, cmd_ctx->llm,
-					cmd_ctx->lttng_msg_size);
+					cmd_ctx.lttng_msg_size,
+					lttng_strerror(-llm->ret_code),
+					llm->ret_code);
+			ret = send_unix_sock(sock, &view);
 			if (ret < 0) {
 				ERR("Failed to send data back to client");
 			}
@@ -2250,10 +2455,8 @@ static void *thread_manage_clients(void *data)
 			if (ret) {
 				PERROR("close");
 			}
-                }
-                sock = -1;
-
-		clean_command_ctx(&cmd_ctx);
+		}
+		sock = -1;
 
 		health_code_update();
 	}
@@ -2268,16 +2471,13 @@ error:
 	}
 
 	lttng_poll_clean(&events);
-	clean_command_ctx(&cmd_ctx);
 
 error_listen:
 error_create_poll:
 	unlink(config.client_unix_sock_path.value);
-	if (client_sock >= 0) {
-		ret = close(client_sock);
-		if (ret) {
-			PERROR("close");
-		}
+	ret = close(client_sock);
+	if (ret) {
+		PERROR("close");
 	}
 
 	if (err) {
@@ -2288,7 +2488,7 @@ error_create_poll:
 	health_unregister(health_sessiond);
 
 	DBG("Client thread dying");
-
+	lttng_payload_reset(&cmd_ctx.reply_payload);
 	rcu_unregister_thread();
 	return NULL;
 }
@@ -2306,7 +2506,8 @@ struct lttng_thread *launch_client_thread(void)
 {
 	bool thread_running;
 	struct lttng_pipe *client_quit_pipe;
-	struct lttng_thread *thread;
+	struct lttng_thread *thread = NULL;
+	int client_sock_fd = -1;
 
 	sem_init(&thread_state.ready, 0, 0);
 	client_quit_pipe = lttng_pipe_open(FD_CLOEXEC);
@@ -2314,6 +2515,12 @@ struct lttng_thread *launch_client_thread(void)
 		goto error;
 	}
 
+	client_sock_fd = create_client_sock();
+	if (client_sock_fd < 0) {
+		goto error;
+	}
+
+	thread_state.client_sock = client_sock_fd;
 	thread = lttng_thread_create("Client management",
 			thread_manage_clients,
 			shutdown_client_thread,
@@ -2322,6 +2529,9 @@ struct lttng_thread *launch_client_thread(void)
 	if (!thread) {
 		goto error;
 	}
+	/* The client thread now owns the client sock fd and the quit pipe. */
+	client_sock_fd = -1;
+	client_quit_pipe = NULL;
 
 	/*
 	 * This thread is part of the threads that need to be fully
@@ -2329,11 +2539,16 @@ struct lttng_thread *launch_client_thread(void)
 	 */
 	thread_running = wait_thread_status();
 	if (!thread_running) {
-		lttng_thread_put(thread);
-		thread = NULL;
+		goto error;
 	}
 	return thread;
 error:
+	if (client_sock_fd >= 0) {
+		if (close(client_sock_fd)) {
+			PERROR("Failed to close client socket");
+		}
+	}
+	lttng_thread_put(thread);
 	cleanup_client_thread(client_quit_pipe);
 	return NULL;
 }