X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=3b776c57634fcfa5f05688a2c7b2c8233fb505b7;hb=d37406195ec30adfb1bd903e3ee8dfdda79700ef;hp=90a011fd9ad72a0f44efe2418d1706842e796dff;hpb=566190c494083c9a460fbcb9052b5143a14a6e56;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 90a011fd9..3b776c576 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -6,67 +6,69 @@
  *
  */
 
-#include "bin/lttng-sessiond/session.h"
+
 #define _LGPL_SOURCE
 #include <assert.h>
 #include <inttypes.h>
+#include <stdio.h>
+#include <sys/stat.h>
 #include <urcu/list.h>
 #include <urcu/uatomic.h>
-#include <sys/stat.h>
-#include <stdio.h>
 
-#include <common/defaults.h>
+#include <common/buffer-view.h>
 #include <common/common.h>
-#include <common/sessiond-comm/sessiond-comm.h>
-#include <common/relayd/relayd.h>
-#include <common/utils.h>
 #include <common/compat/string.h>
-#include <common/kernel-ctl/kernel-ctl.h>
+#include <common/defaults.h>
 #include <common/dynamic-buffer.h>
-#include <common/buffer-view.h>
-#include <common/payload.h>
+#include <common/kernel-ctl/kernel-ctl.h>
 #include <common/payload-view.h>
+#include <common/payload.h>
+#include <common/relayd/relayd.h>
+#include <common/sessiond-comm/sessiond-comm.h>
+#include <common/string-utils/string-utils.h>
 #include <common/trace-chunk.h>
-#include <lttng/location-internal.h>
-#include <lttng/trigger/trigger-internal.h>
-#include <lttng/condition/condition.h>
-#include <lttng/condition/condition-internal.h>
-#include <lttng/condition/on-event.h>
-#include <lttng/condition/on-event-internal.h>
-#include <lttng/event-rule/event-rule.h>
-#include <lttng/event-rule/event-rule-internal.h>
+#include <common/utils.h>
+#include <lttng/action/action-internal.h>
 #include <lttng/action/action.h>
-#include <lttng/channel.h>
 #include <lttng/channel-internal.h>
-#include <lttng/rotate-internal.h>
+#include <lttng/channel.h>
+#include <lttng/condition/condition-internal.h>
+#include <lttng/condition/condition.h>
+#include <lttng/condition/event-rule-matches-internal.h>
+#include <lttng/condition/event-rule-matches.h>
+#include <lttng/error-query-internal.h>
+#include <lttng/event-rule/event-rule-internal.h>
+#include <lttng/event-rule/event-rule.h>
 #include <lttng/location-internal.h>
-#include <lttng/session-internal.h>
-#include <lttng/userspace-probe-internal.h>
-#include <lttng/session-descriptor-internal.h>
 #include <lttng/lttng-error.h>
+#include <lttng/rotate-internal.h>
+#include <lttng/session-descriptor-internal.h>
+#include <lttng/session-internal.h>
 #include <lttng/tracker.h>
-#include <common/string-utils/string-utils.h>
+#include <lttng/trigger/trigger-internal.h>
+#include <lttng/userspace-probe-internal.h>
 
+#include "agent-thread.h"
+#include "agent.h"
+#include "buffer-registry.h"
 #include "channel.h"
+#include "cmd.h"
 #include "consumer.h"
+#include "event-notifier-error-accounting.h"
 #include "event.h"
 #include "health-sessiond.h"
-#include "kernel.h"
 #include "kernel-consumer.h"
+#include "kernel.h"
 #include "lttng-sessiond.h"
-#include "utils.h"
 #include "lttng-syscall.h"
-#include "agent.h"
-#include "buffer-registry.h"
-#include "notification-thread.h"
 #include "notification-thread-commands.h"
+#include "notification-thread.h"
 #include "rotate.h"
 #include "rotation-thread.h"
+#include "session.h"
 #include "timer.h"
-#include "agent-thread.h"
 #include "tracker.h"
-
-#include "cmd.h"
+#include "utils.h"
 
 /* Sleep for 100ms between each check for the shm path's deletion. */
 #define SESSION_DESTROY_SHM_PATH_CHECK_DELAY_US 100000
