printk(KERN_INFO "Unable to create event recorder %s\n", desc->event_name);
return;
}
- hlist_add_head(&event->priv->u.syscall.node, &dispatch_table[syscall_nr]);
+ if (dispatch_table)
+ hlist_add_head_rcu(&event->priv->u.syscall.node, &dispatch_table[syscall_nr]);
break;
}
case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER:
return;
}
event->priv->u.syscall.syscall_id = syscall_nr;
+ if (dispatch_table)
+ hlist_add_head_rcu(&event->priv->u.syscall.node, dispatch_table);
break;
}
default:
}
}
-/*
- * 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 *dispatch_table, struct lttng_event_recorder_enabler *syscall_event_enabler,
- enum sc_type type)
+void lttng_syscall_event_enabler_create_matching_events(struct lttng_event_enabler_common *syscall_event_enabler_common,
+ const struct trace_syscall_entry *table,
+ size_t table_len,
+ struct hlist_head *dispatch_table,
+ enum sc_type type)
{
- struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(&syscall_event_enabler->parent);
+ struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(syscall_event_enabler_common);
+ const struct lttng_kernel_event_desc *desc;
unsigned int i;
- /* Allocate events for each syscall matching enabler, insert into table */
+ /* iterate over all syscall and create event_notifier that match */
for (i = 0; i < table_len; i++) {
- const struct lttng_kernel_event_desc *desc = table[i].desc;
struct lttng_kernel_event_common_private *event_priv;
struct hlist_head *head;
- bool found = false;
+ int found = 0;
+ desc = table[i].desc;
if (!desc) {
/* Unknown syscall */
continue;
}
- if (!lttng_desc_match_enabler(desc,
- lttng_event_recorder_enabler_as_enabler(syscall_event_enabler)))
+
+ if (!lttng_desc_match_enabler(desc, syscall_event_enabler_common))
continue;
+
/*
* Check if already created.
*/
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 (lttng_event_enabler_desc_match_event(&syscall_event_enabler->parent, desc, event_priv->pub))
- found = true;
+ if (lttng_event_enabler_desc_match_event(syscall_event_enabler_common, desc, event_priv->pub))
+ found = 1;
}
if (found)
continue;
- lttng_syscall_event_enabler_create_event(&syscall_event_enabler->parent, desc, dispatch_table, type, i);
+ lttng_syscall_event_enabler_create_event(syscall_event_enabler_common, desc, dispatch_table, type, i);
}
- return 0;
+}
+
+static
+bool lttng_syscall_event_enabler_is_wildcard_all(struct lttng_event_enabler_common *event_enabler)
+{
+ if (event_enabler->event_param.instrumentation != LTTNG_KERNEL_ABI_SYSCALL)
+ return false;
+ if (event_enabler->event_param.u.syscall.abi != LTTNG_KERNEL_ABI_SYSCALL_ABI_ALL)
+ return false;
+ if (event_enabler->event_param.u.syscall.match != LTTNG_KERNEL_ABI_SYSCALL_MATCH_NAME)
+ return false;
+ if (strcmp(event_enabler->event_param.name, "*"))
+ return false;
+ return true;
+}
+
+static
+void create_unknown_syscall_event(struct lttng_event_enabler_common *event_enabler, enum sc_type type)
+{
+ struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_enabler(event_enabler);
+ struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(event_enabler);
+ struct lttng_kernel_event_common_private *event_priv;
+ const struct lttng_kernel_event_desc *desc;
+ struct hlist_head *unknown_dispatch_list;
+ bool found = false;
+ struct hlist_head *head;
+
+ /*
+ * Considering that currently system calls can only be enabled on a per
+ * name basis (or wildcard based on a name), unknown syscall events are
+ * only used when matching *all* system calls, because this is the only
+ * case which can be associated with an unknown system call.
+ *
+ * When enabling system call on a per system call number basis will be
+ * supported, this will need to be revisited.
+ */
+ if (!lttng_syscall_event_enabler_is_wildcard_all(event_enabler))
+ return;
+
+ switch (type) {
+ case SC_TYPE_ENTRY:
+ desc = &__event_desc___syscall_entry_unknown;
+ unknown_dispatch_list = &syscall_table->unknown_syscall_dispatch;
+ break;
+ case SC_TYPE_EXIT:
+ desc = &__event_desc___syscall_exit_unknown;
+ unknown_dispatch_list = &syscall_table->unknown_syscall_exit_dispatch;
+ break;
+ case SC_TYPE_COMPAT_ENTRY:
+ desc = &__event_desc___compat_syscall_entry_unknown;
+ unknown_dispatch_list = &syscall_table->compat_unknown_syscall_dispatch;
+ break;
+ case SC_TYPE_COMPAT_EXIT:
+ desc = &__event_desc___compat_syscall_exit_unknown;
+ unknown_dispatch_list = &syscall_table->compat_unknown_syscall_exit_dispatch;
+ break;
+ default:
+ WARN_ON_ONCE(1);
+ }
+
+ /*
+ * Check if already created.
+ */
+ 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 (lttng_event_enabler_desc_match_event(event_enabler, desc, event_priv->pub))
+ found = true;
+ }
+ if (!found)
+ lttng_syscall_event_enabler_create_event(event_enabler, desc, unknown_dispatch_list, type, -1U);
}
static
struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_enabler(syscall_event_enabler);
struct lttng_event_recorder_enabler *event_recorder_enabler;
struct lttng_kernel_channel_buffer *chan;
- struct lttng_kernel_abi_event ev;
int ret;
if (syscall_event_enabler->enabler_type != LTTNG_EVENT_ENABLER_TYPE_RECORDER)
event_recorder_enabler = container_of(syscall_event_enabler, struct lttng_event_recorder_enabler, parent);
chan = event_recorder_enabler->chan;
- if (hlist_empty(&syscall_table->unknown_syscall_dispatch)) {
- const struct lttng_kernel_event_desc *desc =
- &__event_desc___syscall_entry_unknown;
- struct lttng_kernel_event_common *event;
- struct lttng_event_recorder_enabler *event_enabler;
-
- memset(&ev, 0, sizeof(ev));
- strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN);
- ev.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0';
- ev.instrumentation = LTTNG_KERNEL_ABI_SYSCALL;
- ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY;
- ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE;
- event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, chan);
- if (!event_enabler) {
- return -ENOMEM;
- }
- event = _lttng_kernel_event_create(&event_enabler->parent, desc);
- lttng_event_enabler_destroy(&event_enabler->parent);
- WARN_ON_ONCE(!event);
- if (IS_ERR(event)) {
- return PTR_ERR(event);
- }
- 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_common *event;
- struct lttng_event_recorder_enabler *event_enabler;
-
- memset(&ev, 0, sizeof(ev));
- strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN);
- ev.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0';
- ev.instrumentation = LTTNG_KERNEL_ABI_SYSCALL;
- ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY;
- ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT;
- event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, chan);
- if (!event_enabler) {
- return -ENOMEM;
- }
- event = _lttng_kernel_event_create(&event_enabler->parent, desc);
- WARN_ON_ONCE(!event);
- lttng_event_enabler_destroy(&event_enabler->parent);
- if (IS_ERR(event)) {
- return PTR_ERR(event);
- }
- 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_common *event;
- struct lttng_event_recorder_enabler *event_enabler;
-
- memset(&ev, 0, sizeof(ev));
- strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN);
- ev.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0';
- ev.instrumentation = LTTNG_KERNEL_ABI_SYSCALL;
- ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT;
- ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT;
- event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, chan);
- if (!event_enabler) {
- return -ENOMEM;
- }
- event = _lttng_kernel_event_create(&event_enabler->parent, desc);
- WARN_ON_ONCE(!event);
- lttng_event_enabler_destroy(&event_enabler->parent);
- if (IS_ERR(event)) {
- return PTR_ERR(event);
- }
- 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_common *event;
- struct lttng_event_recorder_enabler *event_enabler;
-
- memset(&ev, 0, sizeof(ev));
- strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN);
- ev.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0';
- ev.instrumentation = LTTNG_KERNEL_ABI_SYSCALL;
- ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT;
- ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE;
- event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, chan);
- if (!event_enabler) {
- return -ENOMEM;
- }
- event = _lttng_kernel_event_create(&event_enabler->parent, desc);
- WARN_ON_ONCE(!event);
- lttng_event_enabler_destroy(&event_enabler->parent);
- if (IS_ERR(event)) {
- return PTR_ERR(event);
- }
- 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,
- syscall_table->syscall_dispatch, event_recorder_enabler, SC_TYPE_ENTRY);
- if (ret)
- return ret;
- ret = lttng_create_syscall_event_if_missing(sc_exit_table.table, sc_exit_table.len,
- syscall_table->syscall_exit_dispatch, event_recorder_enabler, SC_TYPE_EXIT);
- if (ret)
- return ret;
+ lttng_syscall_event_enabler_create_matching_events(&event_recorder_enabler->parent, sc_table.table, sc_table.len,
+ syscall_table->syscall_dispatch, SC_TYPE_ENTRY);
+ lttng_syscall_event_enabler_create_matching_events(&event_recorder_enabler->parent, sc_exit_table.table, sc_exit_table.len,
+ syscall_table->syscall_exit_dispatch, SC_TYPE_EXIT);
+ create_unknown_syscall_event(syscall_event_enabler, SC_TYPE_ENTRY);
+ create_unknown_syscall_event(syscall_event_enabler, SC_TYPE_EXIT);
#ifdef CONFIG_COMPAT
- ret = lttng_create_syscall_event_if_missing(compat_sc_table.table, compat_sc_table.len,
- syscall_table->compat_syscall_dispatch, event_recorder_enabler, SC_TYPE_COMPAT_ENTRY);
- if (ret)
- return ret;
- ret = lttng_create_syscall_event_if_missing(compat_sc_exit_table.table, compat_sc_exit_table.len,
- syscall_table->compat_syscall_exit_dispatch, event_recorder_enabler, SC_TYPE_COMPAT_EXIT);
- if (ret)
- return ret;
+ lttng_syscall_event_enabler_create_matching_events(&event_recorder_enabler->parent, compat_sc_table.table, compat_sc_table.len,
+ syscall_table->compat_syscall_dispatch, SC_TYPE_COMPAT_ENTRY);
+ lttng_syscall_event_enabler_create_matching_events(&event_recorder_enabler->parent, compat_sc_exit_table.table, compat_sc_exit_table.len,
+ syscall_table->compat_syscall_exit_dispatch, SC_TYPE_COMPAT_EXIT);
+ create_unknown_syscall_event(syscall_event_enabler, SC_TYPE_COMPAT_ENTRY);
+ create_unknown_syscall_event(syscall_event_enabler, SC_TYPE_COMPAT_EXIT);
#endif
return ret;
}
return ret;
}
-static
-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;
- const struct lttng_kernel_event_desc *desc;
- struct hlist_head *unknown_dispatch_list;
- bool found = false;
- struct hlist_head *head;
-
- switch (type) {
- case SC_TYPE_ENTRY:
- desc = &__event_desc___syscall_entry_unknown;
- unknown_dispatch_list = &syscall_table->unknown_syscall_dispatch;
- break;
- case SC_TYPE_EXIT:
- desc = &__event_desc___syscall_exit_unknown;
- unknown_dispatch_list = &syscall_table->unknown_syscall_exit_dispatch;
- break;
- case SC_TYPE_COMPAT_ENTRY:
- desc = &__event_desc___compat_syscall_entry_unknown;
- unknown_dispatch_list = &syscall_table->compat_unknown_syscall_dispatch;
- break;
- case SC_TYPE_COMPAT_EXIT:
- desc = &__event_desc___compat_syscall_exit_unknown;
- unknown_dispatch_list = &syscall_table->compat_unknown_syscall_exit_dispatch;
- break;
- default:
- WARN_ON_ONCE(1);
- }
-
- /*
- * Check if already created.
- */
- 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 (lttng_event_enabler_desc_match_event(&event_notifier_enabler->parent, desc, event_priv->pub))
- found = true;
- }
- if (!found)
- lttng_syscall_event_enabler_create_event(&event_notifier_enabler->parent, desc, unknown_dispatch_list, type, -1U);
-}
-
-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_ht *events_ht = lttng_get_event_ht_from_enabler(&syscall_event_notifier_enabler->parent);
- const struct lttng_kernel_event_desc *desc;
- unsigned int i;
-
- /* iterate over all syscall and create event_notifier that match */
- for (i = 0; i < table_len; i++) {
- struct lttng_kernel_event_common_private *event_priv;
- struct hlist_head *head;
- int found = 0;
-
- desc = table[i].desc;
- if (!desc) {
- /* Unknown syscall */
- continue;
- }
-
- if (!lttng_desc_match_enabler(desc,
- lttng_event_notifier_enabler_as_enabler(syscall_event_notifier_enabler)))
- continue;
-
- /*
- * Check if already created.
- */
- 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 (lttng_event_enabler_desc_match_event(&syscall_event_notifier_enabler->parent, desc, event_priv->pub))
- found = 1;
- }
- if (found)
- continue;
-
- lttng_syscall_event_enabler_create_event(&syscall_event_notifier_enabler->parent, desc, NULL, type, i);
- }
-}
-
static
int lttng_syscalls_create_matching_event_notifiers(struct lttng_event_enabler_common *event_enabler)
{
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) {
- create_matching_event_notifiers(event_notifier_enabler,
- sc_table.table, sc_table.len, SC_TYPE_ENTRY);
- create_matching_event_notifiers(event_notifier_enabler,
- compat_sc_table.table, compat_sc_table.len,
- SC_TYPE_COMPAT_ENTRY);
- create_unknown_event_notifier(event_notifier_enabler, SC_TYPE_ENTRY);
- create_unknown_event_notifier(event_notifier_enabler, SC_TYPE_COMPAT_ENTRY);
+ lttng_syscall_event_enabler_create_matching_events(&event_notifier_enabler->parent,
+ sc_table.table, sc_table.len, NULL, SC_TYPE_ENTRY);
+ lttng_syscall_event_enabler_create_matching_events(&event_notifier_enabler->parent,
+ compat_sc_table.table, compat_sc_table.len, NULL, SC_TYPE_COMPAT_ENTRY);
+ create_unknown_syscall_event(event_enabler, SC_TYPE_ENTRY);
+ create_unknown_syscall_event(event_enabler, SC_TYPE_COMPAT_ENTRY);
}
if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_EXIT || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) {
- create_matching_event_notifiers(event_notifier_enabler,
- sc_exit_table.table, sc_exit_table.len,
- SC_TYPE_EXIT);
- create_matching_event_notifiers(event_notifier_enabler,
- compat_sc_exit_table.table, compat_sc_exit_table.len,
- SC_TYPE_COMPAT_EXIT);
- create_unknown_event_notifier(event_notifier_enabler, SC_TYPE_EXIT);
- create_unknown_event_notifier(event_notifier_enabler, SC_TYPE_COMPAT_EXIT);
+ lttng_syscall_event_enabler_create_matching_events(&event_notifier_enabler->parent,
+ sc_exit_table.table, sc_exit_table.len, NULL, SC_TYPE_EXIT);
+ lttng_syscall_event_enabler_create_matching_events(&event_notifier_enabler->parent,
+ compat_sc_exit_table.table, compat_sc_exit_table.len, NULL, SC_TYPE_COMPAT_EXIT);
+ create_unknown_syscall_event(event_enabler, SC_TYPE_EXIT);
+ create_unknown_syscall_event(event_enabler, SC_TYPE_COMPAT_EXIT);
}
return ret;
}
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)
+ if (!lttng_syscall_event_enabler_is_wildcard_all(event_enabler))
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);