X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-syscalls.c;h=bc8e6e715ff3de73b9348984fc40a89afcdb75ee;hb=fd70f5a5f72ac11b36f67f3a4bdee03cd9a39648;hp=7fa6d7e517299924ac98d792c1ea7a760e8b9c9f;hpb=19bef247a29761d0f9ecca993e7088b46456f199;p=lttng-modules.git

diff --git a/src/lttng-syscalls.c b/src/lttng-syscalls.c
index 7fa6d7e5..bc8e6e71 100644
--- a/src/lttng-syscalls.c
+++ b/src/lttng-syscalls.c
@@ -527,26 +527,128 @@ struct lttng_kernel_syscall_table *get_syscall_table_from_event(struct lttng_ker
 	}
 }
 
+static
+void lttng_syscall_event_enabler_create_event(struct lttng_event_enabler_common *syscall_event_enabler,
+		const struct lttng_kernel_event_desc *desc, struct hlist_head *dispatch_table,
+		enum sc_type type, unsigned int syscall_nr)
+{
+	struct lttng_kernel_event_common *event;
+
+	switch (syscall_event_enabler->enabler_type) {
+	case LTTNG_EVENT_ENABLER_TYPE_RECORDER:
+	{
+		struct lttng_event_recorder_enabler *syscall_event_recorder_enabler =
+			container_of(syscall_event_enabler, struct lttng_event_recorder_enabler, parent);
+		struct lttng_event_recorder_enabler *event_recorder_enabler;
+		struct lttng_kernel_abi_event ev;
+
+		/* We need to create an event for this syscall/enabler. */
+		memset(&ev, 0, sizeof(ev));
+		switch (type) {
+		case SC_TYPE_ENTRY:
+			ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY;
+			ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE;
+			break;
+		case SC_TYPE_EXIT:
+			ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT;
+			ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE;
+			break;
+		case SC_TYPE_COMPAT_ENTRY:
+			ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY;
+			ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT;
+			break;
+		case SC_TYPE_COMPAT_EXIT:
+			ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT;
+			ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT;
+			break;
+		}
+		strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1);
+		ev.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0';
+		ev.instrumentation = LTTNG_KERNEL_ABI_SYSCALL;
+		event_recorder_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev,
+				syscall_event_recorder_enabler->chan);
+		WARN_ON_ONCE(!event_recorder_enabler);
+		if (!event_recorder_enabler)
+			return;
+		event = _lttng_kernel_event_create(&event_recorder_enabler->parent, desc);
+		WARN_ON_ONCE(!event || IS_ERR(event));
+		lttng_event_enabler_destroy(&event_recorder_enabler->parent);
+		if (!event || IS_ERR(event)) {
+			printk(KERN_INFO "Unable to create event recorder %s\n", desc->event_name);
+			return;
+		}
+		if (dispatch_table)
+			hlist_add_head_rcu(&event->priv->u.syscall.node, &dispatch_table[syscall_nr]);
+		break;
+	}
+	case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER:
+	{
+		struct lttng_event_notifier_enabler *syscall_event_notifier_enabler =
+			container_of(syscall_event_enabler, struct lttng_event_notifier_enabler, parent);
+		struct lttng_event_notifier_enabler *event_notifier_enabler;
+		struct lttng_kernel_abi_event_notifier event_notifier_param;
+		uint64_t user_token = syscall_event_enabler->user_token;
+		uint64_t error_counter_index = syscall_event_notifier_enabler->error_counter_index;
+
+		memset(&event_notifier_param, 0, sizeof(event_notifier_param));
+		switch (type) {
+		case SC_TYPE_ENTRY:
+			event_notifier_param.event.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY;
+			event_notifier_param.event.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE;
+			break;
+		case SC_TYPE_EXIT:
+			event_notifier_param.event.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT;
+			event_notifier_param.event.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE;
+			break;
+		case SC_TYPE_COMPAT_ENTRY:
+			event_notifier_param.event.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY;
+			event_notifier_param.event.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT;
+			break;
+		case SC_TYPE_COMPAT_EXIT:
+			event_notifier_param.event.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT;
+			event_notifier_param.event.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT;
+			break;
+		}
+		strncat(event_notifier_param.event.name, desc->event_name,
+			LTTNG_KERNEL_ABI_SYM_NAME_LEN - strlen(event_notifier_param.event.name) - 1);
+		event_notifier_param.event.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0';
+		event_notifier_param.event.instrumentation = LTTNG_KERNEL_ABI_SYSCALL;
+		event_notifier_param.event.token = user_token;
+		event_notifier_param.error_counter_index = error_counter_index;
+
+		event_notifier_enabler = lttng_event_notifier_enabler_create(LTTNG_ENABLER_FORMAT_NAME,
+				&event_notifier_param, syscall_event_notifier_enabler->group);
+		WARN_ON_ONCE(!event_notifier_enabler);
+		event = _lttng_kernel_event_create(&event_notifier_enabler->parent, desc);
+		WARN_ON_ONCE(!event || IS_ERR(event));
+		lttng_event_enabler_destroy(&event_notifier_enabler->parent);
+		if (!event || IS_ERR(event)) {
+			printk(KERN_INFO "Unable to create event notifier %s\n", desc->event_name);
+			return;
+		}
+		event->priv->u.syscall.syscall_id = syscall_nr;
+		break;
+	}
+	default:
+		break;
+	}
+}
+
 /*
  * noinline to diminish caller stack size.
  * Should be called with sessions lock held.
  */
 static
 int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *table, size_t table_len,
