X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=e6c172ca51b6b30c880cb94376fab59f94d74118;hb=dac8e0462da102e089005c067ced055928610758;hp=91ea88cb7c593a5c5f8cb010016a4f5f9816b8d4;hpb=ccf10263bcd2ca4667b9e1fc4dab64a3c8d8c4d8;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 91ea88cb7..e6c172ca5 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -38,6 +38,7 @@
 #include "lttng-sessiond.h"
 #include "utils.h"
 #include "syscall.h"
+#include "agent.h"
 
 #include "cmd.h"
 
@@ -50,21 +51,6 @@
 static pthread_mutex_t relayd_net_seq_idx_lock = PTHREAD_MUTEX_INITIALIZER;
 static uint64_t relayd_net_seq_idx;
 
-/*
- * Both functions below are special case for the Kernel domain when
- * enabling/disabling all events.
- */
-static
-int enable_kevent_all(struct ltt_session *session,
-		struct lttng_domain *domain, char *channel_name,
-		struct lttng_event *event,
-		char *filter_expression,
-		struct lttng_filter_bytecode *filter, int wpipe);
-static
-int disable_kevent_all(struct ltt_session *session, int domain,
-		char *channel_name,
-		struct lttng_event *event);
-
 /*
  * Create a session path used by list_lttng_sessions for the case that the
  * session consumer is on the network.
@@ -912,11 +898,6 @@ int cmd_disable_channel(struct ltt_session *session, int domain,
 		}
 		break;
 	}
-#if 0
-	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
-	case LTTNG_DOMAIN_UST_EXEC_NAME:
-	case LTTNG_DOMAIN_UST_PID:
-#endif
 	default:
 		ret = LTTNG_ERR_UNKNOWN_DOMAIN;
 		goto error;
@@ -931,6 +912,8 @@ error:
 
 /*
  * Command LTTNG_TRACK_PID processed by the client thread.
+ *
+ * Called with session lock held.
  */
 int cmd_track_pid(struct ltt_session *session, int domain, int pid)
 {
@@ -953,12 +936,18 @@ int cmd_track_pid(struct ltt_session *session, int domain, int pid)
 		kernel_wait_quiescent(kernel_tracer_fd);
 		break;
 	}
-#if 0
 	case LTTNG_DOMAIN_UST:
-	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
-	case LTTNG_DOMAIN_UST_EXEC_NAME:
-	case LTTNG_DOMAIN_UST_PID:
-#endif
+	{
+		struct ltt_ust_session *usess;
+
+		usess = session->ust_session;
+
+		ret = trace_ust_track_pid(usess, pid);
+		if (ret != LTTNG_OK) {
+			goto error;
+		}
+		break;
+	}
 	default:
 		ret = LTTNG_ERR_UNKNOWN_DOMAIN;
 		goto error;
@@ -973,6 +962,8 @@ error:
 
 /*
  * Command LTTNG_UNTRACK_PID processed by the client thread.
+ *
+ * Called with session lock held.
  */
 int cmd_untrack_pid(struct ltt_session *session, int domain, int pid)
 {
@@ -995,12 +986,18 @@ int cmd_untrack_pid(struct ltt_session *session, int domain, int pid)
 		kernel_wait_quiescent(kernel_tracer_fd);
 		break;
 	}
-#if 0
 	case LTTNG_DOMAIN_UST:
-	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
-	case LTTNG_DOMAIN_UST_EXEC_NAME:
-	case LTTNG_DOMAIN_UST_PID:
-#endif
+	{
+		struct ltt_ust_session *usess;
+
+		usess = session->ust_session;
+
+		ret = trace_ust_untrack_pid(usess, pid);
+		if (ret != LTTNG_OK) {
+			goto error;
+		}
+		break;
+	}
 	default:
 		ret = LTTNG_ERR_UNKNOWN_DOMAIN;
 		goto error;
@@ -1123,7 +1120,6 @@ end:
 	return ret;
 }
 
