void syscall_entry_event_probe(void *__data, struct pt_regs *regs, long id);
void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret);
-void syscall_entry_event_notifier_probe(void *__data, struct pt_regs *regs,
- long id);
-void syscall_exit_event_notifier_probe(void *__data, struct pt_regs *regs,
- long ret);
-
/*
* Forward declarations for old kernels.
*/
DECLARE_BITMAP(sc_compat_exit, NR_compat_syscalls);
};
+static
+int lttng_syscalls_create_matching_event_notifiers(struct lttng_event_enabler_common *event_enabler);
+
static void syscall_entry_event_unknown(struct hlist_head *unknown_action_list_head,
struct pt_regs *regs, long id)
{
void syscall_entry_event_probe(void *__data, struct pt_regs *regs, long id)
{
- struct lttng_kernel_channel_buffer *chan = __data;
+ struct lttng_kernel_syscall_table *syscall_table = __data;
struct hlist_head *action_list, *unknown_action_list;
const struct trace_syscall_entry *table, *entry;
size_t table_len;
if (unlikely(in_compat_syscall())) {
- struct lttng_syscall_filter *filter = chan->priv->parent.sc_filter;
+ struct lttng_syscall_filter *filter = syscall_table->sc_filter;
if (id < 0 || id >= NR_compat_syscalls
- || (!READ_ONCE(chan->priv->parent.syscall_all_entry) && !test_bit(id, filter->sc_compat_entry))) {
+ || (!READ_ONCE(syscall_table->syscall_all_entry) && !test_bit(id, filter->sc_compat_entry))) {
/* System call filtered out. */
return;
}
table = compat_sc_table.table;
table_len = compat_sc_table.len;
- unknown_action_list = &chan->priv->parent.sc_compat_unknown;
+ unknown_action_list = &syscall_table->compat_unknown_syscall_dispatch;
} else {
- struct lttng_syscall_filter *filter = chan->priv->parent.sc_filter;
+ struct lttng_syscall_filter *filter = syscall_table->sc_filter;
if (id < 0 || id >= NR_syscalls
- || (!READ_ONCE(chan->priv->parent.syscall_all_entry) && !test_bit(id, filter->sc_entry))) {
+ || (!READ_ONCE(syscall_table->syscall_all_entry) && !test_bit(id, filter->sc_entry))) {
/* System call filtered out. */
return;
}
table = sc_table.table;
table_len = sc_table.len;
- unknown_action_list = &chan->priv->parent.sc_unknown;
+ unknown_action_list = &syscall_table->unknown_syscall_dispatch;
}
if (unlikely(id < 0 || id >= table_len)) {
syscall_entry_event_unknown(unknown_action_list, regs, id);
}
if (unlikely(in_compat_syscall())) {
- action_list = &chan->priv->parent.compat_sc_table[id];
+ action_list = &syscall_table->compat_syscall_dispatch[id];
} else {
- action_list = &chan->priv->parent.sc_table[id];
+ action_list = &syscall_table->syscall_dispatch[id];
}
if (unlikely(hlist_empty(action_list)))
return;
syscall_entry_event_call_func(action_list, entry->event_func, entry->nrargs, regs);
}
-void syscall_entry_event_notifier_probe(void *__data, struct pt_regs *regs,
- long id)
-{
- struct lttng_event_notifier_group *group = __data;
- const struct trace_syscall_entry *table, *entry;
- struct hlist_head *dispatch_list, *unknown_dispatch_list;
- size_t table_len;
-
- if (unlikely(in_compat_syscall())) {
- struct lttng_syscall_filter *filter = group->sc_filter;
-
- if (id < 0 || id >= NR_compat_syscalls
- || (!READ_ONCE(group->syscall_all_entry) &&
- !test_bit(id, filter->sc_compat_entry))) {
- /* System call filtered out. */
- return;
- }
- table = compat_sc_table.table;
- table_len = compat_sc_table.len;
- unknown_dispatch_list = &group->event_notifier_compat_unknown_syscall_dispatch;
- } else {
- struct lttng_syscall_filter *filter = group->sc_filter;
-
- if (id < 0 || id >= NR_syscalls
- || (!READ_ONCE(group->syscall_all_entry) &&
- !test_bit(id, filter->sc_entry))) {
- /* System call filtered out. */
- return;
- }
- table = sc_table.table;
- table_len = sc_table.len;
- unknown_dispatch_list = &group->event_notifier_unknown_syscall_dispatch;
- }
- /* Check if the syscall id is out of bound. */
- if (unlikely(id < 0 || id >= table_len)) {
- syscall_entry_event_unknown(unknown_dispatch_list,
- regs, id);
- return;
- }
-
- entry = &table[id];
- if (!entry->event_func) {
- syscall_entry_event_unknown(unknown_dispatch_list,
- regs, id);
- return;
- }
-
- if (unlikely(in_compat_syscall())) {
- dispatch_list = &group->event_notifier_compat_syscall_dispatch[id];
- } else {
- dispatch_list = &group->event_notifier_syscall_dispatch[id];
- }
- if (unlikely(hlist_empty(dispatch_list)))
- return;
-
- syscall_entry_event_call_func(dispatch_list,
- entry->event_func, entry->nrargs, regs);
-}
-
static void syscall_exit_event_unknown(struct hlist_head *unknown_action_list_head,
struct pt_regs *regs, long id, long ret)
{
void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret)
{
- struct lttng_kernel_channel_buffer *chan = __data;
+ struct lttng_kernel_syscall_table *syscall_table = __data;
struct hlist_head *action_list, *unknown_action_list;
const struct trace_syscall_entry *table, *entry;
size_t table_len;
id = syscall_get_nr(current, regs);
if (unlikely(in_compat_syscall())) {
- struct lttng_syscall_filter *filter = chan->priv->parent.sc_filter;
+ struct lttng_syscall_filter *filter = syscall_table->sc_filter;
if (id < 0 || id >= NR_compat_syscalls
- || (!READ_ONCE(chan->priv->parent.syscall_all_exit) && !test_bit(id, filter->sc_compat_exit))) {
+ || (!READ_ONCE(syscall_table->syscall_all_exit) && !test_bit(id, filter->sc_compat_exit))) {
/* System call filtered out. */
return;
}
table = compat_sc_exit_table.table;
table_len = compat_sc_exit_table.len;
- unknown_action_list = &chan->priv->parent.compat_sc_exit_unknown;
+ unknown_action_list = &syscall_table->compat_unknown_syscall_exit_dispatch;
} else {
- struct lttng_syscall_filter *filter = chan->priv->parent.sc_filter;
+ struct lttng_syscall_filter *filter = syscall_table->sc_filter;
if (id < 0 || id >= NR_syscalls
- || (!READ_ONCE(chan->priv->parent.syscall_all_exit) && !test_bit(id, filter->sc_exit))) {
+ || (!READ_ONCE(syscall_table->syscall_all_exit) && !test_bit(id, filter->sc_exit))) {
/* System call filtered out. */
return;
}
table = sc_exit_table.table;
table_len = sc_exit_table.len;
- unknown_action_list = &chan->priv->parent.sc_exit_unknown;
+ unknown_action_list = &syscall_table->unknown_syscall_exit_dispatch;
}
if (unlikely(id < 0 || id >= table_len)) {
syscall_exit_event_unknown(unknown_action_list, regs, id, ret);
}
if (unlikely(in_compat_syscall())) {
- action_list = &chan->priv->parent.compat_sc_exit_table[id];
+ action_list = &syscall_table->compat_syscall_exit_dispatch[id];
} else {
- action_list = &chan->priv->parent.sc_exit_table[id];
+ action_list = &syscall_table->syscall_exit_dispatch[id];
}
if (unlikely(hlist_empty(action_list)))
return;
regs, ret);
}
-void syscall_exit_event_notifier_probe(void *__data, struct pt_regs *regs,
- long ret)
+static
+struct lttng_kernel_syscall_table *get_syscall_table_from_enabler(struct lttng_event_enabler_common *event_enabler)
{
- struct lttng_event_notifier_group *group = __data;
- const struct trace_syscall_entry *table, *entry;
- struct hlist_head *dispatch_list, *unknown_dispatch_list;
- size_t table_len;
- long id;
+ switch (event_enabler->enabler_type) {
+ case LTTNG_EVENT_ENABLER_TYPE_RECORDER:
+ {
+ struct lttng_event_recorder_enabler *event_recorder_enabler =
+ container_of(event_enabler, struct lttng_event_recorder_enabler, parent);
+ return &event_recorder_enabler->chan->priv->parent.syscall_table;
+ }
+ case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER:
+ {
+ struct lttng_event_notifier_enabler *event_notifier_enabler =
+ container_of(event_enabler, struct lttng_event_notifier_enabler, parent);
+ return &event_notifier_enabler->group->syscall_table;
+ }
+ default:
+ return NULL;
+ }
+}
- id = syscall_get_nr(current, regs);
+static
+struct lttng_kernel_syscall_table *get_syscall_table_from_event(struct lttng_kernel_event_common *event)
+{
+ switch (event->type) {
+ case LTTNG_KERNEL_EVENT_TYPE_RECORDER:
+ {
+ struct lttng_kernel_event_recorder *event_recorder =
+ container_of(event, struct lttng_kernel_event_recorder, parent);
+ return &event_recorder->chan->priv->parent.syscall_table;
+ }
+ case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER:
+ {
+ struct lttng_kernel_event_notifier *event_notifier =
+ container_of(event, struct lttng_kernel_event_notifier, parent);
+ return &event_notifier->priv->group->syscall_table;
+ }
+ default:
+ return NULL;
+ }
+}
- if (unlikely(in_compat_syscall())) {
- struct lttng_syscall_filter *filter = group->sc_filter;
+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;
- if (id < 0 || id >= NR_compat_syscalls
- || (!READ_ONCE(group->syscall_all_exit) &&
- !test_bit(id, filter->sc_compat_exit))) {
- /* System call filtered out. */
- return;
- }
- table = compat_sc_exit_table.table;
- table_len = compat_sc_exit_table.len;
- unknown_dispatch_list = &group->event_notifier_exit_compat_unknown_syscall_dispatch;
- } else {
- struct lttng_syscall_filter *filter = group->sc_filter;
+ 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;
- if (id < 0 || id >= NR_syscalls
- || (!READ_ONCE(group->syscall_all_exit) &&
- !test_bit(id, filter->sc_exit))) {
- /* System call filtered out. */
+ /* 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;
}
- table = sc_exit_table.table;
- table_len = sc_exit_table.len;
- unknown_dispatch_list = &group->event_notifier_exit_unknown_syscall_dispatch;
- }
- /* Check if the syscall id is out of bound. */
- if (unlikely(id < 0 || id >= table_len)) {
- syscall_exit_event_unknown(unknown_dispatch_list,
- regs, id, ret);
- return;
+ hlist_add_head(&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;
- entry = &table[id];
- if (!entry->event_func) {
- syscall_entry_event_unknown(unknown_dispatch_list,
- regs, id);
- return;
+ 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;
}
-
- if (unlikely(in_compat_syscall())) {
- dispatch_list = &group->event_notifier_exit_compat_syscall_dispatch[id];
- } else {
- dispatch_list = &group->event_notifier_exit_syscall_dispatch[id];
+ default:
+ break;
}
- if (unlikely(hlist_empty(dispatch_list)))
- return;
-
- syscall_exit_event_call_func(dispatch_list,
- entry->event_func, entry->nrargs, regs, ret);
}
+
/*
* 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_enabler *event_enabler,
+ struct hlist_head *dispatch_table, struct lttng_event_recorder_enabler *syscall_event_enabler,
enum sc_type type)
{
- struct lttng_kernel_channel_buffer *chan = 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_kernel_abi_event ev;
- struct lttng_kernel_event_recorder_private *event_recorder_priv;
- struct lttng_kernel_event_recorder *event_recorder;
+ struct lttng_kernel_event_common_private *event_priv;
struct hlist_head *head;
bool found = false;
/* Unknown syscall */
continue;
}
- if (lttng_desc_match_enabler(desc,
- lttng_event_enabler_as_enabler(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);
- lttng_hlist_for_each_entry(event_recorder_priv, head, hlist) {
- if (event_recorder_priv->parent.desc == desc
- && event_recorder_priv->pub->chan == event_enabler->chan)
+ 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 (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_recorder = _lttng_kernel_event_recorder_create(chan, &ev, desc, ev.instrumentation);
- WARN_ON_ONCE(!event_recorder);
- 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;
}
-/*
- * Should be called with sessions lock held.
- */
-int lttng_syscalls_register_event(struct lttng_event_enabler *event_enabler)
+static
+int lttng_syscalls_populate_events(struct lttng_event_enabler_common *syscall_event_enabler)
{
- struct lttng_kernel_channel_buffer *chan = event_enabler->chan;
+ 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;
- wrapper_vmalloc_sync_mappings();
-
- if (!chan->priv->parent.sc_table) {
- /* create syscall table mapping syscall to events */
- chan->priv->parent.sc_table = kzalloc(sizeof(struct lttng_kernel_event_recorder *)
- * sc_table.len, GFP_KERNEL);
- if (!chan->priv->parent.sc_table)
- return -ENOMEM;
- }
- if (!chan->priv->parent.sc_exit_table) {
- /* create syscall table mapping syscall to events */
- chan->priv->parent.sc_exit_table = kzalloc(sizeof(struct lttng_kernel_event_recorder *)
- * sc_exit_table.len, GFP_KERNEL);
- if (!chan->priv->parent.sc_exit_table)
- return -ENOMEM;
- }
-
-
-#ifdef CONFIG_COMPAT
- if (!chan->priv->parent.compat_sc_table) {
- /* create syscall table mapping compat syscall to events */
- chan->priv->parent.compat_sc_table = kzalloc(sizeof(struct lttng_kernel_event_recorder *)
- * compat_sc_table.len, GFP_KERNEL);
- if (!chan->priv->parent.compat_sc_table)
- return -ENOMEM;
- }
+ if (syscall_event_enabler->enabler_type != LTTNG_EVENT_ENABLER_TYPE_RECORDER)
+ return 0;
+ event_recorder_enabler = container_of(syscall_event_enabler, struct lttng_event_recorder_enabler, parent);
+ chan = event_recorder_enabler->chan;
- if (!chan->priv->parent.compat_sc_exit_table) {
- /* create syscall table mapping compat syscall to events */
- chan->priv->parent.compat_sc_exit_table = kzalloc(sizeof(struct lttng_kernel_event_recorder *)
- * compat_sc_exit_table.len, GFP_KERNEL);
- if (!chan->priv->parent.compat_sc_exit_table)
- return -ENOMEM;
- }
-#endif
- if (hlist_empty(&chan->priv->parent.sc_unknown)) {
+ 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));
strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN);
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_recorder = _lttng_kernel_event_recorder_create(chan, &ev, desc,
- ev.instrumentation);
- WARN_ON_ONCE(!event_recorder);
- if (IS_ERR(event_recorder)) {
- return PTR_ERR(event_recorder);
+ event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, chan);
+ if (!event_enabler) {
+ return -ENOMEM;
}
- hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan->priv->parent.sc_unknown);
+ 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(&chan->priv->parent.sc_compat_unknown)) {
+ 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));
strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN);
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_recorder = _lttng_kernel_event_recorder_create(chan, &ev, desc,
- ev.instrumentation);
- WARN_ON_ONCE(!event_recorder);
- if (IS_ERR(event_recorder)) {
- return PTR_ERR(event_recorder);
+ 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_recorder->priv->parent.u.syscall.node, &chan->priv->parent.sc_compat_unknown);
+ hlist_add_head(&event->priv->u.syscall.node, &syscall_table->compat_unknown_syscall_dispatch);
}
- if (hlist_empty(&chan->priv->parent.compat_sc_exit_unknown)) {
+ 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));
strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN);
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_recorder = _lttng_kernel_event_recorder_create(chan, &ev, desc,
- ev.instrumentation);
- WARN_ON_ONCE(!event_recorder);
- if (IS_ERR(event_recorder)) {
- return PTR_ERR(event_recorder);
+ 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_recorder->priv->parent.u.syscall.node, &chan->priv->parent.compat_sc_exit_unknown);
+ hlist_add_head(&event->priv->u.syscall.node, &syscall_table->compat_unknown_syscall_exit_dispatch);
}
- if (hlist_empty(&chan->priv->parent.sc_exit_unknown)) {
+ 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));
strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN);
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_recorder = _lttng_kernel_event_recorder_create(chan, &ev, desc,
- ev.instrumentation);
- WARN_ON_ONCE(!event_recorder);
- if (IS_ERR(event_recorder)) {
- return PTR_ERR(event_recorder);
+ event_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, chan);
+ if (!event_enabler) {
+ return -ENOMEM;
}
- hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan->priv->parent.sc_exit_unknown);
+ 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,
- chan->priv->parent.sc_table, event_enabler, SC_TYPE_ENTRY);
+ 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,
- chan->priv->parent.sc_exit_table, event_enabler, SC_TYPE_EXIT);
+ syscall_table->syscall_exit_dispatch, event_recorder_enabler, SC_TYPE_EXIT);
if (ret)
return ret;
#ifdef CONFIG_COMPAT
ret = lttng_create_syscall_event_if_missing(compat_sc_table.table, compat_sc_table.len,
- chan->priv->parent.compat_sc_table, event_enabler, SC_TYPE_COMPAT_ENTRY);
+ 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,
- chan->priv->parent.compat_sc_exit_table, event_enabler, SC_TYPE_COMPAT_EXIT);
+ syscall_table->compat_syscall_exit_dispatch, event_recorder_enabler, SC_TYPE_COMPAT_EXIT);
if (ret)
return ret;
#endif
-
- if (!chan->priv->parent.sc_filter) {
- chan->priv->parent.sc_filter = kzalloc(sizeof(struct lttng_syscall_filter),
- GFP_KERNEL);
- if (!chan->priv->parent.sc_filter)
- return -ENOMEM;
- }
-
- if (!chan->priv->parent.sys_enter_registered) {
- ret = lttng_wrapper_tracepoint_probe_register("sys_enter",
- (void *) syscall_entry_event_probe, chan);
- if (ret)
- return ret;
- chan->priv->parent.sys_enter_registered = 1;
- }
- /*
- * We change the name of sys_exit tracepoint due to namespace
- * conflict with sys_exit syscall entry.
- */
- if (!chan->priv->parent.sys_exit_registered) {
- ret = lttng_wrapper_tracepoint_probe_register("sys_exit",
- (void *) syscall_exit_event_probe, chan);
- if (ret) {
- WARN_ON_ONCE(lttng_wrapper_tracepoint_probe_unregister("sys_enter",
- (void *) syscall_entry_event_probe, chan));
- return ret;
- }
- chan->priv->parent.sys_exit_registered = 1;
- }
return ret;
}
/*
* Should be called with sessions lock held.
*/
-int lttng_syscalls_register_event_notifier(
- struct lttng_event_notifier_enabler *event_notifier_enabler)
+int lttng_event_enabler_create_syscall_events_if_missing(struct lttng_event_enabler_common *syscall_event_enabler)
{
- struct lttng_event_notifier_group *group = event_notifier_enabler->group;
- unsigned int i;
- int ret = 0;
-
- wrapper_vmalloc_sync_mappings();
+ struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_enabler(syscall_event_enabler);
+ int ret;
- if (!group->event_notifier_syscall_dispatch) {
- group->event_notifier_syscall_dispatch =
- kzalloc(sizeof(struct hlist_head) * sc_table.len,
- GFP_KERNEL);
- if (!group->event_notifier_syscall_dispatch)
+ if (!syscall_table->syscall_dispatch) {
+ /* create syscall table mapping syscall to events */
+ syscall_table->syscall_dispatch = kzalloc(sizeof(struct hlist_head) * sc_table.len, GFP_KERNEL);
+ if (!syscall_table->syscall_dispatch)
return -ENOMEM;
-
- /* Initialize all list_head */
- for (i = 0; i < sc_table.len; i++)
- INIT_HLIST_HEAD(&group->event_notifier_syscall_dispatch[i]);
-
- /* Init the unknown syscall notifier list. */
- INIT_HLIST_HEAD(&group->event_notifier_unknown_syscall_dispatch);
}
-
- if (!group->event_notifier_exit_syscall_dispatch) {
- group->event_notifier_exit_syscall_dispatch =
- kzalloc(sizeof(struct hlist_head) * sc_table.len,
- GFP_KERNEL);
- if (!group->event_notifier_exit_syscall_dispatch)
+ if (!syscall_table->syscall_exit_dispatch) {
+ /* create syscall table mapping syscall to events */
+ syscall_table->syscall_exit_dispatch = kzalloc(sizeof(struct hlist_head) * sc_exit_table.len, GFP_KERNEL);
+ if (!syscall_table->syscall_exit_dispatch)
return -ENOMEM;
-
- /* Initialize all list_head */
- for (i = 0; i < sc_table.len; i++)
- INIT_HLIST_HEAD(&group->event_notifier_exit_syscall_dispatch[i]);
-
- /* Init the unknown exit syscall notifier list. */
- INIT_HLIST_HEAD(&group->event_notifier_exit_unknown_syscall_dispatch);
}
+
#ifdef CONFIG_COMPAT
- if (!group->event_notifier_compat_syscall_dispatch) {
- group->event_notifier_compat_syscall_dispatch =
- kzalloc(sizeof(struct hlist_head) * compat_sc_table.len,
- GFP_KERNEL);
- if (!group->event_notifier_syscall_dispatch)
+ if (!syscall_table->compat_syscall_dispatch) {
+ /* create syscall table mapping compat syscall to events */
+ syscall_table->compat_syscall_dispatch = kzalloc(sizeof(struct hlist_head) * compat_sc_table.len, GFP_KERNEL);
+ if (!syscall_table->compat_syscall_dispatch)
return -ENOMEM;
-
- /* Initialize all list_head */
- for (i = 0; i < compat_sc_table.len; i++)
- INIT_HLIST_HEAD(&group->event_notifier_compat_syscall_dispatch[i]);
-
- /* Init the unknown syscall notifier list. */
- INIT_HLIST_HEAD(&group->event_notifier_compat_unknown_syscall_dispatch);
}
- if (!group->event_notifier_exit_compat_syscall_dispatch) {
- group->event_notifier_exit_compat_syscall_dispatch =
- kzalloc(sizeof(struct hlist_head) * compat_sc_exit_table.len,
- GFP_KERNEL);
- if (!group->event_notifier_exit_syscall_dispatch)
+ if (!syscall_table->compat_syscall_exit_dispatch) {
+ /* create syscall table mapping compat syscall to events */
+ syscall_table->compat_syscall_exit_dispatch = kzalloc(sizeof(struct hlist_head) * compat_sc_exit_table.len, GFP_KERNEL);
+ if (!syscall_table->compat_syscall_exit_dispatch)
return -ENOMEM;
-
- /* Initialize all list_head */
- for (i = 0; i < compat_sc_exit_table.len; i++)
- INIT_HLIST_HEAD(&group->event_notifier_exit_compat_syscall_dispatch[i]);
-
- /* Init the unknown exit syscall notifier list. */
- INIT_HLIST_HEAD(&group->event_notifier_exit_compat_unknown_syscall_dispatch);
}
#endif
-
- if (!group->sc_filter) {
- group->sc_filter = kzalloc(sizeof(struct lttng_syscall_filter),
+ if (!syscall_table->sc_filter) {
+ syscall_table->sc_filter = kzalloc(sizeof(struct lttng_syscall_filter),
GFP_KERNEL);
- if (!group->sc_filter)
+ if (!syscall_table->sc_filter)
return -ENOMEM;
}
- if (!group->sys_enter_registered) {
+ ret = lttng_syscalls_populate_events(syscall_event_enabler);
+ if (ret)
+ return ret;
+
+ 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",
- (void *) syscall_entry_event_notifier_probe, group);
+ (void *) syscall_entry_event_probe, syscall_table);
if (ret)
return ret;
- group->sys_enter_registered = 1;
+ syscall_table->sys_enter_registered = 1;
}
-
- if (!group->sys_exit_registered) {
+ if (!syscall_table->sys_exit_registered) {
ret = lttng_wrapper_tracepoint_probe_register("sys_exit",
- (void *) syscall_exit_event_notifier_probe, group);
+ (void *) syscall_exit_event_probe, syscall_table);
if (ret) {
WARN_ON_ONCE(lttng_wrapper_tracepoint_probe_unregister("sys_enter",
- (void *) syscall_entry_event_notifier_probe, group));
+ (void *) syscall_entry_event_probe, syscall_table));
return ret;
}
- group->sys_exit_registered = 1;
+ syscall_table->sys_exit_registered = 1;
}
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_event_notifier_private *event_notifier_priv;
- struct lttng_kernel_event_notifier *event_notifier;
+ 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 lttng_event_notifier_group *group = event_notifier_enabler->group;
- struct lttng_kernel_abi_event_notifier event_notifier_param;
- uint64_t user_token = event_notifier_enabler->base.user_token;
- uint64_t error_counter_index = event_notifier_enabler->error_counter_index;
- struct lttng_enabler *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 = &group->event_notifier_unknown_syscall_dispatch;
- entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY;
- abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE;
+ unknown_dispatch_list = &syscall_table->unknown_syscall_dispatch;
break;
case SC_TYPE_EXIT:
desc = &__event_desc___syscall_exit_unknown;
- unknown_dispatch_list = &group->event_notifier_exit_unknown_syscall_dispatch;
- entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT;
- abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE;
+ 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 = &group->event_notifier_compat_unknown_syscall_dispatch;
- entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY;
- abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT;
+ 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 = &group->event_notifier_exit_compat_unknown_syscall_dispatch;
- entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT;
- abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT;
+ unknown_dispatch_list = &syscall_table->compat_unknown_syscall_exit_dispatch;
break;
default:
- BUG_ON(1);
+ WARN_ON_ONCE(1);
}
/*
* Check if already created.
*/
- head = utils_borrow_hash_table_bucket(group->event_notifiers_ht.table,
- LTTNG_EVENT_NOTIFIER_HT_SIZE, desc->event_name);
- lttng_hlist_for_each_entry(event_notifier_priv, head, hlist) {
- if (event_notifier_priv->parent.desc == desc &&
- event_notifier_priv->parent.user_token == base_enabler->user_token)
+ 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)
- 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.u.syscall.abi = abi;
- event_notifier_param.event.u.syscall.entryexit = entryexit;
-
- event_notifier = _lttng_event_notifier_create(desc, user_token,
- error_counter_index, group, &event_notifier_param,
- event_notifier_param.event.instrumentation);
- 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(
- struct lttng_event_notifier_enabler *event_notifier_enabler,
+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 = 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 = event_notifier_enabler->base.user_token;
- uint64_t error_counter_index = 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_kernel_event_notifier_private *event_notifier_priv;
- struct lttng_kernel_event_notifier *event_notifier;
- struct lttng_kernel_abi_event_notifier event_notifier_param;
+ struct lttng_kernel_event_common_private *event_priv;
struct hlist_head *head;
int found = 0;
}
if (!lttng_desc_match_enabler(desc,
- lttng_event_notifier_enabler_as_enabler(event_notifier_enabler)))
+ lttng_event_notifier_enabler_as_enabler(syscall_event_notifier_enabler)))
continue;
/*
* Check if already created.
*/
- head = utils_borrow_hash_table_bucket(group->event_notifiers_ht.table,
- LTTNG_EVENT_NOTIFIER_HT_SIZE, desc->event_name);
- lttng_hlist_for_each_entry(event_notifier_priv, head, hlist) {
- if (event_notifier_priv->parent.desc == desc
- && event_notifier_priv->parent.user_token == event_notifier_enabler->base.user_token)
+ 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;
- 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 = _lttng_event_notifier_create(desc, user_token,
- error_counter_index, group, &event_notifier_param,
- event_notifier_param.event.instrumentation);
- 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;
-
}
-int lttng_syscalls_create_matching_event_notifiers(
- struct lttng_event_notifier_enabler *event_notifier_enabler)
+static
+int lttng_syscalls_create_matching_event_notifiers(struct lttng_event_enabler_common *event_enabler)
{
int ret;
- struct lttng_enabler *base_enabler =
- lttng_event_notifier_enabler_as_enabler(event_notifier_enabler);
enum lttng_kernel_abi_syscall_entryexit entryexit =
- base_enabler->event_param.u.syscall.entryexit;
+ event_enabler->event_param.u.syscall.entryexit;
+ struct lttng_event_notifier_enabler *event_notifier_enabler;
+
+ if (event_enabler->enabler_type != LTTNG_EVENT_ENABLER_TYPE_NOTIFIER)
+ return 0;
+ 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;
}
-/*
- * Unregister the syscall event_notifier probes from the callsites.
- */
-int lttng_syscalls_unregister_event_notifier_group(
- struct lttng_event_notifier_group *event_notifier_group)
-{
- int ret;
-
- /*
- * Only register the event_notifier probe on the `sys_enter` callsite for now.
- * At the moment, we don't think it's desirable to have one fired
- * event_notifier for the entry and one for the exit of a syscall.
- */
- if (event_notifier_group->sys_enter_registered) {
- ret = lttng_wrapper_tracepoint_probe_unregister("sys_enter",
- (void *) syscall_entry_event_notifier_probe, event_notifier_group);
- if (ret)
- return ret;
- event_notifier_group->sys_enter_registered = 0;
- }
- if (event_notifier_group->sys_exit_registered) {
- ret = lttng_wrapper_tracepoint_probe_unregister("sys_exit",
- (void *) syscall_exit_event_notifier_probe, event_notifier_group);
- if (ret)
- return ret;
- event_notifier_group->sys_enter_registered = 0;
- }
-
- kfree(event_notifier_group->event_notifier_syscall_dispatch);
- kfree(event_notifier_group->event_notifier_exit_syscall_dispatch);
-#ifdef CONFIG_COMPAT
- kfree(event_notifier_group->event_notifier_compat_syscall_dispatch);
- kfree(event_notifier_group->event_notifier_exit_compat_syscall_dispatch);
-#endif
- return 0;
-}
-
-int lttng_syscalls_unregister_channel(struct lttng_kernel_channel_buffer *chan)
+int lttng_syscalls_unregister_syscall_table(struct lttng_kernel_syscall_table *syscall_table)
{
int ret;
- if (!chan->priv->parent.sc_table)
+ if (!syscall_table->syscall_dispatch)
return 0;
- if (chan->priv->parent.sys_enter_registered) {
+ if (syscall_table->sys_enter_registered) {
ret = lttng_wrapper_tracepoint_probe_unregister("sys_enter",
- (void *) syscall_entry_event_probe, chan);
+ (void *) syscall_entry_event_probe, syscall_table);
if (ret)
return ret;
- chan->priv->parent.sys_enter_registered = 0;
+ syscall_table->sys_enter_registered = 0;
}
- if (chan->priv->parent.sys_exit_registered) {
+ if (syscall_table->sys_exit_registered) {
ret = lttng_wrapper_tracepoint_probe_unregister("sys_exit",
- (void *) syscall_exit_event_probe, chan);
+ (void *) syscall_exit_event_probe, syscall_table);
if (ret)
return ret;
- chan->priv->parent.sys_exit_registered = 0;
+ syscall_table->sys_exit_registered = 0;
}
return 0;
}
-int lttng_syscalls_destroy_event(struct lttng_kernel_channel_buffer *chan)
+int lttng_syscalls_destroy_syscall_table(struct lttng_kernel_syscall_table *syscall_table)
{
- kfree(chan->priv->parent.sc_table);
- kfree(chan->priv->parent.sc_exit_table);
+ kfree(syscall_table->syscall_dispatch);
+ kfree(syscall_table->syscall_exit_dispatch);
#ifdef CONFIG_COMPAT
- kfree(chan->priv->parent.compat_sc_table);
- kfree(chan->priv->parent.compat_sc_exit_table);
+ kfree(syscall_table->compat_syscall_dispatch);
+ kfree(syscall_table->compat_syscall_exit_dispatch);
#endif
- kfree(chan->priv->parent.sc_filter);
+ kfree(syscall_table->sc_filter);
return 0;
}
return 0;
}
-int lttng_syscall_filter_enable_event_notifier(
- struct lttng_kernel_event_notifier *event_notifier)
+int lttng_syscall_filter_enable_event(struct lttng_kernel_event_common *event)
{
- struct lttng_event_notifier_group *group = event_notifier->priv->group;
- unsigned int syscall_id = event_notifier->priv->parent.u.syscall.syscall_id;
- struct hlist_head *dispatch_list;
- int ret = 0;
+ struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_event(event);
+ int ret;
- WARN_ON_ONCE(event_notifier->priv->parent.instrumentation != LTTNG_KERNEL_ABI_SYSCALL);
+ WARN_ON_ONCE(event->priv->instrumentation != LTTNG_KERNEL_ABI_SYSCALL);
- ret = lttng_syscall_filter_enable(group->sc_filter,
- event_notifier->priv->parent.desc->event_name,
- event_notifier->priv->parent.u.syscall.abi,
- event_notifier->priv->parent.u.syscall.entryexit);
- if (ret) {
- goto end;
- }
+ ret = lttng_syscall_filter_enable(syscall_table->sc_filter,
+ event->priv->desc->event_name, event->priv->u.syscall.abi,
+ event->priv->u.syscall.entryexit);
+ if (ret)
+ return ret;
- switch (event_notifier->priv->parent.u.syscall.entryexit) {
- case LTTNG_SYSCALL_ENTRY:
- switch (event_notifier->priv->parent.u.syscall.abi) {
- case LTTNG_SYSCALL_ABI_NATIVE:
- dispatch_list = &group->event_notifier_syscall_dispatch[syscall_id];
- break;
- case LTTNG_SYSCALL_ABI_COMPAT:
- dispatch_list = &group->event_notifier_compat_syscall_dispatch[syscall_id];
- break;
- default:
- ret = -EINVAL;
- goto end;
- }
+ switch (event->type) {
+ case LTTNG_KERNEL_EVENT_TYPE_RECORDER:
break;
- case LTTNG_SYSCALL_EXIT:
- switch (event_notifier->priv->parent.u.syscall.abi) {
- case LTTNG_SYSCALL_ABI_NATIVE:
- dispatch_list = &group->event_notifier_exit_syscall_dispatch[syscall_id];
+ case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER:
+ {
+ unsigned int syscall_id = event->priv->u.syscall.syscall_id;
+ struct hlist_head *dispatch_list;
+
+ switch (event->priv->u.syscall.entryexit) {
+ case LTTNG_SYSCALL_ENTRY:
+ switch (event->priv->u.syscall.abi) {
+ case LTTNG_SYSCALL_ABI_NATIVE:
+ dispatch_list = &syscall_table->syscall_dispatch[syscall_id];
+ break;
+ case LTTNG_SYSCALL_ABI_COMPAT:
+ dispatch_list = &syscall_table->compat_syscall_dispatch[syscall_id];
+ break;
+ default:
+ ret = -EINVAL;
+ goto end;
+ }
break;
- case LTTNG_SYSCALL_ABI_COMPAT:
- dispatch_list = &group->event_notifier_exit_compat_syscall_dispatch[syscall_id];
+ case LTTNG_SYSCALL_EXIT:
+ switch (event->priv->u.syscall.abi) {
+ case LTTNG_SYSCALL_ABI_NATIVE:
+ dispatch_list = &syscall_table->syscall_exit_dispatch[syscall_id];
+ break;
+ case LTTNG_SYSCALL_ABI_COMPAT:
+ dispatch_list = &syscall_table->compat_syscall_exit_dispatch[syscall_id];
+ break;
+ default:
+ ret = -EINVAL;
+ goto end;
+ }
break;
default:
ret = -EINVAL;
goto end;
}
+
+ hlist_add_head_rcu(&event->priv->u.syscall.node, dispatch_list);
break;
+ }
default:
- ret = -EINVAL;
- goto end;
+ WARN_ON_ONCE(1);
+ return -ENOSYS;
}
-
- hlist_add_head_rcu(&event_notifier->priv->parent.u.syscall.node, dispatch_list);
-
end:
- return ret ;
-}
-
-int lttng_syscall_filter_enable_event(
- struct lttng_kernel_channel_buffer *channel,
- struct lttng_kernel_event_recorder *event_recorder)
-{
- WARN_ON_ONCE(event_recorder->priv->parent.instrumentation != LTTNG_KERNEL_ABI_SYSCALL);
-
- return lttng_syscall_filter_enable(channel->priv->parent.sc_filter,
- event_recorder->priv->parent.desc->event_name,
- event_recorder->priv->parent.u.syscall.abi,
- event_recorder->priv->parent.u.syscall.entryexit);
+ return ret;
}
static
-int lttng_syscall_filter_disable(
- struct lttng_syscall_filter *filter,
+int lttng_syscall_filter_disable(struct lttng_syscall_filter *filter,
const char *desc_name, enum lttng_syscall_abi abi,
enum lttng_syscall_entryexit entryexit)
{
return 0;
}
-int lttng_syscall_filter_disable_event_notifier(
- struct lttng_kernel_event_notifier *event_notifier)
+int lttng_syscall_filter_disable_event(struct lttng_kernel_event_common *event)
{
- struct lttng_event_notifier_group *group = event_notifier->priv->group;
+ struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_event(event);
int ret;
- WARN_ON_ONCE(event_notifier->priv->parent.instrumentation != LTTNG_KERNEL_ABI_SYSCALL);
-
- ret = lttng_syscall_filter_disable(group->sc_filter,
- event_notifier->priv->parent.desc->event_name,
- event_notifier->priv->parent.u.syscall.abi,
- event_notifier->priv->parent.u.syscall.entryexit);
- WARN_ON_ONCE(ret != 0);
+ ret = lttng_syscall_filter_disable(syscall_table->sc_filter,
+ event->priv->desc->event_name, event->priv->u.syscall.abi,
+ event->priv->u.syscall.entryexit);
+ if (ret)
+ return ret;
- hlist_del_rcu(&event_notifier->priv->parent.u.syscall.node);
+ switch (event->type) {
+ case LTTNG_KERNEL_EVENT_TYPE_RECORDER:
+ break;
+ case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER:
+ {
+ hlist_del_rcu(&event->priv->u.syscall.node);
+ break;
+ }
+ default:
+ WARN_ON_ONCE(1);
+ return -ENOSYS;
+ }
return 0;
}
-int lttng_syscall_filter_disable_event(
- struct lttng_kernel_channel_buffer *channel,
- struct lttng_kernel_event_recorder *event_recorder)
+void lttng_syscall_table_set_wildcard_all(struct lttng_event_enabler_common *event_enabler)
{
- return lttng_syscall_filter_disable(channel->priv->parent.sc_filter,
- event_recorder->priv->parent.desc->event_name,
- event_recorder->priv->parent.u.syscall.abi,
- event_recorder->priv->parent.u.syscall.entryexit);
+ 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
/*
* A syscall is enabled if it is traced for either entry or exit.
*/
-long lttng_channel_syscall_mask(struct lttng_kernel_channel_buffer *channel,
+long lttng_syscall_table_get_active_mask(struct lttng_kernel_syscall_table *syscall_table,
struct lttng_kernel_abi_syscall_mask __user *usyscall_mask)
{
uint32_t len, sc_tables_len, bitmask_len;
tmp_mask = kzalloc(bitmask_len, GFP_KERNEL);
if (!tmp_mask)
return -ENOMEM;
- filter = channel->priv->parent.sc_filter;
+ filter = syscall_table->sc_filter;
for (bit = 0; bit < sc_table.len; bit++) {
char state;
- if (channel->priv->parent.sc_table) {
- if (!(READ_ONCE(channel->priv->parent.syscall_all_entry)
- || READ_ONCE(channel->priv->parent.syscall_all_exit)) && filter)
+ if (syscall_table->syscall_dispatch) {
+ if (!(READ_ONCE(syscall_table->syscall_all_entry)
+ || READ_ONCE(syscall_table->syscall_all_exit)) && filter)
state = test_bit(bit, filter->sc_entry)
|| test_bit(bit, filter->sc_exit);
else
for (; bit < sc_tables_len; bit++) {
char state;
- if (channel->priv->parent.compat_sc_table) {
- if (!(READ_ONCE(channel->priv->parent.syscall_all_entry)
- || READ_ONCE(channel->priv->parent.syscall_all_exit)) && filter)
+ if (syscall_table->compat_syscall_dispatch) {
+ if (!(READ_ONCE(syscall_table->syscall_all_entry)
+ || READ_ONCE(syscall_table->syscall_all_exit)) && filter)
state = test_bit(bit - sc_table.len,
filter->sc_compat_entry)
|| test_bit(bit - sc_table.len,