-	struct hlist_head *chan_table, struct lttng_event_recorder_enabler *syscall_event_enabler,
+	struct hlist_head *dispatch_table, struct lttng_event_recorder_enabler *syscall_event_enabler,
 	enum sc_type type)
 {
-	struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_enabler(&syscall_event_enabler->parent);
-	struct lttng_kernel_channel_buffer *chan = syscall_event_enabler->chan;
-	struct lttng_kernel_session *session = chan->parent.session;
+	struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(&syscall_event_enabler->parent);
 	unsigned int i;
 
 	/* Allocate events for each syscall matching enabler, insert into table */
 	for (i = 0; i < table_len; i++) {
 		const struct lttng_kernel_event_desc *desc = table[i].desc;
-		struct lttng_event_recorder_enabler *event_enabler;
-		struct lttng_kernel_abi_event ev;
-		struct lttng_kernel_event_recorder *event_recorder;
 		struct lttng_kernel_event_common_private *event_priv;
 		struct hlist_head *head;
 		bool found = false;
@@ -555,63 +657,21 @@ int lttng_create_syscall_event_if_missing(const struct trace_syscall_entry *tabl
 			/* Unknown syscall */
 			continue;
 		}
-		if (lttng_desc_match_enabler(desc,
-				lttng_event_recorder_enabler_as_enabler(syscall_event_enabler)) <= 0)
+		if (!lttng_desc_match_enabler(desc,
+				lttng_event_recorder_enabler_as_enabler(syscall_event_enabler)))
 			continue;
 		/*
 		 * Check if already created.
 		 */
-		head = utils_borrow_hash_table_bucket(
-			session->priv->events_ht.table, LTTNG_EVENT_HT_SIZE,
-			desc->event_name);
+		head = utils_borrow_hash_table_bucket(events_ht->table, LTTNG_EVENT_HT_SIZE, desc->event_name);
 		lttng_hlist_for_each_entry(event_priv, head, hlist_node) {
-			if (event_priv->desc == desc
-				&& get_syscall_table_from_event(event_priv->pub) == syscall_table)
+			if (lttng_event_enabler_desc_match_event(&syscall_event_enabler->parent, desc, event_priv->pub))
 				found = true;
 		}
 		if (found)
 			continue;
 
-		/* We need to create an event for this syscall/enabler. */
-		memset(&ev, 0, sizeof(ev));
-		switch (type) {
-		case SC_TYPE_ENTRY:
-			ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY;
-			ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE;
-			break;
-		case SC_TYPE_EXIT:
-			ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT;
-			ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE;
-			break;
-		case SC_TYPE_COMPAT_ENTRY:
-			ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY;
-			ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT;
-			break;
-		case SC_TYPE_COMPAT_EXIT:
-			ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT;
-			ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT;
-			break;
-		}
-		strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1);
-		ev.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0';
-		ev.instrumentation = LTTNG_KERNEL_ABI_SYSCALL;
-		event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, chan);
-		if (!event_enabler) {
-			return -ENOMEM;
-		}
-		event_recorder = _lttng_kernel_event_recorder_create(event_enabler, desc);
-		WARN_ON_ONCE(!event_recorder);
-		lttng_event_enabler_destroy(&event_enabler->parent);
-		if (IS_ERR(event_recorder)) {
-			/*
-			 * If something goes wrong in event registration
-			 * after the first one, we have no choice but to
-			 * leave the previous events in there, until
-			 * deleted by session teardown.
-			 */
-			return PTR_ERR(event_recorder);
-		}
-		hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan_table[i]);
+		lttng_syscall_event_enabler_create_event(&syscall_event_enabler->parent, desc, dispatch_table, type, i);
 	}
 	return 0;
 }