-
 /*
  * Command LTTNG_DISABLE_EVENT processed by the client thread.
  */
@@ -1143,10 +1139,6 @@ int cmd_disable_event(struct ltt_session *session, int domain,
 			|| event->pid || event->filter || event->exclusion) {
 		return LTTNG_ERR_UNK;
 	}
-	/* Special handling for kernel domain all events. */
-	if (domain == LTTNG_DOMAIN_KERNEL && !strcmp(event_name, "*")) {
-		return disable_kevent_all(session, domain, channel_name, event);
-	}
 
 	rcu_read_lock();
 
@@ -1176,14 +1168,28 @@ int cmd_disable_event(struct ltt_session *session, int domain,
 
 		switch (event->type) {
 		case LTTNG_EVENT_ALL:
-		case LTTNG_EVENT_TRACEPOINT:
-			ret = event_kernel_disable_tracepoint(kchan, event_name);
+			ret = event_kernel_disable_event_all(kchan);
 			if (ret != LTTNG_OK) {
 				goto error;
 			}
 			break;
+		case LTTNG_EVENT_TRACEPOINT:	/* fall-through */
 		case LTTNG_EVENT_SYSCALL:
-			ret = event_kernel_disable_syscall(kchan, event_name);
+			if (!strcmp(event_name, "*")) {
+				ret = event_kernel_disable_event_type(kchan,
+					event->type);
+			} else {
+				ret = event_kernel_disable_event(kchan,
+					event_name);
+			}
+			if (ret != LTTNG_OK) {
+				goto error;
+			}
+			break;
+		case LTTNG_EVENT_PROBE:
+		case LTTNG_EVENT_FUNCTION:
+		case LTTNG_EVENT_FUNCTION_ENTRY:
+			ret = event_kernel_disable_event(kchan, event_name);
 			if (ret != LTTNG_OK) {
 				goto error;
 			}
@@ -1270,80 +1276,6 @@ int cmd_disable_event(struct ltt_session *session, int domain,
 
 		break;
 	}
-#if 0
-	case LTTNG_DOMAIN_UST_EXEC_NAME:
-	case LTTNG_DOMAIN_UST_PID:
-	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
-#endif
-	default:
-		ret = LTTNG_ERR_UND;
-		goto error;
-	}
-
-	ret = LTTNG_OK;
-
-error:
-	rcu_read_unlock();
-	return ret;
-}
-
-/*
- * Command LTTNG_DISABLE_EVENT for event "*" processed by the client thread.
- */
-static
-int disable_kevent_all(struct ltt_session *session, int domain,
-		char *channel_name,
-		struct lttng_event *event)
-{
-	int ret;
-
-	rcu_read_lock();
-
-	switch (domain) {
-	case LTTNG_DOMAIN_KERNEL:
-	{
-		struct ltt_kernel_session *ksess;
-		struct ltt_kernel_channel *kchan;
-
-		ksess = session->kernel_session;
-
-		/*
-		 * If a non-default channel has been created in the
-		 * session, explicitely require that -c chan_name needs
-		 * to be provided.
-		 */
-		if (ksess->has_non_default_channel && channel_name[0] == '\0') {
-			ret = LTTNG_ERR_NEED_CHANNEL_NAME;
-			goto error;
-		}
-
-		kchan = trace_kernel_get_channel_by_name(channel_name, ksess);
-		if (kchan == NULL) {
-			ret = LTTNG_ERR_KERN_CHAN_NOT_FOUND;
-			goto error;
-		}
-
-		switch (event->type) {
-		case LTTNG_EVENT_ALL:
-			ret = event_kernel_disable_all(kchan);
-			if (ret != LTTNG_OK) {
-				goto error;
-			}
-			break;
-		case LTTNG_EVENT_SYSCALL:
-			ret = event_kernel_disable_syscall(kchan, "");
-			if (ret != LTTNG_OK) {
-				goto error;
-			}
-			break;
-		default:
-			ret = LTTNG_ERR_UNK;
-			goto error;
-		}
-
-		kernel_wait_quiescent(kernel_tracer_fd);
-		break;
-	}
 	default:
 		ret = LTTNG_ERR_UND;
 		goto error;
@@ -1414,11 +1346,6 @@ int cmd_add_context(struct ltt_session *session, int domain,
 		}
 		break;
 	}
-#if 0
-	case LTTNG_DOMAIN_UST_EXEC_NAME:
-	case LTTNG_DOMAIN_UST_PID:
-	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
-#endif
 	default:
 		ret = LTTNG_ERR_UND;
 		goto error;
@@ -1456,6 +1383,7 @@ static int validate_event_name(const char *name)
 	int ret = 0;
 	const char *c = name;
 	const char *event_name_end = c + LTTNG_SYMBOL_NAME_LEN;
+	bool null_terminated = false;
 
 	/*
 	 * Make sure that unescaped wildcards are only used as the last
@@ -1464,6 +1392,7 @@ static int validate_event_name(const char *name)
 	while (c < event_name_end) {
 		switch (*c) {
 		case '\0':
+		        null_terminated = true;
 			goto end;
 		case '\\':
 			c++;
@@ -1480,19 +1409,64 @@ static int validate_event_name(const char *name)
 		c++;
 	}
 end:
+	if (!ret && !null_terminated) {
+		ret = LTTNG_ERR_INVALID_EVENT_NAME;
+	}
 	return ret;
 }
 
+static inline bool name_starts_with(const char *name, const char *prefix)
+{
+	const size_t max_cmp_len = min(strlen(prefix), LTTNG_SYMBOL_NAME_LEN);
+
+	return !strncmp(name, prefix, max_cmp_len);
+}
+
+/* Perform userspace-specific event name validation */
+static int validate_ust_event_name(const char *name)
+{
+	int ret = 0;
+
+	if (!name) {
+		ret = -1;
+		goto end;
+	}
+
+	/*
+	 * Check name against all internal UST event component namespaces used
+	 * by the agents.
+	 */
+	if (name_starts_with(name, DEFAULT_JUL_EVENT_COMPONENT) ||
+		name_starts_with(name, DEFAULT_LOG4J_EVENT_COMPONENT) ||
+		name_starts_with(name, DEFAULT_PYTHON_EVENT_COMPONENT)) {
+		ret = -1;
+	}
+
+end:
+	return ret;
+}
+
+static int cmd_enable_event_internal(struct ltt_session *session,
+		struct lttng_domain *domain,
+		char *channel_name, struct lttng_event *event,
+		char *filter_expression,
+		struct lttng_filter_bytecode *filter,
+		struct lttng_event_exclusion *exclusion,
+		int wpipe);
+
 /*
- * Command LTTNG_ENABLE_EVENT processed by the client thread.
- * We own filter, exclusion, and filter_expression.
+ * Internal version of cmd_enable_event() with a supplemental
+ * "internal_event" flag which is used to enable internal events which should
+ * be hidden from clients. Such events are used in the agent implementation to
+ * enable the events through which all "agent" events are funeled.
  */
-int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
+static int _cmd_enable_event(struct ltt_session *session,
+		struct lttng_domain *domain,
 		char *channel_name, struct lttng_event *event,
 		char *filter_expression,
 		struct lttng_filter_bytecode *filter,
 		struct lttng_event_exclusion *exclusion,
-		int wpipe)
+		int wpipe, bool internal_event)
 {
 	int ret, channel_created = 0;
 	struct lttng_channel *attr;
@@ -1503,12 +1477,6 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 
 	DBG("Enable event command for event \'%s\'", event->name);
 
-	/* Special handling for kernel domain all events. */
-	if (domain->type == LTTNG_DOMAIN_KERNEL && !strcmp(event->name, "*")) {
-		return enable_kevent_all(session, domain, channel_name, event,
-				filter_expression, filter, wpipe);
-	}
-
 	ret = validate_event_name(event->name);
 	if (ret) {
 		goto error;
@@ -1564,11 +1532,65 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 
 		switch (event->type) {
 		case LTTNG_EVENT_ALL:
+		{
+			char *filter_expression_a = NULL;
+			struct lttng_filter_bytecode *filter_a = NULL;
+
+			/*
+			 * We need to duplicate filter_expression and filter,
+			 * because ownership is passed to first enable
+			 * event.
+			 */
+			if (filter_expression) {
+				filter_expression_a = strdup(filter_expression);
+				if (!filter_expression_a) {
+					ret = LTTNG_ERR_FATAL;
+					goto error;
+				}
+			}
+			if (filter) {
+				filter_a = zmalloc(sizeof(*filter_a) + filter->len);
+				if (!filter_a) {
+					free(filter_expression_a);
+					ret = LTTNG_ERR_FATAL;
+					goto error;
+				}
+				memcpy(filter_a, filter, sizeof(*filter_a) + filter->len);
+			}
+			event->type = LTTNG_EVENT_TRACEPOINT;	/* Hack */
+			ret = event_kernel_enable_event(kchan, event,
+				filter_expression, filter);
+			/* We have passed ownership */
+			filter_expression = NULL;
+			filter = NULL;
+			if (ret != LTTNG_OK) {
+				if (channel_created) {
+					/* Let's not leak a useless channel. */
+					kernel_destroy_channel(kchan);
+				}
+				free(filter_expression_a);
+				free(filter_a);
+				goto error;
+			}
+			event->type = LTTNG_EVENT_SYSCALL;	/* Hack */
+			ret = event_kernel_enable_event(kchan, event,
+				filter_expression_a, filter_a);
+			if (ret != LTTNG_OK) {
+				free(filter_expression_a);
+				free(filter_a);
+				goto error;
+			}
+			break;
+		}
 		case LTTNG_EVENT_PROBE:
 		case LTTNG_EVENT_FUNCTION:
 		case LTTNG_EVENT_FUNCTION_ENTRY:
 		case LTTNG_EVENT_TRACEPOINT:
-			ret = event_kernel_enable_tracepoint(kchan, event);
+			ret = event_kernel_enable_event(kchan, event,
+				filter_expression, filter);
+			/* We have passed ownership */
+			filter_expression = NULL;
+			filter = NULL;
 			if (ret != LTTNG_OK) {
 				if (channel_created) {
 					/* Let's not leak a useless channel. */
@@ -1578,7 +1600,11 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 			}
 			break;
 		case LTTNG_EVENT_SYSCALL:
-			ret = event_kernel_enable_syscall(kchan, event->name);
+			ret = event_kernel_enable_event(kchan, event,
+				filter_expression, filter);
+			/* We have passed ownership */
+			filter_expression = NULL;
+			filter = NULL;
 			if (ret != LTTNG_OK) {
 				goto error;
 			}
@@ -1634,9 +1660,25 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 			assert(uchan);
 		}
 
+		if (!internal_event) {
+			/*
+			 * Ensure the event name is not reserved for internal
+			 * use.
+			 */
+			ret = validate_ust_event_name(event->name);
+			if (ret) {
+			        WARN("Userspace event name %s failed validation.",
+						event->name ?
+						event->name : "NULL");
+				ret = LTTNG_ERR_INVALID_EVENT_NAME;
+				goto error;
+			}
+		}
+
 		/* At this point, the session and channel exist on the tracer */
 		ret = event_ust_enable_tracepoint(usess, uchan, event,
-				filter_expression, filter, exclusion);
+				filter_expression, filter, exclusion,
+				internal_event);
 		/* We have passed ownership */
 		filter_expression = NULL;
 		filter = NULL;
@@ -1719,7 +1761,7 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 					+ filter->len);
 			}
 