@@ -679,34 +681,34 @@ static int list_lttng_kernel_events(char *channel_name,
 		event.filter = (unsigned char) !!kevent->filter_expression;
 
 		switch (kevent->event->instrumentation) {
-		case LTTNG_KERNEL_TRACEPOINT:
+		case LTTNG_KERNEL_ABI_TRACEPOINT:
 			event.type = LTTNG_EVENT_TRACEPOINT;
 			break;
-		case LTTNG_KERNEL_KRETPROBE:
+		case LTTNG_KERNEL_ABI_KRETPROBE:
 			event.type = LTTNG_EVENT_FUNCTION;
 			memcpy(&event.attr.probe, &kevent->event->u.kprobe,
-					sizeof(struct lttng_kernel_kprobe));
+					sizeof(struct lttng_kernel_abi_kprobe));
 			break;
-		case LTTNG_KERNEL_KPROBE:
+		case LTTNG_KERNEL_ABI_KPROBE:
 			event.type = LTTNG_EVENT_PROBE;
 			memcpy(&event.attr.probe, &kevent->event->u.kprobe,
-					sizeof(struct lttng_kernel_kprobe));
+					sizeof(struct lttng_kernel_abi_kprobe));
 			break;
-		case LTTNG_KERNEL_UPROBE:
+		case LTTNG_KERNEL_ABI_UPROBE:
 			event.type = LTTNG_EVENT_USERSPACE_PROBE;
 			break;
-		case LTTNG_KERNEL_FUNCTION:
+		case LTTNG_KERNEL_ABI_FUNCTION:
 			event.type = LTTNG_EVENT_FUNCTION;
 			memcpy(&event.attr.ftrace, &kevent->event->u.ftrace,
-					sizeof(struct lttng_kernel_function));
+					sizeof(struct lttng_kernel_abi_function));
 			break;
-		case LTTNG_KERNEL_NOOP:
+		case LTTNG_KERNEL_ABI_NOOP:
 			event.type = LTTNG_EVENT_NOOP;
 			break;
-		case LTTNG_KERNEL_SYSCALL:
+		case LTTNG_KERNEL_ABI_SYSCALL:
 			event.type = LTTNG_EVENT_SYSCALL;
 			break;
-		case LTTNG_KERNEL_ALL:
+		case LTTNG_KERNEL_ABI_ALL:
 			/* fall-through. */
 		default:
 			assert(0);
