#define COMPAT_SYSCALL_EXIT_STR __stringify(COMPAT_SYSCALL_EXIT_TOK)
static
-void syscall_entry_probe(void *__data, struct pt_regs *regs, long id);
+void syscall_entry_event_probe(void *__data, struct pt_regs *regs, long id);
static
-void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret);
+void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret);
/*
* Forward declarations for old kernels.
/* Hijack probe callback for system call enter */
#undef TP_PROBE_CB
-#define TP_PROBE_CB(_template) &syscall_entry_probe
+#define TP_PROBE_CB(_template) &syscall_entry_event_probe
#define SC_LTTNG_TRACEPOINT_EVENT(_name, _proto, _args, _fields) \
LTTNG_TRACEPOINT_EVENT(syscall_entry_##_name, PARAMS(_proto), PARAMS(_args), \
PARAMS(_fields))
#undef _TRACE_SYSCALLS_POINTERS_H
/* Hijack probe callback for compat system call enter */
-#define TP_PROBE_CB(_template) &syscall_entry_probe
+#define TP_PROBE_CB(_template) &syscall_entry_event_probe
#define LTTNG_SC_COMPAT
#define SC_LTTNG_TRACEPOINT_EVENT(_name, _proto, _args, _fields) \
LTTNG_TRACEPOINT_EVENT(compat_syscall_entry_##_name, PARAMS(_proto), PARAMS(_args), \
#define sc_inout(...) __VA_ARGS__
/* Hijack probe callback for system call exit */
-#define TP_PROBE_CB(_template) &syscall_exit_probe
+#define TP_PROBE_CB(_template) &syscall_exit_event_probe
#define SC_LTTNG_TRACEPOINT_EVENT(_name, _proto, _args, _fields) \
LTTNG_TRACEPOINT_EVENT(syscall_exit_##_name, PARAMS(_proto), PARAMS(_args), \
PARAMS(_fields))
/* Hijack probe callback for compat system call exit */
-#define TP_PROBE_CB(_template) &syscall_exit_probe
+#define TP_PROBE_CB(_template) &syscall_exit_event_probe
#define LTTNG_SC_COMPAT
#define SC_LTTNG_TRACEPOINT_EVENT(_name, _proto, _args, _fields) \
LTTNG_TRACEPOINT_EVENT(compat_syscall_exit_##_name, PARAMS(_proto), PARAMS(_args), \
#undef CREATE_TRACE_POINTS
struct trace_syscall_entry {
- void *func;
+ void *event_func;
const struct lttng_event_desc *desc;
const struct lttng_event_field *fields;
unsigned int nrargs;
#undef TRACE_SYSCALL_TABLE
#define TRACE_SYSCALL_TABLE(_template, _name, _nr, _nrargs) \
[ _nr ] = { \
- .func = __event_probe__syscall_entry_##_template, \
+ .event_func = __event_probe__syscall_entry_##_template, \
.nrargs = (_nrargs), \
.fields = __event_fields___syscall_entry_##_template, \
.desc = &__event_desc___syscall_entry_##_name, \
},
-/* Syscall enter tracing table */
+/* Event syscall enter tracing table */
static const struct trace_syscall_entry sc_table[] = {
#include <instrumentation/syscalls/headers/syscalls_integers.h>
#include <instrumentation/syscalls/headers/syscalls_pointers.h>
#undef TRACE_SYSCALL_TABLE
#define TRACE_SYSCALL_TABLE(_template, _name, _nr, _nrargs) \
[ _nr ] = { \
- .func = __event_probe__compat_syscall_entry_##_template, \
+ .event_func = __event_probe__compat_syscall_entry_##_template, \
.nrargs = (_nrargs), \
.fields = __event_fields___compat_syscall_entry_##_template, \
.desc = &__event_desc___compat_syscall_entry_##_name, \
},
-/* Compat syscall enter table */
+/* Event compat syscall enter table */
const struct trace_syscall_entry compat_sc_table[] = {
#include <instrumentation/syscalls/headers/compat_syscalls_integers.h>
#include <instrumentation/syscalls/headers/compat_syscalls_pointers.h>
#undef TRACE_SYSCALL_TABLE
#define TRACE_SYSCALL_TABLE(_template, _name, _nr, _nrargs) \
[ _nr ] = { \
- .func = __event_probe__syscall_exit_##_template, \
+ .event_func = __event_probe__syscall_exit_##_template, \
.nrargs = (_nrargs), \
.fields = __event_fields___syscall_exit_##_template, \
.desc = &__event_desc___syscall_exit_##_name, \
},
-/* Syscall exit table */
+/* Event syscall exit table */
static const struct trace_syscall_entry sc_exit_table[] = {
#include <instrumentation/syscalls/headers/syscalls_integers.h>
#include <instrumentation/syscalls/headers/syscalls_pointers.h>
#undef TRACE_SYSCALL_TABLE
#define TRACE_SYSCALL_TABLE(_template, _name, _nr, _nrargs) \
[ _nr ] = { \
- .func = __event_probe__compat_syscall_exit_##_template, \
+ .event_func = __event_probe__compat_syscall_exit_##_template, \
.nrargs = (_nrargs), \
.fields = __event_fields___compat_syscall_exit_##_template, \
.desc = &__event_desc___compat_syscall_exit_##_name, \
},
-/* Compat syscall exit table */
+/* Event compat syscall exit table */
const struct trace_syscall_entry compat_sc_exit_table[] = {
#include <instrumentation/syscalls/headers/compat_syscalls_integers.h>
#include <instrumentation/syscalls/headers/compat_syscalls_pointers.h>
DECLARE_BITMAP(sc_compat_exit, NR_compat_syscalls);
};
-static void syscall_entry_unknown(struct lttng_event *event,
+static void syscall_entry_event_unknown(struct lttng_event *event,
struct pt_regs *regs, unsigned int id)
{
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
__event_probe__syscall_entry_unknown(event, id, args);
}
-void syscall_entry_probe(void *__data, struct pt_regs *regs, long id)
+static __always_inline
+void syscall_entry_call_func(void *func, unsigned int nrargs, void *data,
+ struct pt_regs *regs)
{
- struct lttng_channel *chan = __data;
- struct lttng_event *event, *unknown_event;
- const struct trace_syscall_entry *table, *entry;
- size_t table_len;
-
- if (unlikely(in_compat_syscall())) {
- struct lttng_syscall_filter *filter = chan->sc_filter;
-
- if (id < 0 || id >= NR_compat_syscalls
- || (!READ_ONCE(chan->syscall_all) && !test_bit(id, filter->sc_compat_entry))) {
- /* System call filtered out. */
- return;
- }
- table = compat_sc_table;
- table_len = ARRAY_SIZE(compat_sc_table);
- unknown_event = chan->sc_compat_unknown;
- } else {
- struct lttng_syscall_filter *filter = chan->sc_filter;
-
- if (id < 0 || id >= NR_syscalls
- || (!READ_ONCE(chan->syscall_all) && !test_bit(id, filter->sc_entry))) {
- /* System call filtered out. */
- return;
- }
- table = sc_table;
- table_len = ARRAY_SIZE(sc_table);
- unknown_event = chan->sc_unknown;
- }
- if (unlikely(id < 0 || id >= table_len)) {
- syscall_entry_unknown(unknown_event, regs, id);
- return;
- }
- if (unlikely(in_compat_syscall()))
- event = chan->compat_sc_table[id];
- else
- event = chan->sc_table[id];
- if (unlikely(!event)) {
- syscall_entry_unknown(unknown_event, regs, id);
- return;
- }
- entry = &table[id];
- WARN_ON_ONCE(!entry);
-
- switch (entry->nrargs) {
+ switch (nrargs) {
case 0:
{
- void (*fptr)(void *__data) = entry->func;
+ void (*fptr)(void *__data) = func;
- fptr(event);
+ fptr(data);
break;
}
case 1:
{
- void (*fptr)(void *__data, unsigned long arg0) = entry->func;
+ void (*fptr)(void *__data, unsigned long arg0) = func;
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- fptr(event, args[0]);
+ fptr(data, args[0]);
break;
}
case 2:
{
void (*fptr)(void *__data,
unsigned long arg0,
- unsigned long arg1) = entry->func;
+ unsigned long arg1) = func;
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- fptr(event, args[0], args[1]);
+ fptr(data, args[0], args[1]);
break;
}
case 3:
void (*fptr)(void *__data,
unsigned long arg0,
unsigned long arg1,
- unsigned long arg2) = entry->func;
+ unsigned long arg2) = func;
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- fptr(event, args[0], args[1], args[2]);
+ fptr(data, args[0], args[1], args[2]);
break;
}
case 4:
unsigned long arg0,
unsigned long arg1,
unsigned long arg2,
- unsigned long arg3) = entry->func;
+ unsigned long arg3) = func;
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- fptr(event, args[0], args[1], args[2], args[3]);
+ fptr(data, args[0], args[1], args[2], args[3]);
break;
}
case 5:
unsigned long arg1,
unsigned long arg2,
unsigned long arg3,
- unsigned long arg4) = entry->func;
+ unsigned long arg4) = func;
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- fptr(event, args[0], args[1], args[2], args[3], args[4]);
+ fptr(data, args[0], args[1], args[2], args[3], args[4]);
break;
}
case 6:
unsigned long arg2,
unsigned long arg3,
unsigned long arg4,
- unsigned long arg5) = entry->func;
+ unsigned long arg5) = func;
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
- fptr(event, args[0], args[1], args[2],
+ fptr(data, args[0], args[1], args[2],
args[3], args[4], args[5]);
break;
}
}
}
-static void syscall_exit_unknown(struct lttng_event *event,
+void syscall_entry_event_probe(void *__data, struct pt_regs *regs, long id)
+{
+ struct lttng_channel *chan = __data;
+ struct lttng_event *event, *unknown_event;
+ const struct trace_syscall_entry *table, *entry;
+ size_t table_len;
+
+ if (unlikely(in_compat_syscall())) {
+ struct lttng_syscall_filter *filter = chan->sc_filter;
+
+ if (id < 0 || id >= NR_compat_syscalls
+ || (!READ_ONCE(chan->syscall_all) && !test_bit(id, filter->sc_compat_entry))) {
+ /* System call filtered out. */
+ return;
+ }
+ table = compat_sc_table;
+ table_len = ARRAY_SIZE(compat_sc_table);
+ unknown_event = chan->sc_compat_unknown;
+ } else {
+ struct lttng_syscall_filter *filter = chan->sc_filter;
+
+ if (id < 0 || id >= NR_syscalls
+ || (!READ_ONCE(chan->syscall_all) && !test_bit(id, filter->sc_entry))) {
+ /* System call filtered out. */
+ return;
+ }
+ table = sc_table;
+ table_len = ARRAY_SIZE(sc_table);
+ unknown_event = chan->sc_unknown;
+ }
+ if (unlikely(id < 0 || id >= table_len)) {
+ syscall_entry_event_unknown(unknown_event, regs, id);
+ return;
+ }
+ if (unlikely(in_compat_syscall()))
+ event = chan->compat_sc_table[id];
+ else
+ event = chan->sc_table[id];
+ if (unlikely(!event)) {
+ syscall_entry_event_unknown(unknown_event, regs, id);
+ return;
+ }
+ entry = &table[id];
+ WARN_ON_ONCE(!entry);
+ syscall_entry_call_func(entry->event_func, entry->nrargs, event, regs);
+}
+
+static void syscall_exit_event_unknown(struct lttng_event *event,
struct pt_regs *regs, int id, long ret)
{
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
__event_probe__syscall_exit_unknown(event, id, ret, args);
}
-void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret)
+void syscall_exit_event_probe(void *__data, struct pt_regs *regs, long ret)
{
struct lttng_channel *chan = __data;
struct lttng_event *event, *unknown_event;
unknown_event = chan->sc_exit_unknown;
}
if (unlikely(id < 0 || id >= table_len)) {
- syscall_exit_unknown(unknown_event, regs, id, ret);
+ syscall_exit_event_unknown(unknown_event, regs, id, ret);
return;
}
if (unlikely(in_compat_syscall()))
else
event = chan->sc_exit_table[id];
if (unlikely(!event)) {
- syscall_exit_unknown(unknown_event, regs, id, ret);
+ syscall_exit_event_unknown(unknown_event, regs, id, ret);
return;
}
entry = &table[id];
switch (entry->nrargs) {
case 0:
{
- void (*fptr)(void *__data, long ret) = entry->func;
+ void (*fptr)(void *__data, long ret) = entry->event_func;
fptr(event, ret);
break;
{
void (*fptr)(void *__data,
long ret,
- unsigned long arg0) = entry->func;
+ unsigned long arg0) = entry->event_func;
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
void (*fptr)(void *__data,
long ret,
unsigned long arg0,
- unsigned long arg1) = entry->func;
+ unsigned long arg1) = entry->event_func;
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
long ret,
unsigned long arg0,
unsigned long arg1,
- unsigned long arg2) = entry->func;
+ unsigned long arg2) = entry->event_func;
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
unsigned long arg0,
unsigned long arg1,
unsigned long arg2,
- unsigned long arg3) = entry->func;
+ unsigned long arg3) = entry->event_func;
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
unsigned long arg1,
unsigned long arg2,
unsigned long arg3,
- unsigned long arg4) = entry->func;
+ unsigned long arg4) = entry->event_func;
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
unsigned long arg2,
unsigned long arg3,
unsigned long arg4,
- unsigned long arg5) = entry->func;
+ unsigned long arg5) = entry->event_func;
unsigned long args[LTTNG_SYSCALL_NR_ARGS];
lttng_syscall_get_arguments(current, regs, args);
* Should be called with sessions lock held.
*/
static
-int fill_table(const struct trace_syscall_entry *table, size_t table_len,
+int fill_event_table(const struct trace_syscall_entry *table, size_t table_len,
struct lttng_event **chan_table, struct lttng_channel *chan,
void *filter, enum sc_type type)
{
/*
* Should be called with sessions lock held.
*/
-int lttng_syscalls_register(struct lttng_channel *chan, void *filter)
+int lttng_syscalls_register_event(struct lttng_channel *chan, void *filter)
{
struct lttng_kernel_event ev;
int ret;
}
}
- ret = fill_table(sc_table, ARRAY_SIZE(sc_table),
+ ret = fill_event_table(sc_table, ARRAY_SIZE(sc_table),
chan->sc_table, chan, filter, SC_TYPE_ENTRY);
if (ret)
return ret;
- ret = fill_table(sc_exit_table, ARRAY_SIZE(sc_exit_table),
+ ret = fill_event_table(sc_exit_table, ARRAY_SIZE(sc_exit_table),
chan->sc_exit_table, chan, filter, SC_TYPE_EXIT);
if (ret)
return ret;
#ifdef CONFIG_COMPAT
- ret = fill_table(compat_sc_table, ARRAY_SIZE(compat_sc_table),
+ ret = fill_event_table(compat_sc_table, ARRAY_SIZE(compat_sc_table),
chan->compat_sc_table, chan, filter,
SC_TYPE_COMPAT_ENTRY);
if (ret)
return ret;
- ret = fill_table(compat_sc_exit_table, ARRAY_SIZE(compat_sc_exit_table),
+ ret = fill_event_table(compat_sc_exit_table, ARRAY_SIZE(compat_sc_exit_table),
chan->compat_sc_exit_table, chan, filter,
SC_TYPE_COMPAT_EXIT);
if (ret)
if (!chan->sys_enter_registered) {
ret = lttng_wrapper_tracepoint_probe_register("sys_enter",
- (void *) syscall_entry_probe, chan);
+ (void *) syscall_entry_event_probe, chan);
if (ret)
return ret;
chan->sys_enter_registered = 1;
*/
if (!chan->sys_exit_registered) {
ret = lttng_wrapper_tracepoint_probe_register("sys_exit",
- (void *) syscall_exit_probe, chan);
+ (void *) syscall_exit_event_probe, chan);
if (ret) {
WARN_ON_ONCE(lttng_wrapper_tracepoint_probe_unregister("sys_enter",
- (void *) syscall_entry_probe, chan));
+ (void *) syscall_entry_event_probe, chan));
return ret;
}
chan->sys_exit_registered = 1;
/*
* Only called at session destruction.
*/
-int lttng_syscalls_unregister(struct lttng_channel *chan)
+int lttng_syscalls_unregister_event(struct lttng_channel *chan)
{
int ret;
return 0;
if (chan->sys_enter_registered) {
ret = lttng_wrapper_tracepoint_probe_unregister("sys_enter",
- (void *) syscall_entry_probe, chan);
+ (void *) syscall_entry_event_probe, chan);
if (ret)
return ret;
chan->sys_enter_registered = 0;
}
if (chan->sys_exit_registered) {
ret = lttng_wrapper_tracepoint_probe_unregister("sys_exit",
- (void *) syscall_exit_probe, chan);
+ (void *) syscall_exit_event_probe, chan);
if (ret)
return ret;
chan->sys_exit_registered = 0;
return 0;
}
-int lttng_syscalls_destroy(struct lttng_channel *chan)
+int lttng_syscalls_destroy_event(struct lttng_channel *chan)
{
kfree(chan->sc_table);
kfree(chan->sc_exit_table);
}
static
-const char *get_syscall_name(struct lttng_event *event)
+const char *get_syscall_name(const char *desc_name,
+ enum lttng_syscall_abi abi,
+ enum lttng_syscall_entryexit entryexit)
{
size_t prefix_len = 0;
- WARN_ON_ONCE(event->instrumentation != LTTNG_KERNEL_SYSCALL);
- switch (event->u.syscall.entryexit) {
+ switch (entryexit) {
case LTTNG_SYSCALL_ENTRY:
- switch (event->u.syscall.abi) {
+ switch (abi) {
case LTTNG_SYSCALL_ABI_NATIVE:
prefix_len = strlen(SYSCALL_ENTRY_STR);
break;
}
break;
case LTTNG_SYSCALL_EXIT:
- switch (event->u.syscall.abi) {
+ switch (abi) {
case LTTNG_SYSCALL_ABI_NATIVE:
prefix_len = strlen(SYSCALL_EXIT_STR);
break;
break;
}
WARN_ON_ONCE(prefix_len == 0);
- return event->desc->name + prefix_len;
+ return desc_name + prefix_len;
}
-int lttng_syscall_filter_enable(struct lttng_channel *chan,
- struct lttng_event *event)
+static
+int lttng_syscall_filter_enable(
+ struct lttng_syscall_filter *filter,
+ const char *desc_name, enum lttng_syscall_abi abi,
+ enum lttng_syscall_entryexit entryexit)
{
- struct lttng_syscall_filter *filter = chan->sc_filter;
const char *syscall_name;
unsigned long *bitmap;
int syscall_nr;
- WARN_ON_ONCE(!chan->sc_table);
+ syscall_name = get_syscall_name(desc_name, abi, entryexit);
- syscall_name = get_syscall_name(event);
-
- switch (event->u.syscall.abi) {
+ switch (abi) {
case LTTNG_SYSCALL_ABI_NATIVE:
syscall_nr = get_syscall_nr(syscall_name);
break;
if (syscall_nr < 0)
return -ENOENT;
- switch (event->u.syscall.entryexit) {
+ switch (entryexit) {
case LTTNG_SYSCALL_ENTRY:
- switch (event->u.syscall.abi) {
+ switch (abi) {
case LTTNG_SYSCALL_ABI_NATIVE:
bitmap = filter->sc_entry;
break;
}
break;
case LTTNG_SYSCALL_EXIT:
- switch (event->u.syscall.abi) {
+ switch (abi) {
case LTTNG_SYSCALL_ABI_NATIVE:
bitmap = filter->sc_exit;
break;
return 0;
}
-int lttng_syscall_filter_disable(struct lttng_channel *chan,
+int lttng_syscall_filter_enable_event(
+ struct lttng_channel *channel,
struct lttng_event *event)
{
- struct lttng_syscall_filter *filter = chan->sc_filter;
+ WARN_ON_ONCE(event->instrumentation != LTTNG_KERNEL_SYSCALL);
+
+ return lttng_syscall_filter_enable(channel->sc_filter,
+ event->desc->name, event->u.syscall.abi,
+ event->u.syscall.entryexit);
+}
+
+static
+int lttng_syscall_filter_disable(
+ struct lttng_syscall_filter *filter,
+ const char *desc_name, enum lttng_syscall_abi abi,
+ enum lttng_syscall_entryexit entryexit)
+{
const char *syscall_name;
unsigned long *bitmap;
int syscall_nr;
- WARN_ON_ONCE(!chan->sc_table);
-
- syscall_name = get_syscall_name(event);
+ syscall_name = get_syscall_name(desc_name, abi, entryexit);
- switch (event->u.syscall.abi) {
+ switch (abi) {
case LTTNG_SYSCALL_ABI_NATIVE:
syscall_nr = get_syscall_nr(syscall_name);
break;
if (syscall_nr < 0)
return -ENOENT;
- switch (event->u.syscall.entryexit) {
+ switch (entryexit) {
case LTTNG_SYSCALL_ENTRY:
- switch (event->u.syscall.abi) {
+ switch (abi) {
case LTTNG_SYSCALL_ABI_NATIVE:
bitmap = filter->sc_entry;
break;
}
break;
case LTTNG_SYSCALL_EXIT:
- switch (event->u.syscall.abi) {
+ switch (abi) {
case LTTNG_SYSCALL_ABI_NATIVE:
bitmap = filter->sc_exit;
break;
return 0;
}
+int lttng_syscall_filter_disable_event(
+ struct lttng_channel *channel,
+ struct lttng_event *event)
+{
+ return lttng_syscall_filter_disable(channel->sc_filter,
+ event->desc->name, event->u.syscall.abi,
+ event->u.syscall.entryexit);
+}
+
static
const struct trace_syscall_entry *syscall_list_get_entry(loff_t *pos)
{
projects / lttng-modules.git / blobdiff