struct pt_regs *regs, long id)
{
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
- struct lttng_event *event;
+ struct lttng_kernel_event_common_private *event_priv;
lttng_syscall_get_arguments(current, regs, args);
- lttng_hlist_for_each_entry_rcu(event, unknown_action_list_head, u.syscall.node) {
+ lttng_hlist_for_each_entry_rcu(event_priv, unknown_action_list_head, u.syscall.node) {
+ struct lttng_kernel_event_recorder_private *event_recorder_priv =
+ container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
+ struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
+
if (unlikely(in_compat_syscall()))
- __event_probe__compat_syscall_entry_unknown(event, id, args);
+ __event_probe__compat_syscall_entry_unknown(event_recorder, id, args);
else
- __event_probe__syscall_entry_unknown(event, id, args);
+ __event_probe__syscall_entry_unknown(event_recorder, id, args);
}
}
struct pt_regs *regs, long id)
{
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
- struct lttng_event_notifier *notifier;
+ struct lttng_kernel_event_common_private *event_priv;
lttng_syscall_get_arguments(current, regs, args);
- lttng_hlist_for_each_entry_rcu(notifier, unknown_dispatch_list_head, u.syscall.node) {
+ lttng_hlist_for_each_entry_rcu(event_priv, unknown_dispatch_list_head, u.syscall.node) {
+ struct lttng_kernel_event_notifier_private *event_notifier_priv =
+ container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
+ struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
+
if (unlikely(in_compat_syscall()))
- __event_notifier_probe__compat_syscall_entry_unknown(notifier, id, args);
+ __event_notifier_probe__compat_syscall_entry_unknown(event_notifier, id, args);
else
- __event_notifier_probe__syscall_entry_unknown(notifier, id, args);
+ __event_notifier_probe__syscall_entry_unknown(event_notifier, id, args);
}
}
struct pt_regs *regs, long id, long ret)
{
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
- struct lttng_event_notifier *notifier;
+ struct lttng_kernel_event_common_private *event_priv;
lttng_syscall_get_arguments(current, regs, args);
- lttng_hlist_for_each_entry_rcu(notifier, unknown_dispatch_list_head, u.syscall.node) {
+ lttng_hlist_for_each_entry_rcu(event_priv, unknown_dispatch_list_head, u.syscall.node) {
+ struct lttng_kernel_event_notifier_private *event_notifier_priv =
+ container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
+ struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
+
if (unlikely(in_compat_syscall()))
- __event_notifier_probe__compat_syscall_exit_unknown(notifier, id, ret, args);
+ __event_notifier_probe__compat_syscall_exit_unknown(event_notifier, id, ret, args);
else
- __event_notifier_probe__syscall_exit_unknown(notifier, id, ret, args);
+ __event_notifier_probe__syscall_exit_unknown(event_notifier, id, ret, args);
}
}
void *func, unsigned int nrargs,
struct pt_regs *regs)
{
- struct lttng_event *event;
+ struct lttng_kernel_event_common_private *event_priv;
switch (nrargs) {
case 0:
{
void (*fptr)(void *__data) = func;
- lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
- fptr(event);
+ lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
+ struct lttng_kernel_event_recorder_private *event_recorder_priv =
+ container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
+ struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
+
+ fptr(event_recorder);
+ }
break;
}
case 1:
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
- fptr(event, args[0]);
+ lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
+ struct lttng_kernel_event_recorder_private *event_recorder_priv =
+ container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
+ struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
+
+ fptr(event_recorder, args[0]);
+ }
break;
}
case 2:
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
- fptr(event, args[0], args[1]);
+ lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
+ struct lttng_kernel_event_recorder_private *event_recorder_priv =
+ container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
+ struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
+
+ fptr(event_recorder, args[0], args[1]);
+ }
break;
}
case 3:
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
- fptr(event, args[0], args[1], args[2]);
+ lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
+ struct lttng_kernel_event_recorder_private *event_recorder_priv =
+ container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
+ struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
+
+ fptr(event_recorder, args[0], args[1], args[2]);
+ }
break;
}
case 4:
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
- fptr(event, args[0], args[1], args[2], args[3]);
+ lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
+ struct lttng_kernel_event_recorder_private *event_recorder_priv =
+ container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
+ struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
+
+ fptr(event_recorder, args[0], args[1], args[2], args[3]);
+ }
break;
}
case 5:
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
- fptr(event, args[0], args[1], args[2], args[3], args[4]);
+ lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
+ struct lttng_kernel_event_recorder_private *event_recorder_priv =
+ container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
+ struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
+
+ fptr(event_recorder, args[0], args[1], args[2], args[3], args[4]);
+ }
break;
}
case 6:
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
- fptr(event, args[0], args[1], args[2],
+ lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
+ struct lttng_kernel_event_recorder_private *event_recorder_priv =
+ container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
+ struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
+
+ fptr(event_recorder, args[0], args[1], args[2],
args[3], args[4], args[5]);
+ }
break;
}
default:
void syscall_entry_event_notifier_call_func(struct hlist_head *dispatch_list,
void *func, unsigned int nrargs, struct pt_regs *regs)
{
- struct lttng_event_notifier *notifier;
+ struct lttng_kernel_event_common_private *event_priv;
switch (nrargs) {
case 0:
{
void (*fptr)(void *__data) = func;
- lttng_hlist_for_each_entry_rcu(notifier, dispatch_list, u.syscall.node)
- fptr(notifier);
+ lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
+ struct lttng_kernel_event_notifier_private *event_notifier_priv =
+ container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
+ struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
+
+ fptr(event_notifier);
+ }
break;
}
case 1:
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- lttng_hlist_for_each_entry_rcu(notifier, dispatch_list, u.syscall.node)
- fptr(notifier, args[0]);
+ lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
+ struct lttng_kernel_event_notifier_private *event_notifier_priv =
+ container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
+ struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
+
+ fptr(event_notifier, args[0]);
+ }
break;
}
case 2:
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- lttng_hlist_for_each_entry_rcu(notifier, dispatch_list, u.syscall.node)
- fptr(notifier, args[0], args[1]);
+ lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
+ struct lttng_kernel_event_notifier_private *event_notifier_priv =
+ container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
+ struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
+
+ fptr(event_notifier, args[0], args[1]);
+ }
break;
}
case 3:
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- lttng_hlist_for_each_entry_rcu(notifier, dispatch_list, u.syscall.node)
- fptr(notifier, args[0], args[1], args[2]);
+ lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
+ struct lttng_kernel_event_notifier_private *event_notifier_priv =
+ container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
+ struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
+
+ fptr(event_notifier, args[0], args[1], args[2]);
+ }
break;
}
case 4:
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- lttng_hlist_for_each_entry_rcu(notifier, dispatch_list, u.syscall.node)
- fptr(notifier, args[0], args[1], args[2], args[3]);
+ lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
+ struct lttng_kernel_event_notifier_private *event_notifier_priv =
+ container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
+ struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
+
+ fptr(event_notifier, args[0], args[1], args[2], args[3]);
+ }
break;
}
case 5:
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- lttng_hlist_for_each_entry_rcu(notifier, dispatch_list, u.syscall.node)
- fptr(notifier, args[0], args[1], args[2], args[3], args[4]);
+ lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
+ struct lttng_kernel_event_notifier_private *event_notifier_priv =
+ container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
+ struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
+
+ fptr(event_notifier, args[0], args[1], args[2], args[3], args[4]);
+ }
break;
}
case 6:
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- lttng_hlist_for_each_entry_rcu(notifier, dispatch_list, u.syscall.node)
- fptr(notifier, args[0], args[1], args[2], args[3], args[4], args[5]);
+ lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
+ struct lttng_kernel_event_notifier_private *event_notifier_priv =
+ container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
+ struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
+
+ fptr(event_notifier, args[0], args[1], args[2], args[3], args[4], args[5]);
+ }
break;
}
default:
struct pt_regs *regs, long id, long ret)
{
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
- struct lttng_event *event;
+ struct lttng_kernel_event_common_private *event_priv;
lttng_syscall_get_arguments(current, regs, args);
- lttng_hlist_for_each_entry_rcu(event, unknown_action_list_head, u.syscall.node) {
+ lttng_hlist_for_each_entry_rcu(event_priv, unknown_action_list_head, u.syscall.node) {
+ struct lttng_kernel_event_recorder_private *event_recorder_priv =
+ container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
+ struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
+
if (unlikely(in_compat_syscall()))
- __event_probe__compat_syscall_exit_unknown(event, id, ret,
+ __event_probe__compat_syscall_exit_unknown(event_recorder, id, ret,
args);
else
- __event_probe__syscall_exit_unknown(event, id, ret, args);
+ __event_probe__syscall_exit_unknown(event_recorder, id, ret, args);
}
}
void *func, unsigned int nrargs,
struct pt_regs *regs, long ret)
{
- struct lttng_event *event;
+ struct lttng_kernel_event_common_private *event_priv;
switch (nrargs) {
case 0:
{
void (*fptr)(void *__data, long ret) = func;
- lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
- fptr(event, ret);
+ lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
+ struct lttng_kernel_event_recorder_private *event_recorder_priv =
+ container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
+ struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
+
+ fptr(event_recorder, ret);
+ }
break;
}
case 1:
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
- fptr(event, ret, args[0]);
+ lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
+ struct lttng_kernel_event_recorder_private *event_recorder_priv =
+ container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
+ struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
+
+ fptr(event_recorder, ret, args[0]);
+ }
break;
}
case 2:
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
- fptr(event, ret, args[0], args[1]);
+ lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
+ struct lttng_kernel_event_recorder_private *event_recorder_priv =
+ container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
+ struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
+
+ fptr(event_recorder, ret, args[0], args[1]);
+ }
break;
}
case 3:
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
- fptr(event, ret, args[0], args[1], args[2]);
+ lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
+ struct lttng_kernel_event_recorder_private *event_recorder_priv =
+ container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
+ struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
+
+ fptr(event_recorder, ret, args[0], args[1], args[2]);
+ }
break;
}
case 4:
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
- fptr(event, ret, args[0], args[1], args[2], args[3]);
+ lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
+ struct lttng_kernel_event_recorder_private *event_recorder_priv =
+ container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
+ struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
+
+ fptr(event_recorder, ret, args[0], args[1], args[2], args[3]);
+ }
break;
}
case 5:
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- 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]);
+ lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
+ struct lttng_kernel_event_recorder_private *event_recorder_priv =
+ container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
+ struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
+
+ fptr(event_recorder, ret, args[0], args[1], args[2], args[3], args[4]);
+ }
break;
}
case 6:
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- lttng_hlist_for_each_entry_rcu(event, action_list, u.syscall.node)
- fptr(event, ret, args[0], args[1], args[2],
+ lttng_hlist_for_each_entry_rcu(event_priv, action_list, u.syscall.node) {
+ struct lttng_kernel_event_recorder_private *event_recorder_priv =
+ container_of(event_priv, struct lttng_kernel_event_recorder_private, parent);
+ struct lttng_kernel_event_recorder *event_recorder = event_recorder_priv->pub;
+
+ fptr(event_recorder, ret, args[0], args[1], args[2],
args[3], args[4], args[5]);
+ }
break;
}
default:
void syscall_exit_event_notifier_call_func(struct hlist_head *dispatch_list,
void *func, unsigned int nrargs, struct pt_regs *regs, long ret)
{
- struct lttng_event_notifier *notifier;
+ struct lttng_kernel_event_common_private *event_priv;
switch (nrargs) {
case 0:
{
void (*fptr)(void *__data, long ret) = func;
- lttng_hlist_for_each_entry_rcu(notifier, dispatch_list, u.syscall.node)
- fptr(notifier, ret);
+ lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
+ struct lttng_kernel_event_notifier_private *event_notifier_priv =
+ container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
+ struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
+
+ fptr(event_notifier, ret);
+ }
break;
}
case 1:
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- lttng_hlist_for_each_entry_rcu(notifier, dispatch_list, u.syscall.node)
- fptr(notifier, ret, args[0]);
+ lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
+ struct lttng_kernel_event_notifier_private *event_notifier_priv =
+ container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
+ struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
+
+ fptr(event_notifier, ret, args[0]);
+ }
break;
}
case 2:
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- lttng_hlist_for_each_entry_rcu(notifier, dispatch_list, u.syscall.node)
- fptr(notifier, ret, args[0], args[1]);
+ lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
+ struct lttng_kernel_event_notifier_private *event_notifier_priv =
+ container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
+ struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
+
+ fptr(event_notifier, ret, args[0], args[1]);
+ }
break;
}
case 3:
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- lttng_hlist_for_each_entry_rcu(notifier, dispatch_list, u.syscall.node)
- fptr(notifier, ret, args[0], args[1], args[2]);
+ lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
+ struct lttng_kernel_event_notifier_private *event_notifier_priv =
+ container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
+ struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
+
+ fptr(event_notifier, ret, args[0], args[1], args[2]);
+ }
break;
}
case 4:
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- lttng_hlist_for_each_entry_rcu(notifier, dispatch_list, u.syscall.node)
- fptr(notifier, ret, args[0], args[1], args[2], args[3]);
+ lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
+ struct lttng_kernel_event_notifier_private *event_notifier_priv =
+ container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
+ struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
+
+ fptr(event_notifier, ret, args[0], args[1], args[2], args[3]);
+ }
break;
}
case 5:
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- lttng_hlist_for_each_entry_rcu(notifier, dispatch_list, u.syscall.node)
- fptr(notifier, ret, args[0], args[1], args[2], args[3], args[4]);
+ lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
+ struct lttng_kernel_event_notifier_private *event_notifier_priv =
+ container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
+ struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
+
+ fptr(event_notifier, ret, args[0], args[1], args[2], args[3], args[4]);
+ }
break;
}
case 6:
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- lttng_hlist_for_each_entry_rcu(notifier, dispatch_list, u.syscall.node)
- fptr(notifier, ret, args[0], args[1], args[2], args[3], args[4], args[5]);
+ lttng_hlist_for_each_entry_rcu(event_priv, dispatch_list, u.syscall.node) {
+ struct lttng_kernel_event_notifier_private *event_notifier_priv =
+ container_of(event_priv, struct lttng_kernel_event_notifier_private, parent);
+ struct lttng_kernel_event_notifier *event_notifier = event_notifier_priv->pub;
+
+ fptr(event_notifier, ret, args[0], args[1], args[2], args[3], args[4], args[5]);
+ }
break;
}
default:
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,
- void *filter, enum sc_type type)
+ enum sc_type type)
{
struct lttng_channel *chan = event_enabler->chan;
struct lttng_session *session = chan->session;
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_event *event;
+ struct lttng_kernel_event_recorder_private *event_recorder_priv;
+ struct lttng_kernel_event_recorder *event_recorder;
struct hlist_head *head;
bool found = false;
head = utils_borrow_hash_table_bucket(
session->events_ht.table, LTTNG_EVENT_HT_SIZE,
desc->event_name);
- lttng_hlist_for_each_entry(event, head, hlist) {
- if (event->desc == desc
- && event->chan == event_enabler->chan)
+ 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)
found = true;
}
if (found)
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 = _lttng_event_create(chan, &ev, filter,
- desc, ev.instrumentation);
- WARN_ON_ONCE(!event);
- if (IS_ERR(event)) {
+ 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);
+ return PTR_ERR(event_recorder);
}
- hlist_add_head(&event->u.syscall.node, &chan_table[i]);
+ hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan_table[i]);
}
return 0;
}
/*
* Should be called with sessions lock held.
*/
-int lttng_syscalls_register_event(struct lttng_event_enabler *event_enabler, void *filter)
+int lttng_syscalls_register_event(struct lttng_event_enabler *event_enabler)
{
struct lttng_channel *chan = event_enabler->chan;
struct lttng_kernel_abi_event ev;
if (!chan->sc_table) {
/* create syscall table mapping syscall to events */
- chan->sc_table = kzalloc(sizeof(struct lttng_event *)
+ chan->sc_table = kzalloc(sizeof(struct lttng_kernel_event_recorder *)
* ARRAY_SIZE(sc_table), GFP_KERNEL);
if (!chan->sc_table)
return -ENOMEM;
}
if (!chan->sc_exit_table) {
/* create syscall table mapping syscall to events */
- chan->sc_exit_table = kzalloc(sizeof(struct lttng_event *)
+ chan->sc_exit_table = kzalloc(sizeof(struct lttng_kernel_event_recorder *)
* ARRAY_SIZE(sc_exit_table), GFP_KERNEL);
if (!chan->sc_exit_table)
return -ENOMEM;
#ifdef CONFIG_COMPAT
if (!chan->compat_sc_table) {
/* create syscall table mapping compat syscall to events */
- chan->compat_sc_table = kzalloc(sizeof(struct lttng_event *)
+ chan->compat_sc_table = kzalloc(sizeof(struct lttng_kernel_event_recorder *)
* ARRAY_SIZE(compat_sc_table), GFP_KERNEL);
if (!chan->compat_sc_table)
return -ENOMEM;
if (!chan->compat_sc_exit_table) {
/* create syscall table mapping compat syscall to events */
- chan->compat_sc_exit_table = kzalloc(sizeof(struct lttng_event *)
+ chan->compat_sc_exit_table = kzalloc(sizeof(struct lttng_kernel_event_recorder *)
* ARRAY_SIZE(compat_sc_exit_table), GFP_KERNEL);
if (!chan->compat_sc_exit_table)
return -ENOMEM;
if (hlist_empty(&chan->sc_unknown)) {
const struct lttng_kernel_event_desc *desc =
&__event_desc___syscall_entry_unknown;
- struct lttng_event *event;
+ struct lttng_kernel_event_recorder *event_recorder;
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 = _lttng_event_create(chan, &ev, filter, desc,
+ event_recorder = _lttng_kernel_event_recorder_create(chan, &ev, desc,
ev.instrumentation);
- WARN_ON_ONCE(!event);
- if (IS_ERR(event)) {
- return PTR_ERR(event);
+ WARN_ON_ONCE(!event_recorder);
+ if (IS_ERR(event_recorder)) {
+ return PTR_ERR(event_recorder);
}
- hlist_add_head(&event->u.syscall.node, &chan->sc_unknown);
+ hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan->sc_unknown);
}
if (hlist_empty(&chan->sc_compat_unknown)) {
const struct lttng_kernel_event_desc *desc =
&__event_desc___compat_syscall_entry_unknown;
- struct lttng_event *event;
+ struct lttng_kernel_event_recorder *event_recorder;
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 = _lttng_event_create(chan, &ev, filter, desc,
+ event_recorder = _lttng_kernel_event_recorder_create(chan, &ev, desc,
ev.instrumentation);
- WARN_ON_ONCE(!event);
- if (IS_ERR(event)) {
- return PTR_ERR(event);
+ WARN_ON_ONCE(!event_recorder);
+ if (IS_ERR(event_recorder)) {
+ return PTR_ERR(event_recorder);
}
- hlist_add_head(&event->u.syscall.node, &chan->sc_compat_unknown);
+ hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan->sc_compat_unknown);
}
if (hlist_empty(&chan->compat_sc_exit_unknown)) {
const struct lttng_kernel_event_desc *desc =
&__event_desc___compat_syscall_exit_unknown;
- struct lttng_event *event;
+ struct lttng_kernel_event_recorder *event_recorder;
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 = _lttng_event_create(chan, &ev, filter, desc,
+ event_recorder = _lttng_kernel_event_recorder_create(chan, &ev, desc,
ev.instrumentation);
- WARN_ON_ONCE(!event);
- if (IS_ERR(event)) {
- return PTR_ERR(event);
+ WARN_ON_ONCE(!event_recorder);
+ if (IS_ERR(event_recorder)) {
+ return PTR_ERR(event_recorder);
}
- hlist_add_head(&event->u.syscall.node, &chan->compat_sc_exit_unknown);
+ hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan->compat_sc_exit_unknown);
}
if (hlist_empty(&chan->sc_exit_unknown)) {
const struct lttng_kernel_event_desc *desc =
&__event_desc___syscall_exit_unknown;
- struct lttng_event *event;
+ struct lttng_kernel_event_recorder *event_recorder;
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 = _lttng_event_create(chan, &ev, filter, desc,
+ event_recorder = _lttng_kernel_event_recorder_create(chan, &ev, desc,
ev.instrumentation);
- WARN_ON_ONCE(!event);
- if (IS_ERR(event)) {
- return PTR_ERR(event);
+ WARN_ON_ONCE(!event_recorder);
+ if (IS_ERR(event_recorder)) {
+ return PTR_ERR(event_recorder);
}
- hlist_add_head(&event->u.syscall.node, &chan->sc_exit_unknown);
+ hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan->sc_exit_unknown);
}
ret = lttng_create_syscall_event_if_missing(sc_table, ARRAY_SIZE(sc_table),
- chan->sc_table, event_enabler, filter, SC_TYPE_ENTRY);
+ chan->sc_table, event_enabler, SC_TYPE_ENTRY);
if (ret)
return ret;
ret = lttng_create_syscall_event_if_missing(sc_exit_table, ARRAY_SIZE(sc_exit_table),
- chan->sc_exit_table, event_enabler, filter, SC_TYPE_EXIT);
+ chan->sc_exit_table, event_enabler, SC_TYPE_EXIT);
if (ret)
return ret;
#ifdef CONFIG_COMPAT
ret = lttng_create_syscall_event_if_missing(compat_sc_table, ARRAY_SIZE(compat_sc_table),
- chan->compat_sc_table, event_enabler, filter,
- SC_TYPE_COMPAT_ENTRY);
+ chan->compat_sc_table, event_enabler, SC_TYPE_COMPAT_ENTRY);
if (ret)
return ret;
ret = lttng_create_syscall_event_if_missing(compat_sc_exit_table, ARRAY_SIZE(compat_sc_exit_table),
- chan->compat_sc_exit_table, event_enabler, filter,
- SC_TYPE_COMPAT_EXIT);
+ chan->compat_sc_exit_table, event_enabler, SC_TYPE_COMPAT_EXIT);
if (ret)
return ret;
#endif
* Should be called with sessions lock held.
*/
int lttng_syscalls_register_event_notifier(
- struct lttng_event_notifier_enabler *event_notifier_enabler,
- void *filter)
+ struct lttng_event_notifier_enabler *event_notifier_enabler)
{
struct lttng_event_notifier_group *group = event_notifier_enabler->group;
unsigned int i;
struct lttng_event_notifier_enabler *event_notifier_enabler,
enum sc_type type)
{
- struct lttng_event_notifier *notifier;
+ struct lttng_kernel_event_notifier_private *event_notifier_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_abi_event_notifier event_notifier_param;
*/
head = utils_borrow_hash_table_bucket(group->event_notifiers_ht.table,
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)
+ 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)
found = true;
}
if (found)
event_notifier_param.event.u.syscall.abi = abi;
event_notifier_param.event.u.syscall.entryexit = entryexit;
- notifier = _lttng_event_notifier_create(desc, user_token,
- error_counter_index, group, &event_notifier_param, NULL,
+ event_notifier = _lttng_event_notifier_create(desc, user_token,
+ error_counter_index, group, &event_notifier_param,
event_notifier_param.event.instrumentation);
- if (IS_ERR(notifier)) {
+ 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(¬ifier->u.syscall.node, unknown_dispatch_list);
+ hlist_add_head_rcu(&event_notifier->priv->parent.u.syscall.node, unknown_dispatch_list);
end:
return ret;
static int create_matching_event_notifiers(
struct lttng_event_notifier_enabler *event_notifier_enabler,
- void *filter, const struct trace_syscall_entry *table,
+ const struct trace_syscall_entry *table,
size_t table_len, enum sc_type type)
{
struct lttng_event_notifier_group *group = event_notifier_enabler->group;
/* iterate over all syscall and create event_notifier that match */
for (i = 0; i < table_len; i++) {
- struct lttng_event_notifier *event_notifier;
+ 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 hlist_head *head;
int found = 0;
*/
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, head, hlist) {
- if (event_notifier->desc == desc
- && event_notifier->user_token == event_notifier_enabler->base.user_token)
+ 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)
found = 1;
}
if (found)
event_notifier = _lttng_event_notifier_create(desc, user_token,
error_counter_index, group, &event_notifier_param,
- filter, event_notifier_param.event.instrumentation);
+ event_notifier_param.event.instrumentation);
if (IS_ERR(event_notifier)) {
printk(KERN_INFO "Unable to create event_notifier %s\n",
desc->event_name);
goto end;
}
- event_notifier->u.syscall.syscall_id = i;
+ event_notifier->priv->parent.u.syscall.syscall_id = i;
}
end:
}
-int lttng_syscals_create_matching_event_notifiers(
- struct lttng_event_notifier_enabler *event_notifier_enabler,
- void *filter)
+int lttng_syscalls_create_matching_event_notifiers(
+ struct lttng_event_notifier_enabler *event_notifier_enabler)
{
int ret;
struct lttng_enabler *base_enabler =
if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) {
ret = create_matching_event_notifiers(event_notifier_enabler,
- filter, sc_table, ARRAY_SIZE(sc_table), SC_TYPE_ENTRY);
+ sc_table, ARRAY_SIZE(sc_table), SC_TYPE_ENTRY);
if (ret)
goto end;
ret = create_matching_event_notifiers(event_notifier_enabler,
- filter, compat_sc_table, ARRAY_SIZE(compat_sc_table),
+ compat_sc_table, ARRAY_SIZE(compat_sc_table),
SC_TYPE_COMPAT_ENTRY);
if (ret)
goto end;
if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_EXIT || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) {
ret = create_matching_event_notifiers(event_notifier_enabler,
- filter, sc_exit_table, ARRAY_SIZE(sc_exit_table),
+ sc_exit_table, ARRAY_SIZE(sc_exit_table),
SC_TYPE_EXIT);
if (ret)
goto end;
goto end;
ret = create_matching_event_notifiers(event_notifier_enabler,
- filter, compat_sc_exit_table, ARRAY_SIZE(compat_sc_exit_table),
+ compat_sc_exit_table, ARRAY_SIZE(compat_sc_exit_table),
SC_TYPE_COMPAT_EXIT);
if (ret)
goto end;
}
int lttng_syscall_filter_enable_event_notifier(
- struct lttng_event_notifier *notifier)
+ struct lttng_kernel_event_notifier *event_notifier)
{
- struct lttng_event_notifier_group *group = notifier->group;
- unsigned int syscall_id = notifier->u.syscall.syscall_id;
+ 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;
- WARN_ON_ONCE(notifier->instrumentation != LTTNG_KERNEL_ABI_SYSCALL);
+ WARN_ON_ONCE(event_notifier->priv->parent.instrumentation != LTTNG_KERNEL_ABI_SYSCALL);
ret = lttng_syscall_filter_enable(group->sc_filter,
- notifier->desc->event_name, notifier->u.syscall.abi,
- notifier->u.syscall.entryexit);
+ 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;
}
- switch (notifier->u.syscall.entryexit) {
+ switch (event_notifier->priv->parent.u.syscall.entryexit) {
case LTTNG_SYSCALL_ENTRY:
- switch (notifier->u.syscall.abi) {
+ switch (event_notifier->priv->parent.u.syscall.abi) {
case LTTNG_SYSCALL_ABI_NATIVE:
dispatch_list = &group->event_notifier_syscall_dispatch[syscall_id];
break;
}
break;
case LTTNG_SYSCALL_EXIT:
- switch (notifier->u.syscall.abi) {
+ switch (event_notifier->priv->parent.u.syscall.abi) {
case LTTNG_SYSCALL_ABI_NATIVE:
dispatch_list = &group->event_notifier_exit_syscall_dispatch[syscall_id];
break;
goto end;
}
- hlist_add_head_rcu(¬ifier->u.syscall.node, dispatch_list);
+ hlist_add_head_rcu(&event_notifier->priv->parent.u.syscall.node, dispatch_list);
end:
return ret ;
int lttng_syscall_filter_enable_event(
struct lttng_channel *channel,
- struct lttng_event *event)
+ struct lttng_kernel_event_recorder *event_recorder)
{
- WARN_ON_ONCE(event->instrumentation != LTTNG_KERNEL_ABI_SYSCALL);
+ WARN_ON_ONCE(event_recorder->priv->parent.instrumentation != LTTNG_KERNEL_ABI_SYSCALL);
return lttng_syscall_filter_enable(channel->sc_filter,
- event->desc->event_name, event->u.syscall.abi,
- event->u.syscall.entryexit);
+ event_recorder->priv->parent.desc->event_name,
+ event_recorder->priv->parent.u.syscall.abi,
+ event_recorder->priv->parent.u.syscall.entryexit);
}
static
}
int lttng_syscall_filter_disable_event_notifier(
- struct lttng_event_notifier *notifier)
+ struct lttng_kernel_event_notifier *event_notifier)
{
- struct lttng_event_notifier_group *group = notifier->group;
+ struct lttng_event_notifier_group *group = event_notifier->priv->group;
int ret;
- WARN_ON_ONCE(notifier->instrumentation != LTTNG_KERNEL_ABI_SYSCALL);
+ WARN_ON_ONCE(event_notifier->priv->parent.instrumentation != LTTNG_KERNEL_ABI_SYSCALL);
ret = lttng_syscall_filter_disable(group->sc_filter,
- notifier->desc->event_name, notifier->u.syscall.abi,
- notifier->u.syscall.entryexit);
+ 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);
- hlist_del_rcu(¬ifier->u.syscall.node);
+ hlist_del_rcu(&event_notifier->priv->parent.u.syscall.node);
return 0;
}
int lttng_syscall_filter_disable_event(
struct lttng_channel *channel,
- struct lttng_event *event)
+ struct lttng_kernel_event_recorder *event_recorder)
{
return lttng_syscall_filter_disable(channel->sc_filter,
- event->desc->event_name, event->u.syscall.abi,
- event->u.syscall.entryexit);
+ event_recorder->priv->parent.desc->event_name,
+ event_recorder->priv->parent.u.syscall.abi,
+ event_recorder->priv->parent.u.syscall.entryexit);
}
static