struct itimerval;
struct itimerspec;
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0))
typedef __kernel_old_time_t time_t;
#endif
struct trace_syscall_entry {
void *event_func;
void *event_notifier_func;
- const struct lttng_event_desc *desc;
- const struct lttng_event_field *fields;
+ const struct lttng_kernel_event_desc *desc;
+ const struct lttng_kernel_event_field **fields;
unsigned int nrargs;
};
struct lttng_event *event;
lttng_syscall_get_arguments(current, regs, args);
- hlist_for_each_entry_rcu(event, unknown_action_list_head, u.syscall.node) {
+ lttng_hlist_for_each_entry_rcu(event, unknown_action_list_head, u.syscall.node) {
if (unlikely(in_compat_syscall()))
__event_probe__compat_syscall_entry_unknown(event, id, args);
else
{
void (*fptr)(void *__data) = func;
- hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
+ lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
fptr(event);
break;
}
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
+ lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
fptr(event, args[0]);
break;
}
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
+ lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
fptr(event, args[0], args[1]);
break;
}
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
+ lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
fptr(event, args[0], args[1], args[2]);
break;
}
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
+ lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
fptr(event, args[0], args[1], args[2], args[3]);
break;
}
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
+ lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
fptr(event, args[0], args[1], args[2], args[3], args[4]);
break;
}
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
+ lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
fptr(event, args[0], args[1], args[2],
args[3], args[4], args[5]);
break;
struct lttng_event *event;
lttng_syscall_get_arguments(current, regs, args);
- hlist_for_each_entry_rcu(event, unknown_action_list_head, u.syscall.node) {
+ lttng_hlist_for_each_entry_rcu(event, unknown_action_list_head, u.syscall.node) {
if (unlikely(in_compat_syscall()))
__event_probe__compat_syscall_exit_unknown(event, id, ret,
args);
{
void (*fptr)(void *__data, long ret) = func;
- hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
+ lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
fptr(event, ret);
break;
}
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
+ lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
fptr(event, ret, args[0]);
break;
}
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
+ lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
fptr(event, ret, args[0], args[1]);
break;
}
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
+ lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
fptr(event, ret, args[0], args[1], args[2]);
break;
}
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
+ lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
fptr(event, ret, args[0], args[1], args[2], args[3]);
break;
}
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
+ lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
fptr(event, ret, args[0], args[1], args[2], args[3], args[4]);
break;
}
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
+ lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
fptr(event, ret, args[0], args[1], args[2],
args[3], args[4], args[5]);
break;
/* Allocate events for each syscall matching enabler, insert into table */
for (i = 0; i < table_len; i++) {
- const struct lttng_event_desc *desc = table[i].desc;
+ const struct lttng_kernel_event_desc *desc = table[i].desc;
struct lttng_kernel_event ev;
struct lttng_event *event;
struct hlist_head *head;
*/
head = utils_borrow_hash_table_bucket(
session->events_ht.table, LTTNG_EVENT_HT_SIZE,
- desc->name);
+ desc->event_name);
lttng_hlist_for_each_entry(event, head, hlist) {
if (event->desc == desc
&& event->chan == event_enabler->chan)
ev.u.syscall.abi = LTTNG_KERNEL_SYSCALL_ABI_COMPAT;
break;
}
- strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN - 1);
+ strncpy(ev.name, desc->event_name, LTTNG_KERNEL_SYM_NAME_LEN - 1);
ev.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
ev.instrumentation = LTTNG_KERNEL_SYSCALL;
event = _lttng_event_create(chan, &ev, filter,
}
#endif
if (hlist_empty(&chan->sc_unknown)) {
- const struct lttng_event_desc *desc =
+ const struct lttng_kernel_event_desc *desc =
&__event_desc___syscall_entry_unknown;
struct lttng_event *event;
memset(&ev, 0, sizeof(ev));
- strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN);
+ strncpy(ev.name, desc->event_name, LTTNG_KERNEL_SYM_NAME_LEN);
ev.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
ev.instrumentation = LTTNG_KERNEL_SYSCALL;
ev.u.syscall.entryexit = LTTNG_KERNEL_SYSCALL_ENTRY;
}
if (hlist_empty(&chan->sc_compat_unknown)) {
- const struct lttng_event_desc *desc =
+ const struct lttng_kernel_event_desc *desc =
&__event_desc___compat_syscall_entry_unknown;
struct lttng_event *event;
memset(&ev, 0, sizeof(ev));
- strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN);
+ strncpy(ev.name, desc->event_name, LTTNG_KERNEL_SYM_NAME_LEN);
ev.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
ev.instrumentation = LTTNG_KERNEL_SYSCALL;
ev.u.syscall.entryexit = LTTNG_KERNEL_SYSCALL_ENTRY;
}
if (hlist_empty(&chan->compat_sc_exit_unknown)) {
- const struct lttng_event_desc *desc =
+ const struct lttng_kernel_event_desc *desc =
&__event_desc___compat_syscall_exit_unknown;
struct lttng_event *event;
memset(&ev, 0, sizeof(ev));
- strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN);
+ strncpy(ev.name, desc->event_name, LTTNG_KERNEL_SYM_NAME_LEN);
ev.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
ev.instrumentation = LTTNG_KERNEL_SYSCALL;
ev.u.syscall.entryexit = LTTNG_KERNEL_SYSCALL_EXIT;
}
if (hlist_empty(&chan->sc_exit_unknown)) {
- const struct lttng_event_desc *desc =
+ const struct lttng_kernel_event_desc *desc =
&__event_desc___syscall_exit_unknown;
struct lttng_event *event;
memset(&ev, 0, sizeof(ev));
- strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN);
+ strncpy(ev.name, desc->event_name, LTTNG_KERNEL_SYM_NAME_LEN);
ev.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
ev.instrumentation = LTTNG_KERNEL_SYSCALL;
ev.u.syscall.entryexit = LTTNG_KERNEL_SYSCALL_EXIT;
enum sc_type type)
{
struct lttng_event_notifier *notifier;
- const struct lttng_event_desc *desc;
+ const struct lttng_kernel_event_desc *desc;
struct lttng_event_notifier_group *group = event_notifier_enabler->group;
struct lttng_kernel_event_notifier event_notifier_param;
uint64_t user_token = event_notifier_enabler->base.user_token;
* Check if already created.
*/
head = utils_borrow_hash_table_bucket(group->event_notifiers_ht.table,
- LTTNG_EVENT_NOTIFIER_HT_SIZE, desc->name);
+ LTTNG_EVENT_NOTIFIER_HT_SIZE, desc->event_name);
lttng_hlist_for_each_entry(notifier, head, hlist) {
if (notifier->desc == desc &&
notifier->user_token == base_enabler->user_token)
goto end;
memset(&event_notifier_param, 0, sizeof(event_notifier_param));
- strncat(event_notifier_param.event.name, desc->name,
+ strncat(event_notifier_param.event.name, desc->event_name,
LTTNG_KERNEL_SYM_NAME_LEN - strlen(event_notifier_param.event.name) - 1);
event_notifier_param.event.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
event_notifier_param.event.instrumentation);
if (IS_ERR(notifier)) {
printk(KERN_INFO "Unable to create unknown notifier %s\n",
- desc->name);
+ desc->event_name);
ret = -ENOMEM;
goto end;
}
size_t table_len, enum sc_type type)
{
struct lttng_event_notifier_group *group = event_notifier_enabler->group;
- const struct lttng_event_desc *desc;
+ 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;
* Check if already created.
*/
head = utils_borrow_hash_table_bucket(group->event_notifiers_ht.table,
- LTTNG_EVENT_NOTIFIER_HT_SIZE, desc->name);
+ LTTNG_EVENT_NOTIFIER_HT_SIZE, desc->event_name);
lttng_hlist_for_each_entry(event_notifier, head, hlist) {
if (event_notifier->desc == desc
&& event_notifier->user_token == event_notifier_enabler->base.user_token)
event_notifier_param.event.u.syscall.abi = LTTNG_KERNEL_SYSCALL_ABI_COMPAT;
break;
}
- strncat(event_notifier_param.event.name, desc->name,
+ strncat(event_notifier_param.event.name, desc->event_name,
LTTNG_KERNEL_SYM_NAME_LEN - strlen(event_notifier_param.event.name) - 1);
event_notifier_param.event.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
event_notifier_param.event.instrumentation = LTTNG_KERNEL_SYSCALL;
filter, event_notifier_param.event.instrumentation);
if (IS_ERR(event_notifier)) {
printk(KERN_INFO "Unable to create event_notifier %s\n",
- desc->name);
+ desc->event_name);
ret = -ENOMEM;
goto end;
}
entry = &sc_table[i];
if (!entry->desc)
continue;
- it_name = entry->desc->name;
+ it_name = entry->desc->event_name;
it_name += strlen(SYSCALL_ENTRY_STR);
if (!strcmp(syscall_name, it_name)) {
syscall_nr = i;
entry = &compat_sc_table[i];
if (!entry->desc)
continue;
- it_name = entry->desc->name;
+ it_name = entry->desc->event_name;
it_name += strlen(COMPAT_SYSCALL_ENTRY_STR);
if (!strcmp(syscall_name, it_name)) {
syscall_nr = i;
WARN_ON_ONCE(notifier->instrumentation != LTTNG_KERNEL_SYSCALL);
ret = lttng_syscall_filter_enable(group->sc_filter,
- notifier->desc->name, notifier->u.syscall.abi,
+ notifier->desc->event_name, notifier->u.syscall.abi,
notifier->u.syscall.entryexit);
if (ret) {
goto end;
case LTTNG_SYSCALL_ABI_COMPAT:
dispatch_list = &group->event_notifier_compat_syscall_dispatch[syscall_id];
break;
+ default:
+ ret = -EINVAL;
+ goto end;
}
break;
case LTTNG_SYSCALL_EXIT:
case LTTNG_SYSCALL_ABI_COMPAT:
dispatch_list = &group->event_notifier_exit_compat_syscall_dispatch[syscall_id];
break;
+ default:
+ ret = -EINVAL;
+ goto end;
}
break;
+ default:
+ ret = -EINVAL;
+ goto end;
}
hlist_add_head_rcu(¬ifier->u.syscall.node, dispatch_list);
WARN_ON_ONCE(event->instrumentation != LTTNG_KERNEL_SYSCALL);
return lttng_syscall_filter_enable(channel->sc_filter,
- event->desc->name, event->u.syscall.abi,
+ event->desc->event_name, event->u.syscall.abi,
event->u.syscall.entryexit);
}
WARN_ON_ONCE(notifier->instrumentation != LTTNG_KERNEL_SYSCALL);
ret = lttng_syscall_filter_disable(group->sc_filter,
- notifier->desc->name, notifier->u.syscall.abi,
+ notifier->desc->event_name, notifier->u.syscall.abi,
notifier->u.syscall.entryexit);
WARN_ON_ONCE(ret != 0);
struct lttng_event *event)
{
return lttng_syscall_filter_disable(channel->sc_filter,
- event->desc->name, event->u.syscall.abi,
+ event->desc->event_name, event->u.syscall.abi,
event->u.syscall.entryexit);
}
return 0;
if (table == sc_table) {
index = entry - table;
- name = &entry->desc->name[strlen(SYSCALL_ENTRY_STR)];
+ name = &entry->desc->event_name[strlen(SYSCALL_ENTRY_STR)];
} else {
index = (entry - table) + ARRAY_SIZE(sc_table);
- name = &entry->desc->name[strlen(COMPAT_SYSCALL_ENTRY_STR)];
+ name = &entry->desc->event_name[strlen(COMPAT_SYSCALL_ENTRY_STR)];
}
seq_printf(m, "syscall { index = %lu; name = %s; bitness = %u; };\n",
index, name, bitness);