@@ -633,7 +693,7 @@ int lttng_syscalls_populate_events(struct lttng_event_enabler_common *syscall_ev
 	if (hlist_empty(&syscall_table->unknown_syscall_dispatch)) {
 		const struct lttng_kernel_event_desc *desc =
 			&__event_desc___syscall_entry_unknown;
-		struct lttng_kernel_event_recorder *event_recorder;
+		struct lttng_kernel_event_common *event;
 		struct lttng_event_recorder_enabler *event_enabler;
 
 		memset(&ev, 0, sizeof(ev));
@@ -646,19 +706,19 @@ int lttng_syscalls_populate_events(struct lttng_event_enabler_common *syscall_ev
 		if (!event_enabler) {
 			return -ENOMEM;
 		}
-		event_recorder = _lttng_kernel_event_recorder_create(event_enabler, desc);
+		event = _lttng_kernel_event_create(&event_enabler->parent, desc);
 		lttng_event_enabler_destroy(&event_enabler->parent);
-		WARN_ON_ONCE(!event_recorder);
-		if (IS_ERR(event_recorder)) {
-			return PTR_ERR(event_recorder);
+		WARN_ON_ONCE(!event);
+		if (IS_ERR(event)) {
+			return PTR_ERR(event);
 		}
-		hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &syscall_table->unknown_syscall_dispatch);
+		hlist_add_head(&event->priv->u.syscall.node, &syscall_table->unknown_syscall_dispatch);
 	}
 
 	if (hlist_empty(&syscall_table->compat_unknown_syscall_dispatch)) {
 		const struct lttng_kernel_event_desc *desc =
 			&__event_desc___compat_syscall_entry_unknown;
-		struct lttng_kernel_event_recorder *event_recorder;
+		struct lttng_kernel_event_common *event;
 		struct lttng_event_recorder_enabler *event_enabler;
 
 		memset(&ev, 0, sizeof(ev));
@@ -671,19 +731,19 @@ int lttng_syscalls_populate_events(struct lttng_event_enabler_common *syscall_ev
 		if (!event_enabler) {
 			return -ENOMEM;
 		}
-		event_recorder = _lttng_kernel_event_recorder_create(event_enabler, desc);
-		WARN_ON_ONCE(!event_recorder);
+		event = _lttng_kernel_event_create(&event_enabler->parent, desc);
+		WARN_ON_ONCE(!event);
 		lttng_event_enabler_destroy(&event_enabler->parent);
-		if (IS_ERR(event_recorder)) {
-			return PTR_ERR(event_recorder);
+		if (IS_ERR(event)) {
+			return PTR_ERR(event);
 		}
-		hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &syscall_table->compat_unknown_syscall_dispatch);
+		hlist_add_head(&event->priv->u.syscall.node, &syscall_table->compat_unknown_syscall_dispatch);
 	}
 
 	if (hlist_empty(&syscall_table->compat_unknown_syscall_exit_dispatch)) {
 		const struct lttng_kernel_event_desc *desc =
 			&__event_desc___compat_syscall_exit_unknown;
-		struct lttng_kernel_event_recorder *event_recorder;
+		struct lttng_kernel_event_common *event;
 		struct lttng_event_recorder_enabler *event_enabler;
 
 		memset(&ev, 0, sizeof(ev));
@@ -696,19 +756,19 @@ int lttng_syscalls_populate_events(struct lttng_event_enabler_common *syscall_ev
 		if (!event_enabler) {
 			return -ENOMEM;
 		}
-		event_recorder = _lttng_kernel_event_recorder_create(event_enabler, desc);
-		WARN_ON_ONCE(!event_recorder);
+		event = _lttng_kernel_event_create(&event_enabler->parent, desc);
+		WARN_ON_ONCE(!event);
 		lttng_event_enabler_destroy(&event_enabler->parent);
-		if (IS_ERR(event_recorder)) {
-			return PTR_ERR(event_recorder);
+		if (IS_ERR(event)) {
+			return PTR_ERR(event);
 		}
-		hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &syscall_table->compat_unknown_syscall_exit_dispatch);
+		hlist_add_head(&event->priv->u.syscall.node, &syscall_table->compat_unknown_syscall_exit_dispatch);
 	}
 
 	if (hlist_empty(&syscall_table->unknown_syscall_exit_dispatch)) {
 		const struct lttng_kernel_event_desc *desc =
 			&__event_desc___syscall_exit_unknown;
-		struct lttng_kernel_event_recorder *event_recorder;
+		struct lttng_kernel_event_common *event;
 		struct lttng_event_recorder_enabler *event_enabler;
 
 		memset(&ev, 0, sizeof(ev));
@@ -721,13 +781,13 @@ int lttng_syscalls_populate_events(struct lttng_event_enabler_common *syscall_ev
 		if (!event_enabler) {
 			return -ENOMEM;
 		}
-		event_recorder = _lttng_kernel_event_recorder_create(event_enabler, desc);
-		WARN_ON_ONCE(!event_recorder);
+		event = _lttng_kernel_event_create(&event_enabler->parent, desc);
+		WARN_ON_ONCE(!event);
 		lttng_event_enabler_destroy(&event_enabler->parent);
-		if (IS_ERR(event_recorder)) {
-			return PTR_ERR(event_recorder);
+		if (IS_ERR(event)) {
+			return PTR_ERR(event);
 		}
-		hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &syscall_table->unknown_syscall_exit_dispatch);
+		hlist_add_head(&event->priv->u.syscall.node, &syscall_table->unknown_syscall_exit_dispatch);
 	}
 
 	ret = lttng_create_syscall_event_if_missing(sc_table.table, sc_table.len,
@@ -755,7 +815,7 @@ int lttng_syscalls_populate_events(struct lttng_event_enabler_common *syscall_ev
 /*
  * Should be called with sessions lock held.
  */
-int lttng_syscalls_register_event(struct lttng_event_enabler_common *syscall_event_enabler)
+int lttng_event_enabler_create_syscall_events_if_missing(struct lttng_event_enabler_common *syscall_event_enabler)
 {
 	struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_enabler(syscall_event_enabler);
 	int ret;
@@ -800,7 +860,9 @@ int lttng_syscalls_register_event(struct lttng_event_enabler_common *syscall_eve
 	if (ret)
 		return ret;
 
-	wrapper_vmalloc_sync_mappings();
+	ret = lttng_syscalls_create_matching_event_notifiers(syscall_event_enabler);
+	if (ret)
+		return ret;
 
 	if (!syscall_table->sys_enter_registered) {
 		ret = lttng_wrapper_tracepoint_probe_register("sys_enter",
@@ -820,125 +882,68 @@ int lttng_syscalls_register_event(struct lttng_event_enabler_common *syscall_eve
 		syscall_table->sys_exit_registered = 1;
 	}
 
-	ret = lttng_syscalls_create_matching_event_notifiers(syscall_event_enabler);
-	if (ret)
-		return ret;
-
 	return ret;
 }
 
 static
-int create_unknown_event_notifier(
+void create_unknown_event_notifier(
 		struct lttng_event_notifier_enabler *event_notifier_enabler,
 		enum sc_type type)
 {
+	struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_enabler(&event_notifier_enabler->parent);
+	struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(&event_notifier_enabler->parent);
 	struct lttng_kernel_event_common_private *event_priv;
-	struct lttng_kernel_event_notifier *event_notifier;
 	const struct lttng_kernel_event_desc *desc;
-	struct lttng_event_notifier_group *group = event_notifier_enabler->group;
-	struct lttng_kernel_syscall_table *syscall_table = &group->syscall_table;
-	struct lttng_kernel_abi_event_notifier event_notifier_param;
-	uint64_t user_token = event_notifier_enabler->parent.user_token;
-	uint64_t error_counter_index = event_notifier_enabler->error_counter_index;
-	struct lttng_event_enabler_common *base_enabler = lttng_event_notifier_enabler_as_enabler(
-		event_notifier_enabler);
 	struct hlist_head *unknown_dispatch_list;
-	int ret = 0;
 	bool found = false;
-	enum lttng_kernel_abi_syscall_abi abi;
-	enum lttng_kernel_abi_syscall_entryexit entryexit;
 	struct hlist_head *head;
 
 	switch (type) {
 	case SC_TYPE_ENTRY:
 		desc = &__event_desc___syscall_entry_unknown;
 		unknown_dispatch_list = &syscall_table->unknown_syscall_dispatch;
-		entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY;
-		abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE;
 		break;
 	case SC_TYPE_EXIT:
 		desc = &__event_desc___syscall_exit_unknown;
 		unknown_dispatch_list = &syscall_table->unknown_syscall_exit_dispatch;
-		entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT;
-		abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE;
 		break;
 	case SC_TYPE_COMPAT_ENTRY:
 		desc = &__event_desc___compat_syscall_entry_unknown;
 		unknown_dispatch_list = &syscall_table->compat_unknown_syscall_dispatch;
-		entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY;
-		abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT;
 		break;
 	case SC_TYPE_COMPAT_EXIT:
 		desc = &__event_desc___compat_syscall_exit_unknown;
 		unknown_dispatch_list = &syscall_table->compat_unknown_syscall_exit_dispatch;
-		entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT;
-		abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT;
 		break;
 	default:
-		BUG_ON(1);
+		WARN_ON_ONCE(1);
 	}
 
 	/*
 	 * Check if already created.
 	 */
-	head = utils_borrow_hash_table_bucket(group->events_ht.table,
-		LTTNG_EVENT_HT_SIZE, desc->event_name);
+	head = utils_borrow_hash_table_bucket(events_ht->table, LTTNG_EVENT_HT_SIZE, desc->event_name);
 	lttng_hlist_for_each_entry(event_priv, head, hlist_node) {
-		if (event_priv->desc == desc &&
-				event_priv->user_token == base_enabler->user_token)
+		if (lttng_event_enabler_desc_match_event(&event_notifier_enabler->parent, desc, event_priv->pub))
 			found = true;
 	}
-	if (found)
-		goto end;
-
-	memset(&event_notifier_param, 0, sizeof(event_notifier_param));
-	strncat(event_notifier_param.event.name, desc->event_name,
-		LTTNG_KERNEL_ABI_SYM_NAME_LEN - strlen(event_notifier_param.event.name) - 1);
-
-	event_notifier_param.event.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0';
-
-	event_notifier_param.event.instrumentation = LTTNG_KERNEL_ABI_SYSCALL;
-	event_notifier_param.event.token = user_token;
-	event_notifier_param.event.u.syscall.abi = abi;
-	event_notifier_param.event.u.syscall.entryexit = entryexit;
-	event_notifier_param.error_counter_index = error_counter_index;
-
-	event_notifier_enabler = lttng_event_notifier_enabler_create(LTTNG_ENABLER_FORMAT_NAME,
-			&event_notifier_param, group);
-	WARN_ON_ONCE(!event_notifier_enabler);
-	event_notifier = _lttng_event_notifier_create(event_notifier_enabler, desc);
-	lttng_event_enabler_destroy(&event_notifier_enabler->parent);
-	if (IS_ERR(event_notifier)) {
-		printk(KERN_INFO "Unable to create unknown notifier %s\n",
-			desc->event_name);
-		ret = -ENOMEM;
-		goto end;
-	}
-
-	hlist_add_head_rcu(&event_notifier->priv->parent.u.syscall.node, unknown_dispatch_list);
-
-end:
-	return ret;
+	if (!found)
+		lttng_syscall_event_enabler_create_event(&event_notifier_enabler->parent, desc, unknown_dispatch_list, type, -1U);
 }
 
-static int create_matching_event_notifiers(
+static
+void create_matching_event_notifiers(
 		struct lttng_event_notifier_enabler *syscall_event_notifier_enabler,
 		const struct trace_syscall_entry *table,
 		size_t table_len, enum sc_type type)
 {
-	struct lttng_event_notifier_group *group = syscall_event_notifier_enabler->group;
+	struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(&syscall_event_notifier_enabler->parent);
 	const struct lttng_kernel_event_desc *desc;
-	uint64_t user_token = syscall_event_notifier_enabler->parent.user_token;
-	uint64_t error_counter_index = syscall_event_notifier_enabler->error_counter_index;
 	unsigned int i;
-	int ret = 0;
 
 	/* iterate over all syscall and create event_notifier that match */
 	for (i = 0; i < table_len; i++) {
-		struct lttng_event_notifier_enabler *event_notifier_enabler;
 		struct lttng_kernel_event_common_private *event_priv;
-		struct lttng_kernel_event_notifier *event_notifier;
-		struct lttng_kernel_abi_event_notifier event_notifier_param;
 		struct hlist_head *head;
 		int found = 0;
 
@@ -955,60 +960,16 @@ static int create_matching_event_notifiers(
 		/*
 		 * Check if already created.
 		 */
-		head = utils_borrow_hash_table_bucket(group->events_ht.table,
-			LTTNG_EVENT_HT_SIZE, desc->event_name);
+		head = utils_borrow_hash_table_bucket(events_ht->table, LTTNG_EVENT_HT_SIZE, desc->event_name);
 		lttng_hlist_for_each_entry(event_priv, head, hlist_node) {
-			if (event_priv->desc == desc
-				&& event_priv->user_token == syscall_event_notifier_enabler->parent.user_token)
+			if (lttng_event_enabler_desc_match_event(&syscall_event_notifier_enabler->parent, desc, event_priv->pub))
 				found = 1;
 		}
 		if (found)
 			continue;
 
-		memset(&event_notifier_param, 0, sizeof(event_notifier_param));
-		switch (type) {
-		case SC_TYPE_ENTRY:
-			event_notifier_param.event.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY;
-			event_notifier_param.event.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE;
-			break;
-		case SC_TYPE_EXIT:
-			event_notifier_param.event.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT;
-			event_notifier_param.event.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE;
-			break;
-		case SC_TYPE_COMPAT_ENTRY:
-			event_notifier_param.event.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY;
-			event_notifier_param.event.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT;
-			break;
-		case SC_TYPE_COMPAT_EXIT:
-			event_notifier_param.event.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT;
-			event_notifier_param.event.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT;
-			break;
-		}
-		strncat(event_notifier_param.event.name, desc->event_name,
-			LTTNG_KERNEL_ABI_SYM_NAME_LEN - strlen(event_notifier_param.event.name) - 1);
-		event_notifier_param.event.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0';
-		event_notifier_param.event.instrumentation = LTTNG_KERNEL_ABI_SYSCALL;
-		event_notifier_param.event.token = user_token;
-		event_notifier_param.error_counter_index = error_counter_index;
-
-		event_notifier_enabler = lttng_event_notifier_enabler_create(LTTNG_ENABLER_FORMAT_NAME,
-				&event_notifier_param, group);
-		WARN_ON_ONCE(!event_notifier_enabler);
-		event_notifier = _lttng_event_notifier_create(event_notifier_enabler, desc);
-		lttng_event_enabler_destroy(&event_notifier_enabler->parent);
-		if (IS_ERR(event_notifier)) {
-			printk(KERN_INFO "Unable to create event_notifier %s\n",
-				desc->event_name);
-			ret = -ENOMEM;
-			goto end;
-		}
-
-		event_notifier->priv->parent.u.syscall.syscall_id = i;
+		lttng_syscall_event_enabler_create_event(&syscall_event_notifier_enabler->parent, desc, NULL, type, i);
 	}
-
-end:
-	return ret;
-
 }
 
 static
@@ -1024,53 +985,25 @@ int lttng_syscalls_create_matching_event_notifiers(struct lttng_event_enabler_co
 	event_notifier_enabler = container_of(event_enabler, struct lttng_event_notifier_enabler, parent);
 
 	if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) {
-		ret = create_matching_event_notifiers(event_notifier_enabler,
+		create_matching_event_notifiers(event_notifier_enabler,
 			sc_table.table, sc_table.len, SC_TYPE_ENTRY);
-		if (ret)
-			goto end;
-
-		ret = create_matching_event_notifiers(event_notifier_enabler,
+		create_matching_event_notifiers(event_notifier_enabler,
 			compat_sc_table.table, compat_sc_table.len,
 			SC_TYPE_COMPAT_ENTRY);
-		if (ret)
-			goto end;
-
-		ret = create_unknown_event_notifier(event_notifier_enabler,
-				SC_TYPE_ENTRY);
-		if (ret)
-			goto end;
-
-		ret = create_unknown_event_notifier(event_notifier_enabler,
-				SC_TYPE_COMPAT_ENTRY);
-		if (ret)
-			goto end;
+		create_unknown_event_notifier(event_notifier_enabler, SC_TYPE_ENTRY);
+		create_unknown_event_notifier(event_notifier_enabler, SC_TYPE_COMPAT_ENTRY);
 	}
 
 	if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_EXIT || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) {
-		ret = create_matching_event_notifiers(event_notifier_enabler,
+		create_matching_event_notifiers(event_notifier_enabler,
 			sc_exit_table.table, sc_exit_table.len,
 			SC_TYPE_EXIT);
-		if (ret)
-			goto end;
-
-		ret = create_unknown_event_notifier(event_notifier_enabler,
-				SC_TYPE_EXIT);
-		if (ret)
-			goto end;
-
-		ret = create_matching_event_notifiers(event_notifier_enabler,
+		create_matching_event_notifiers(event_notifier_enabler,
 			compat_sc_exit_table.table, compat_sc_exit_table.len,
 			SC_TYPE_COMPAT_EXIT);
-		if (ret)
-			goto end;
-
-		ret = create_unknown_event_notifier(event_notifier_enabler,
-				SC_TYPE_COMPAT_EXIT);
-		if (ret)
-			goto end;
+		create_unknown_event_notifier(event_notifier_enabler, SC_TYPE_EXIT);
+		create_unknown_event_notifier(event_notifier_enabler, SC_TYPE_COMPAT_EXIT);
 	}
-
-end:
 	return ret;
 }
 
@@ -1403,6 +1336,29 @@ int lttng_syscall_filter_disable_event(struct lttng_kernel_event_common *event)
 	return 0;
 }
 
+void lttng_syscall_table_set_wildcard_all(struct lttng_event_enabler_common *event_enabler)
+{
+	struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_enabler(event_enabler);
+	enum lttng_kernel_abi_syscall_entryexit entryexit;
+	int enabled = event_enabler->enabled;
+
+	if (event_enabler->event_param.instrumentation != LTTNG_KERNEL_ABI_SYSCALL)
+		return;
+	if (event_enabler->event_param.u.syscall.abi != LTTNG_KERNEL_ABI_SYSCALL_ABI_ALL)
+		return;
+	if (event_enabler->event_param.u.syscall.match != LTTNG_KERNEL_ABI_SYSCALL_MATCH_NAME)
+		return;
+	if (strcmp(event_enabler->event_param.name, "*"))
+		return;
+
+	entryexit = event_enabler->event_param.u.syscall.entryexit;
+	if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT)
+		WRITE_ONCE(syscall_table->syscall_all_entry, enabled);
+
+	if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_EXIT || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT)
+		WRITE_ONCE(syscall_table->syscall_all_exit, enabled);
+}
+
 static
 const struct trace_syscall_entry *syscall_list_get_entry(loff_t *pos)
 {