-			ret = cmd_enable_event(session, &tmp_dom,
+			ret = cmd_enable_event_internal(session, &tmp_dom,
 					(char *) default_chan_name,
 					&uevent, filter_expression, filter_copy,
 					NULL, wpipe);
@@ -1745,11 +1787,6 @@ int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
 
 		break;
 	}
-#if 0
-	case LTTNG_DOMAIN_UST_EXEC_NAME:
-	case LTTNG_DOMAIN_UST_PID:
-	case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
-#endif
 	default:
 		ret = LTTNG_ERR_UND;
 		goto error;
@@ -1766,113 +1803,36 @@ error:
 }
 
 /*
- * Command LTTNG_ENABLE_EVENT for event "*" processed by the client thread.
+ * Command LTTNG_ENABLE_EVENT processed by the client thread.
+ * We own filter, exclusion, and filter_expression.
  */
-static
-int enable_kevent_all(struct ltt_session *session,
-		struct lttng_domain *domain, char *channel_name,
-		struct lttng_event *event,
+int cmd_enable_event(struct ltt_session *session, struct lttng_domain *domain,
+		char *channel_name, struct lttng_event *event,
 		char *filter_expression,
-		struct lttng_filter_bytecode *filter, int wpipe)
+		struct lttng_filter_bytecode *filter,
+		struct lttng_event_exclusion *exclusion,
+		int wpipe)
 {
-	int ret;
-	struct lttng_channel *attr;
-
-	assert(session);
-	assert(channel_name);
-
-	rcu_read_lock();
-
-	switch (domain->type) {
-	case LTTNG_DOMAIN_KERNEL:
-	{
-		struct ltt_kernel_channel *kchan;
-
-		assert(session->kernel_session);
-
-		/*
-		 * If a non-default channel has been created in the
-		 * session, explicitely require that -c chan_name needs
-		 * to be provided.
-		 */
-		if (session->kernel_session->has_non_default_channel
-				&& channel_name[0] == '\0') {
-			ret = LTTNG_ERR_NEED_CHANNEL_NAME;
-			goto error;
-		}
-
-		kchan = trace_kernel_get_channel_by_name(channel_name,
-				session->kernel_session);
-		if (kchan == NULL) {
-			/* Create default channel */
-			attr = channel_new_default_attr(LTTNG_DOMAIN_KERNEL,
-					LTTNG_BUFFER_GLOBAL);
-			if (attr == NULL) {
-				ret = LTTNG_ERR_FATAL;
-				goto error;
-			}
-			strncpy(attr->name, channel_name, sizeof(attr->name));
-
-			ret = cmd_enable_channel(session, domain, attr, wpipe);
-			if (ret != LTTNG_OK) {
-				free(attr);
-				goto error;
-			}
-			free(attr);
-
-			/* Get the newly created kernel channel pointer */
-			kchan = trace_kernel_get_channel_by_name(channel_name,
-					session->kernel_session);
-			assert(kchan);
-		}
-
-		switch (event->type) {
-		case LTTNG_EVENT_SYSCALL:
-			ret = event_kernel_enable_syscall(kchan, "");
-			if (ret != LTTNG_OK) {
-				goto error;
-			}
-			break;
-		case LTTNG_EVENT_TRACEPOINT:
-			/*
-			 * This call enables all LTTNG_KERNEL_TRACEPOINTS and
-			 * events already registered to the channel.
-			 */
-			ret = event_kernel_enable_all_tracepoints(kchan, kernel_tracer_fd);
-			break;
-		case LTTNG_EVENT_ALL:
-			/* Enable syscalls and tracepoints */
-			ret = event_kernel_enable_all(kchan, kernel_tracer_fd);
-			break;
-		default:
-			ret = LTTNG_ERR_KERN_ENABLE_FAIL;
-			goto error;
-		}
-
-		/* Manage return value */
-		if (ret != LTTNG_OK) {
-			/*
-			 * On error, cmd_enable_channel call will take care of destroying
-			 * the created channel if it was needed.
-			 */
-			goto error;
-		}
-
-		kernel_wait_quiescent(kernel_tracer_fd);
-		break;
-	}
-	default:
-		ret = LTTNG_ERR_UND;
-		goto error;
-	}
-
-	ret = LTTNG_OK;
-
-error:
-	rcu_read_unlock();
-	return ret;
+	return _cmd_enable_event(session, domain, channel_name, event,
+			filter_expression, filter, exclusion, wpipe, false);
 }
 
