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)
{
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_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;
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
- && get_syscall_table_from_event(event_recorder_priv->parent.pub) == syscall_table)
+ 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)
found = true;
}
if (found)
}
syscall_table->sys_exit_registered = 1;
}
+
+ ret = lttng_syscalls_create_matching_event_notifiers(syscall_event_enabler);
+ if (ret)
+ return ret;
+
return ret;
}
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_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;
/*
* 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(group->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)
found = true;
}
if (found)
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 = _lttng_event_notifier_create(desc, user_token,
- error_counter_index, group, &event_notifier_param,
- event_notifier_param.event.instrumentation);
+ 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);
}
static int create_matching_event_notifiers(
- struct lttng_event_notifier_enabler *event_notifier_enabler,
+ 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_notifier_group *group = syscall_event_notifier_enabler->group;
const struct lttng_kernel_event_desc *desc;
- uint64_t user_token = event_notifier_enabler->parent.user_token;
- uint64_t error_counter_index = event_notifier_enabler->error_counter_index;
+ 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_kernel_event_notifier_private *event_notifier_priv;
+ 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;
}
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->parent.user_token)
+ head = utils_borrow_hash_table_bucket(group->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)
found = 1;
}
if (found)
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);
+ 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);
}
-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_event_enabler_common *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,
/*
* 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)
{
- struct lttng_kernel_syscall_table *syscall_table = &channel->priv->parent.syscall_table;
uint32_t len, sc_tables_len, bitmask_len;
int ret = 0, bit;
char *tmp_mask;