X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel.c;h=c377509ab4205dcba347ac97deec6ce2df478817;hp=03a358a0d3f1da9478ef220c3e93309298b469f7;hb=d79bd829001f60a92c9c88c857635b8543ccf7ef;hpb=e8b1187d0ff0323106069738b2fff5c9e5a7d9bb

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index 03a358a0d..c377509ab 100644
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -34,6 +34,7 @@
 #include <lttng/event-rule/event-rule-internal.h>
 #include <lttng/event-rule/userspace-probe-internal.h>
 
+#include "event-notifier-error-accounting.h"
 #include "lttng-sessiond.h"
 #include "lttng-syscall.h"
 #include "condition-internal.h"
@@ -41,6 +42,7 @@
 #include "kernel.h"
 #include "kernel-consumer.h"
 #include "kern-modules.h"
+#include "sessiond-config.h"
 #include "utils.h"
 #include "rotate.h"
 #include "modprobe.h"
@@ -767,14 +769,8 @@ int kernel_disable_event(struct ltt_kernel_event *event)
 
 	ret = kernctl_disable(event->fd);
 	if (ret < 0) {
-		switch (-ret) {
-		case EEXIST:
-			ret = LTTNG_ERR_KERN_EVENT_EXIST;
-			break;
-		default:
-			PERROR("disable kernel event");
-			break;
-		}
+		PERROR("Failed to disable kernel event: name = '%s', fd = %d",
+				event->event->name, event->fd);
 		goto error;
 	}
 
@@ -803,15 +799,8 @@ int kernel_disable_event_notifier_rule(struct ltt_kernel_event_notifier_rule *ev
 
 	ret = kernctl_disable(event->fd);
 	if (ret < 0) {
-		switch (-ret) {
-		case EEXIST:
-			ret = LTTNG_ERR_KERN_EVENT_EXIST;
-			break;
-		default:
-			PERROR("Failed to disable kernel event notifier: fd = %d, token = %" PRIu64,
-					event->fd, event->token);
-			break;
-		}
+		PERROR("Failed to disable kernel event notifier: fd = %d, token = %" PRIu64,
+				event->fd, event->token);
 		goto error;
 	}
 
@@ -1989,7 +1978,8 @@ int init_kernel_tracer(void)
 		WARN("Failed to create kernel event notifier group");
 		kernel_tracer_event_notifier_group_fd = -1;
 	} else {
-		const enum lttng_error_code error_code_ret =
+		enum event_notifier_error_accounting_status error_accounting_status;
+		enum lttng_error_code error_code_ret =
 				kernel_create_event_notifier_group_notification_fd(
 						&kernel_tracer_event_notifier_group_notification_fd);
 
@@ -1997,6 +1987,14 @@ int init_kernel_tracer(void)
 			goto error_modules;
 		}
 
+		error_accounting_status = event_notifier_error_accounting_register_kernel(
+				kernel_tracer_event_notifier_group_fd);
+		if (error_accounting_status != EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK) {
+			ERR("Failed to initialize event notifier error accounting for kernel tracer");
+			error_code_ret = LTTNG_ERR_EVENT_NOTIFIER_ERROR_ACCOUNTING;
+			goto error_modules;
+		}
+
 		kernel_token_to_event_notifier_rule_ht = cds_lfht_new(
 				DEFAULT_HT_SIZE, 1, 0,
 				CDS_LFHT_AUTO_RESIZE | CDS_LFHT_ACCOUNTING,
@@ -2025,6 +2023,7 @@ error_version:
 		PERROR("Failed to close kernel tracer file descriptor: fd = %d",
 				kernel_tracer_fd);
 	}
+
 	kernel_tracer_fd = -1;
 	return LTTNG_ERR_KERN_VERSION;
 
@@ -2036,6 +2035,8 @@ error_token_ht:
 				kernel_tracer_event_notifier_group_notification_fd);
 	}
 
+	kernel_tracer_event_notifier_group_notification_fd = -1;
+
 error_modules:
 	ret = close(kernel_tracer_event_notifier_group_fd);
 	if (ret) {
@@ -2043,12 +2044,16 @@ error_modules:
 				kernel_tracer_event_notifier_group_fd);
 	}
 
+	kernel_tracer_event_notifier_group_fd = -1;
+
 	ret = close(kernel_tracer_fd);
 	if (ret) {
 		PERROR("Failed to close kernel tracer file descriptor: fd = %d",
 				kernel_tracer_fd);
 	}
 
+	kernel_tracer_fd = -1;
+
 error_open:
 	modprobe_remove_lttng_control();
 
@@ -2113,8 +2118,6 @@ void cleanup_kernel_tracer(void)
 		kernel_tracer_fd = -1;
 	}
 
-	DBG("Unloading kernel modules");
-	modprobe_remove_lttng_all();
 	free(syscall_table);
 }
 
@@ -2322,6 +2325,7 @@ static enum lttng_error_code kernel_create_event_notifier_rule(
 	assert(event_rule_type != LTTNG_EVENT_RULE_TYPE_UNKNOWN);
 
 	error_code_ret = trace_kernel_create_event_notifier_rule(trigger, token,
+			lttng_condition_on_event_get_error_counter_index(condition),
 			&event_notifier_rule);
 	if (error_code_ret != LTTNG_OK) {
 		goto error;
@@ -2334,6 +2338,8 @@ static enum lttng_error_code kernel_create_event_notifier_rule(
 	}
 
 	kernel_event_notifier.event.token = event_notifier_rule->token;
+	kernel_event_notifier.error_counter_idx =
+			lttng_condition_on_event_get_error_counter_index(condition);
 
 	fd = kernctl_create_event_notifier(
 			kernel_tracer_event_notifier_group_fd,