@@ -3239,6 +3241,7 @@ void cmd_destroy_session_reply(const struct ltt_session *session,
 	payload_size_before_location = payload.size;
 	comm_ret = lttng_trace_archive_location_serialize(location,
 			&payload);
+	lttng_trace_archive_location_put(location);
 	if (comm_ret < 0) {
 		ERR("Failed to serialize the location of the trace archive produced during the destruction of session \"%s\"",
 				session->name);
@@ -4313,12 +4316,12 @@ enum lttng_error_code synchronize_tracer_notifier_register(
 	assert(trigger_status == LTTNG_TRIGGER_STATUS_OK);
 
 	assert(condition);
-	assert(lttng_condition_get_type(condition) == LTTNG_CONDITION_TYPE_ON_EVENT);
+	assert(lttng_condition_get_type(condition) ==
+			LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES);
 
 	trigger_status = lttng_trigger_get_name(trigger, &trigger_name);
 	trigger_name = trigger_status == LTTNG_TRIGGER_STATUS_OK ?
-			trigger_name :
-			"(unnamed)";
+			trigger_name : "(anonymous)";
 
 	session_lock_list();
 	switch (trigger_domain) {
@@ -4360,7 +4363,7 @@ enum lttng_error_code synchronize_tracer_notifier_register(
 				goto end_unlock_session_list;
 			}
 
-			agent_add(agt, trigger_agents_ht_by_domain);
+			agent_add(agt, the_trigger_agents_ht_by_domain);
 		}
 
 		ret_code = trigger_agent_enable(trigger, agt);
@@ -4383,6 +4386,7 @@ end_unlock_session_list:
 
 enum lttng_error_code cmd_register_trigger(const struct lttng_credentials *cmd_creds,
 		struct lttng_trigger *trigger,
+		bool is_trigger_anonymous,
 		struct notification_thread_handle *notification_thread,
 		struct lttng_trigger **return_trigger)
 {
@@ -4393,7 +4397,7 @@ enum lttng_error_code cmd_register_trigger(const struct lttng_credentials *cmd_c
 
 	trigger_status = lttng_trigger_get_name(trigger, &trigger_name);
 	trigger_name = trigger_status == LTTNG_TRIGGER_STATUS_OK ?
-			trigger_name : "(unnamed)";
+			trigger_name : "(anonymous)";
 
 	trigger_status = lttng_trigger_get_owner_uid(
 		trigger, &trigger_owner);
@@ -4441,8 +4445,8 @@ enum lttng_error_code cmd_register_trigger(const struct lttng_credentials *cmd_c
 	 * it is safe to use without any locking as its properties are
 	 * immutable.
 	 */
-	ret_code = notification_thread_command_register_trigger(notification_thread,
-			trigger);
+	ret_code = notification_thread_command_register_trigger(
+			notification_thread, trigger, is_trigger_anonymous);
 	if (ret_code != LTTNG_OK) {
 		DBG("Failed to register trigger to notification thread: trigger name = '%s', trigger owner uid = %d, error code = %d",
 				trigger_name, (int) trigger_owner, ret_code);
@@ -4451,7 +4455,7 @@ enum lttng_error_code cmd_register_trigger(const struct lttng_credentials *cmd_c
 
 	trigger_status = lttng_trigger_get_name(trigger, &trigger_name);
 	trigger_name = trigger_status == LTTNG_TRIGGER_STATUS_OK ?
-			trigger_name : "(unnamed)";
+			trigger_name : "(anonymous)";
 
 	/*
 	 * Synchronize tracers if the trigger adds an event notifier.
@@ -4495,12 +4499,17 @@ enum lttng_error_code synchronize_tracer_notifier_unregister(
 					trigger);
 
 	assert(condition);
-	assert(lttng_condition_get_type(condition) == LTTNG_CONDITION_TYPE_ON_EVENT);
+	assert(lttng_condition_get_type(condition) ==
+			LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES);
 
 	session_lock_list();
 	switch (trigger_domain) {
 	case LTTNG_DOMAIN_KERNEL:
 		ret_code = kernel_unregister_event_notifier(trigger);
+		if (ret_code != LTTNG_OK) {
+			goto end_unlock_session_list;
+		}
+
 		break;
 	case LTTNG_DOMAIN_UST:
 		ust_app_global_update_all_event_notifier_rules();
@@ -4545,9 +4554,10 @@ enum lttng_error_code cmd_unregister_trigger(const struct lttng_credentials *cmd
 	const char *trigger_name;
 	uid_t trigger_owner;
 	enum lttng_trigger_status trigger_status;
+	struct lttng_trigger *sessiond_trigger = NULL;
 
 	trigger_status = lttng_trigger_get_name(trigger, &trigger_name);
-	trigger_name = trigger_status == LTTNG_TRIGGER_STATUS_OK ? trigger_name : "(unnamed)";
+	trigger_name = trigger_status == LTTNG_TRIGGER_STATUS_OK ? trigger_name : "(anonymous)";
 	trigger_status = lttng_trigger_get_owner_uid(trigger, &trigger_owner);
 	assert(trigger_status == LTTNG_TRIGGER_STATUS_OK);
 
@@ -4572,6 +4582,28 @@ enum lttng_error_code cmd_unregister_trigger(const struct lttng_credentials *cmd
 		}
 	}
 
+	/* Fetch the sessiond side trigger object. */
+	ret_code = notification_thread_command_get_trigger(
+			notification_thread, trigger, &sessiond_trigger);
+	if (ret_code != LTTNG_OK) {
+		DBG("Failed to get trigger from notification thread during unregister: trigger name = '%s', trigger owner uid = %d, error code = %d",
+				trigger_name, (int) trigger_owner, ret_code);
+		goto end;
+	}
+
+	assert(sessiond_trigger);
+
+	/*
+	 * From this point on, no matter what, consider the trigger
+	 * unregistered.
+	 *
+	 * We set the unregistered state of the sessiond side trigger object in
+	 * the client thread since we want to minimize the possibility of the
+	 * notification thread being stalled due to a long execution of an
+	 * action that required the trigger lock.
+	 */
+	lttng_trigger_set_as_unregistered(sessiond_trigger);
+
 	ret_code = notification_thread_command_unregister_trigger(notification_thread,
 								  trigger);
 	if (ret_code != LTTNG_OK) {
@@ -4596,14 +4628,15 @@ enum lttng_error_code cmd_unregister_trigger(const struct lttng_credentials *cmd
 	}
 
 end:
+	lttng_trigger_put(sessiond_trigger);
 	return ret_code;
 }
 
-int cmd_list_triggers(struct command_ctx *cmd_ctx,
+enum lttng_error_code cmd_list_triggers(struct command_ctx *cmd_ctx,
 		struct notification_thread_handle *notification_thread,
 		struct lttng_triggers **return_triggers)
 {
-	int ret = 0;
+	int ret;
 	enum lttng_error_code ret_code;
 	struct lttng_triggers *triggers = NULL;
 
@@ -4611,17 +4644,165 @@ int cmd_list_triggers(struct command_ctx *cmd_ctx,
 	ret_code = notification_thread_command_list_triggers(
 			notification_thread, cmd_ctx->creds.uid, &triggers);
 	if (ret_code != LTTNG_OK) {
-		ret = ret_code;
+		goto end;
+	}
+
+	ret = lttng_triggers_remove_hidden_triggers(triggers);
+	if (ret) {
+		ret_code = LTTNG_ERR_UNK;
 		goto end;
 	}
 
 	*return_triggers = triggers;
 	triggers = NULL;
-	ret = LTTNG_OK;
+	ret_code = LTTNG_OK;
 end:
 	lttng_triggers_destroy(triggers);
-	return ret;
+	return ret_code;
 }
+
+enum lttng_error_code cmd_execute_error_query(const struct lttng_credentials *cmd_creds,
+		const struct lttng_error_query *query,
+		struct lttng_error_query_results **_results,
+		struct notification_thread_handle *notification_thread)
+{
+	enum lttng_error_code ret_code;
+	const struct lttng_trigger *query_target_trigger;
+	const struct lttng_action *query_target_action = NULL;
+	struct lttng_trigger *matching_trigger = NULL;
+	const char *trigger_name;
+	uid_t trigger_owner;
+	enum lttng_trigger_status trigger_status;
+	struct lttng_error_query_results *results = NULL;
+
+	switch (lttng_error_query_get_target_type(query)) {
+	case LTTNG_ERROR_QUERY_TARGET_TYPE_TRIGGER:
+		query_target_trigger = lttng_error_query_trigger_borrow_target(query);
+		break;
+	case LTTNG_ERROR_QUERY_TARGET_TYPE_CONDITION:
+		query_target_trigger =
+				lttng_error_query_condition_borrow_target(query);
+		break;
+	case LTTNG_ERROR_QUERY_TARGET_TYPE_ACTION:
+		query_target_trigger = lttng_error_query_action_borrow_trigger_target(
+				query);
+		break;
+	default:
+		abort();
+	}
+
+	assert(query_target_trigger);
+
+	ret_code = notification_thread_command_get_trigger(notification_thread,
+			query_target_trigger, &matching_trigger);
+	if (ret_code != LTTNG_OK) {
+		goto end;
+	}
+
+	/* No longer needed. */
+	query_target_trigger = NULL;
+
+	if (lttng_error_query_get_target_type(query) ==
+			LTTNG_ERROR_QUERY_TARGET_TYPE_ACTION) {
+		/* Get the sessiond-side version of the target action. */
+		query_target_action =
+				lttng_error_query_action_borrow_action_target(
+						query, matching_trigger);
+	}
+
+	trigger_status = lttng_trigger_get_name(matching_trigger, &trigger_name);
+	trigger_name = trigger_status == LTTNG_TRIGGER_STATUS_OK ?
+			trigger_name : "(anonymous)";
+	trigger_status = lttng_trigger_get_owner_uid(matching_trigger,
+			&trigger_owner);
+	assert(trigger_status == LTTNG_TRIGGER_STATUS_OK);
+
+	results = lttng_error_query_results_create();
+	if (!results) {
+		ret_code = LTTNG_ERR_NOMEM;
+		goto end;
+	}
+
+	DBG("Running \"execute error query\" command: trigger name = '%s', trigger owner uid = %d, command creds uid = %d",
+			trigger_name, (int) trigger_owner,
+			(int) lttng_credentials_get_uid(cmd_creds));
+
+	/*
+	 * Validate the trigger credentials against the command credentials.
+	 * Only the root user can target a trigger with non-matching
+	 * credentials.
+	 */
+	if (!lttng_credentials_is_equal_uid(
+			lttng_trigger_get_credentials(matching_trigger),
+			cmd_creds)) {
+		if (lttng_credentials_get_uid(cmd_creds) != 0) {
+			ERR("Trigger credentials do not match the command credentials: trigger name = '%s', trigger owner uid = %d, command creds uid = %d",
+					trigger_name, (int) trigger_owner,
+					(int) lttng_credentials_get_uid(cmd_creds));
+			ret_code = LTTNG_ERR_INVALID_TRIGGER;
+			goto end;
+		}
+	}
+
+	switch (lttng_error_query_get_target_type(query)) {
+	case LTTNG_ERROR_QUERY_TARGET_TYPE_TRIGGER:
+		trigger_status = lttng_trigger_add_error_results(
+				matching_trigger, results);
+
+		switch (trigger_status) {
+		case LTTNG_TRIGGER_STATUS_OK:
+			break;
+		default:
+			ret_code = LTTNG_ERR_UNK;
+			goto end;
+		}
+
+		break;
+	case LTTNG_ERROR_QUERY_TARGET_TYPE_CONDITION:
+	{
+		trigger_status = lttng_trigger_condition_add_error_results(
+				matching_trigger, results);
+
+		switch (trigger_status) {
+		case LTTNG_TRIGGER_STATUS_OK:
+			break;
+		default:
+			ret_code = LTTNG_ERR_UNK;
+			goto end;
+		}
+
+		break;
+	}
+	case LTTNG_ERROR_QUERY_TARGET_TYPE_ACTION:
+	{
+		const enum lttng_action_status action_status =
+				lttng_action_add_error_query_results(
+						query_target_action, results);
+
+		switch (action_status) {
+		case LTTNG_ACTION_STATUS_OK:
+			break;
+		default:
+			ret_code = LTTNG_ERR_UNK;
+			goto end;
+		}
+
+		break;
+	}
+	default:
+		abort();
+		break;
+	}
+
+	*_results = results;
+	results = NULL;
+	ret_code = LTTNG_OK;
+end:
+	lttng_trigger_put(matching_trigger);
+	lttng_error_query_results_destroy(results);
+	return ret_code;
+}
+
 /*
  * Send relayd sockets from snapshot output to consumer. Ignore request if the
  * snapshot output is *not* set with a remote destination.
@@ -4872,6 +5053,11 @@ enum lttng_error_code snapshot_record(struct ltt_session *session,
 				consumer_copy_output(snapshot_output->consumer);
 		strcpy(snapshot_kernel_consumer_output->chunk_path,
 			snapshot_chunk_name);
+
+		/* Copy the original domain subdir. */
+		strcpy(snapshot_kernel_consumer_output->domain_subdir,
+				original_kernel_consumer_output->domain_subdir);
+
 		ret = consumer_copy_sockets(snapshot_kernel_consumer_output,
 				original_kernel_consumer_output);
 		if (ret < 0) {
@@ -4894,6 +5080,11 @@ enum lttng_error_code snapshot_record(struct ltt_session *session,
 				consumer_copy_output(snapshot_output->consumer);
 		strcpy(snapshot_ust_consumer_output->chunk_path,
 			snapshot_chunk_name);
+
+		/* Copy the original domain subdir. */
+		strcpy(snapshot_ust_consumer_output->domain_subdir,
+				original_ust_consumer_output->domain_subdir);
+
 		ret = consumer_copy_sockets(snapshot_ust_consumer_output,
 				original_ust_consumer_output);
 		if (ret < 0) {
@@ -5316,8 +5507,8 @@ int cmd_rotate_session(struct ltt_session *session,
 	chunk_being_archived = NULL;
 	if (!quiet_rotation) {
 		ret = notification_thread_command_session_rotation_ongoing(
-				notification_thread_handle,
-				session->name, session->uid, session->gid,
+				the_notification_thread_handle, session->name,
+				session->uid, session->gid,
 				ongoing_rotation_chunk_id);
 		if (ret != LTTNG_OK) {
 			ERR("Failed to notify notification thread that a session rotation is ongoing for session %s",