+/*
+ * Enable an event which is internal to LTTng. An internal should
+ * never be made visible to clients and are immune to checks such as
+ * reserved names.
+ */
+static int cmd_enable_event_internal(struct ltt_session *session,
+		struct lttng_domain *domain,
+		char *channel_name, struct lttng_event *event,
+		char *filter_expression,
+		struct lttng_filter_bytecode *filter,
+		struct lttng_event_exclusion *exclusion,
+		int wpipe)
+{
+	return _cmd_enable_event(session, domain, channel_name, event,
+			filter_expression, filter, exclusion, wpipe, true);
+}
 
 /*
  * Command LTTNG_LIST_TRACEPOINTS processed by the client thread.
@@ -1953,8 +1913,61 @@ ssize_t cmd_list_syscalls(struct lttng_event **events)
 	return syscall_table_list(events);
 }
 
+/*
+ * Command LTTNG_LIST_TRACKER_PIDS processed by the client thread.
+ *
+ * Called with session lock held.
+ */
+ssize_t cmd_list_tracker_pids(struct ltt_session *session,
+		int domain, int32_t **pids)
+{
+	int ret;
+	ssize_t nr_pids = 0;
+
+	switch (domain) {
+	case LTTNG_DOMAIN_KERNEL:
+	{
+		struct ltt_kernel_session *ksess;
+
+		ksess = session->kernel_session;
+		nr_pids = kernel_list_tracker_pids(ksess, pids);
+		if (nr_pids < 0) {
+			ret = LTTNG_ERR_KERN_LIST_FAIL;
+			goto error;
+		}
+		break;
+	}
+	case LTTNG_DOMAIN_UST:
+	{
+		struct ltt_ust_session *usess;
+
+		usess = session->ust_session;
+		nr_pids = trace_ust_list_tracker_pids(usess, pids);
+		if (nr_pids < 0) {
+			ret = LTTNG_ERR_UST_LIST_FAIL;
+			goto error;
+		}
+		break;
+	}
+	case LTTNG_DOMAIN_LOG4J:
+	case LTTNG_DOMAIN_JUL:
+	case LTTNG_DOMAIN_PYTHON:
+	default:
+		ret = LTTNG_ERR_UND;
+		goto error;
+	}
+
+	return nr_pids;
+
+error:
+	/* Return negative value to differentiate return code */
+	return -ret;
+}
+
 /*
  * Command LTTNG_START_TRACE processed by the client thread.
+ *
+ * Called with session mutex held.
  */
 int cmd_start_trace(struct ltt_session *session)
 {
@@ -1980,9 +1993,7 @@ int cmd_start_trace(struct ltt_session *session)
 	 * possible to enable channel thus inform the client.
 	 */
 	if (usess && usess->domain_global.channels) {
-		rcu_read_lock();
 		nb_chan += lttng_ht_get_count(usess->domain_global.channels);
-		rcu_read_unlock();
 	}
 	if (ksession) {
 		nb_chan += ksession->channel_count;
@@ -2315,6 +2326,8 @@ error:
 
 /*
  * Command LTTNG_DESTROY_SESSION processed by the client thread.
+ *
+ * Called with session lock held.
  */
 int cmd_destroy_session(struct ltt_session *session, int wpipe)
 {
@@ -2537,6 +2550,10 @@ ssize_t cmd_list_domains(struct ltt_session *session,
 
 	if (session->kernel_session != NULL) {
 		(*domains)[index].type = LTTNG_DOMAIN_KERNEL;
+
+		/* Kernel session buffer type is always GLOBAL */
+		(*domains)[index].buf_type = LTTNG_BUFFER_GLOBAL;
+
 		index++;
 	}