#include <lttng/bitfield.h>
#include <wrapper/tracepoint.h>
-#include <wrapper/file.h>
#include <wrapper/rcu.h>
#include <wrapper/syscall.h>
+#include <wrapper/limits.h>
#include <lttng/events.h>
#include <lttng/events-internal.h>
#include <lttng/utils.h>
+#include <lttng/kernel-version.h>
#include "lttng-syscalls.h"
/* in_compat_syscall appears in kernel 4.6. */
#ifndef in_compat_syscall
- #define in_compat_syscall() is_compat_task()
+# define in_compat_syscall() is_compat_task()
+#endif
+
+/* in_x32_syscall appears in kernel 4.7. */
+#if (LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(4,7,0))
+# ifdef CONFIG_X86_X32_ABI
+# define in_x32_syscall() is_x32_task()
+# endif
#endif
enum sc_type {
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);
-/*
- * Forward declarations for old kernels.
- */
-struct mmsghdr;
-struct rlimit64;
-struct oldold_utsname;
-struct old_utsname;
-struct sel_arg_struct;
-struct mmap_arg_struct;
-struct file_handle;
-struct user_msghdr;
-
-/*
- * Forward declaration for kernels >= 5.6
- */
-struct timex;
-struct timeval;
-struct itimerval;
-struct itimerspec;
-
-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0))
-typedef __kernel_old_time_t time_t;
-#endif
-
#ifdef IA32_NR_syscalls
#define NR_compat_syscalls IA32_NR_syscalls
#else
#define LTTNG_PACKAGE_BUILD
#define CREATE_TRACE_POINTS
#define TP_MODULE_NOINIT
-#define TRACE_INCLUDE_PATH instrumentation/syscalls/headers
+#define TRACE_INCLUDE_PATH instrumentation/syscalls
#define PARAMS(args...) args
/* Handle unknown syscalls */
#undef TRACE_SYSTEM
#define TRACE_SYSTEM syscalls_unknown
-#include <instrumentation/syscalls/headers/syscalls_unknown.h>
+#include <instrumentation/syscalls/syscalls_unknown.h>
#undef TRACE_SYSTEM
#undef TP_PROBE_CB
DECLARE_BITMAP(sc_exit, NR_syscalls);
DECLARE_BITMAP(sc_compat_entry, NR_compat_syscalls);
DECLARE_BITMAP(sc_compat_exit, NR_compat_syscalls);
+
+ /*
+ * Reference counters keeping track of number of events enabled
+ * for each bit.
+ */
+ u32 sc_entry_refcount_map[NR_syscalls];
+ u32 sc_exit_refcount_map[NR_syscalls];
+ u32 sc_compat_entry_refcount_map[NR_compat_syscalls];
+ u32 sc_compat_exit_refcount_map[NR_compat_syscalls];
};
static void syscall_entry_event_unknown(struct hlist_head *unknown_action_list_head,
const struct trace_syscall_entry *table, *entry;
size_t table_len;
+#ifdef CONFIG_X86_X32_ABI
+ if (in_x32_syscall()) {
+ /* x32 system calls are not supported. */
+ return;
+ }
+#endif
if (unlikely(in_compat_syscall())) {
struct lttng_syscall_filter *filter = syscall_table->sc_filter;
size_t table_len;
long id;
+#ifdef CONFIG_X86_X32_ABI
+ if (in_x32_syscall()) {
+ /* x32 system calls are not supported. */
+ return;
+ }
+#endif
id = syscall_get_nr(current, regs);
if (unlikely(in_compat_syscall())) {
}
}
-/*
- * 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_recorder_enabler *syscall_event_enabler,
- enum sc_type type)
+void lttng_syscall_event_enabler_create_event(struct lttng_event_enabler_common *syscall_event_enabler,
+ const struct lttng_kernel_event_desc *desc, enum sc_type type, unsigned int syscall_nr)
{
- struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_enabler(&syscall_event_enabler->parent);
- struct lttng_kernel_channel_buffer *chan = syscall_event_enabler->chan;
- struct lttng_kernel_session *session = chan->parent.session;
- unsigned int i;
+ struct lttng_kernel_event_common *event;
- /* 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_event_recorder_enabler *event_enabler;
+ 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;
- struct lttng_kernel_event_recorder_private *event_recorder_priv;
- struct lttng_kernel_event_recorder *event_recorder;
- struct hlist_head *head;
- bool found = false;
-
- if (!desc) {
- /* Unknown syscall */
- continue;
- }
- if (lttng_desc_match_enabler(desc,
- lttng_event_recorder_enabler_as_enabler(syscall_event_enabler)) <= 0)
- 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
- && get_syscall_table_from_event(event_recorder_priv->parent.pub) == syscall_table)
- found = true;
- }
- if (found)
- continue;
/* We need to create an event for this syscall/enabler. */
memset(&ev, 0, sizeof(ev));
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_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, chan);
- if (!event_enabler) {
- return -ENOMEM;
- }
- event_recorder = _lttng_kernel_event_recorder_create(event_enabler, desc);
- WARN_ON_ONCE(!event_recorder);
- lttng_event_enabler_destroy(&event_enabler->parent);
- 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);
+ 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(IS_ERR(event));
+ lttng_event_enabler_destroy(&event_recorder_enabler->parent);
+ if (IS_ERR(event)) {
+ printk(KERN_INFO "Unable to create event recorder %s\n", desc->event_name);
+ return;
}
- hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &chan_table[i]);
+ event->priv->u.syscall.syscall_id = syscall_nr;
+ break;
}
- return 0;
-}
-
-/*
- * Should be called with sessions lock held.
- */
-int lttng_syscalls_register_event_recorder(struct lttng_event_recorder_enabler *syscall_event_enabler)
-{
- struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_enabler(&syscall_event_enabler->parent);
- struct lttng_kernel_abi_event ev;
- int ret;
-
- wrapper_vmalloc_sync_mappings();
+ 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;
- 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;
+ 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(IS_ERR(event));
+ lttng_event_enabler_destroy(&event_notifier_enabler->parent);
+ if (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 (!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;
+ default:
+ break;
}
+}
+static
+void lttng_syscall_event_enabler_create_matching_syscall_table_events(struct lttng_event_enabler_common *syscall_event_enabler_common,
+ const struct trace_syscall_entry *table, size_t table_len, enum sc_type type)
+{
+ struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(syscall_event_enabler_common);
+ const struct lttng_kernel_event_desc *desc;
+ unsigned int i;
-#ifdef CONFIG_COMPAT
- 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;
- }
-
- 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;
- }
+#ifndef CONFIG_COMPAT
+ if (type == SC_TYPE_COMPAT_ENTRY || type == SC_TYPE_COMPAT_EXIT)
+ return;
#endif
- 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_event_recorder_enabler *event_enabler;
+ /* iterate over all syscall and create event that match */
+ for (i = 0; i < table_len; i++) {
+ struct lttng_kernel_event_common_private *event_priv;
+ struct hlist_head *head;
+ bool found = false;
- memset(&ev, 0, sizeof(ev));
- strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN);
- ev.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0';
- 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_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, syscall_event_enabler->chan);
- if (!event_enabler) {
- return -ENOMEM;
- }
- event_recorder = _lttng_kernel_event_recorder_create(event_enabler, desc);
- lttng_event_enabler_destroy(&event_enabler->parent);
- WARN_ON_ONCE(!event_recorder);
- if (IS_ERR(event_recorder)) {
- return PTR_ERR(event_recorder);
+ desc = table[i].desc;
+ if (!desc) {
+ /* Unknown syscall */
+ continue;
}
- hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &syscall_table->unknown_syscall_dispatch);
- }
- 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_event_recorder_enabler *event_enabler;
+ if (!lttng_desc_match_enabler(desc, syscall_event_enabler_common))
+ continue;
- memset(&ev, 0, sizeof(ev));
- strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN);
- ev.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0';
- 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_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, syscall_event_enabler->chan);
- if (!event_enabler) {
- return -ENOMEM;
- }
- event_recorder = _lttng_kernel_event_recorder_create(event_enabler, desc);
- WARN_ON_ONCE(!event_recorder);
- lttng_event_enabler_destroy(&event_enabler->parent);
- if (IS_ERR(event_recorder)) {
- return PTR_ERR(event_recorder);
+ /*
+ * Check if already created.
+ */
+ 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_common, desc, event_priv->pub)) {
+ found = true;
+ break;
+ }
}
- hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &syscall_table->compat_unknown_syscall_dispatch);
- }
-
- 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_event_recorder_enabler *event_enabler;
+ if (found)
+ continue;
- memset(&ev, 0, sizeof(ev));
- strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN);
- ev.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0';
- 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_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, syscall_event_enabler->chan);
- if (!event_enabler) {
- return -ENOMEM;
- }
- event_recorder = _lttng_kernel_event_recorder_create(event_enabler, desc);
- WARN_ON_ONCE(!event_recorder);
- lttng_event_enabler_destroy(&event_enabler->parent);
- if (IS_ERR(event_recorder)) {
- return PTR_ERR(event_recorder);
- }
- hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &syscall_table->compat_unknown_syscall_exit_dispatch);
+ lttng_syscall_event_enabler_create_event(syscall_event_enabler_common, desc, type, i);
}
+}
- 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_event_recorder_enabler *event_enabler;
-
- memset(&ev, 0, sizeof(ev));
- strncpy(ev.name, desc->event_name, LTTNG_KERNEL_ABI_SYM_NAME_LEN);
- ev.name[LTTNG_KERNEL_ABI_SYM_NAME_LEN - 1] = '\0';
- 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_enabler = lttng_event_recorder_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev, syscall_event_enabler->chan);
- if (!event_enabler) {
- return -ENOMEM;
- }
- event_recorder = _lttng_kernel_event_recorder_create(event_enabler, desc);
- WARN_ON_ONCE(!event_recorder);
- lttng_event_enabler_destroy(&event_enabler->parent);
- if (IS_ERR(event_recorder)) {
- return PTR_ERR(event_recorder);
- }
- hlist_add_head(&event_recorder->priv->parent.u.syscall.node, &syscall_table->unknown_syscall_exit_dispatch);
- }
+static
+bool lttng_syscall_event_enabler_is_wildcard_all(struct lttng_event_enabler_common *event_enabler)
+{
+ if (event_enabler->event_param.instrumentation != LTTNG_KERNEL_ABI_SYSCALL)
+ return false;
+ if (event_enabler->event_param.u.syscall.abi != LTTNG_KERNEL_ABI_SYSCALL_ABI_ALL)
+ return false;
+ if (event_enabler->event_param.u.syscall.match != LTTNG_KERNEL_ABI_SYSCALL_MATCH_NAME)
+ return false;
+ if (strcmp(event_enabler->event_param.name, "*"))
+ return false;
+ return true;
+}
- ret = lttng_create_syscall_event_if_missing(sc_table.table, sc_table.len,
- syscall_table->syscall_dispatch, syscall_event_enabler, SC_TYPE_ENTRY);
- if (ret)
- return ret;
- ret = lttng_create_syscall_event_if_missing(sc_exit_table.table, sc_exit_table.len,
- syscall_table->syscall_exit_dispatch, syscall_event_enabler, SC_TYPE_EXIT);
- if (ret)
- return ret;
+static
+void create_unknown_syscall_event(struct lttng_event_enabler_common *event_enabler, enum sc_type type)
+{
+ struct lttng_event_ht *events_ht = lttng_get_event_ht_from_enabler(event_enabler);
+ struct lttng_kernel_event_common_private *event_priv;
+ const struct lttng_kernel_event_desc *desc;
+ bool found = false;
+ struct hlist_head *head;
-#ifdef CONFIG_COMPAT
- ret = lttng_create_syscall_event_if_missing(compat_sc_table.table, compat_sc_table.len,
- syscall_table->compat_syscall_dispatch, syscall_event_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,
- syscall_table->compat_syscall_exit_dispatch, syscall_event_enabler, SC_TYPE_COMPAT_EXIT);
- if (ret)
- return ret;
+#ifndef CONFIG_COMPAT
+ if (type == SC_TYPE_COMPAT_ENTRY || type == SC_TYPE_COMPAT_EXIT)
+ return;
#endif
+ /*
+ * Considering that currently system calls can only be enabled on a per
+ * name basis (or wildcard based on a name), unknown syscall events are
+ * only used when matching *all* system calls, because this is the only
+ * case which can be associated with an unknown system call.
+ *
+ * When enabling system call on a per system call number basis will be
+ * supported, this will need to be revisited.
+ */
+ if (!lttng_syscall_event_enabler_is_wildcard_all(event_enabler))
+ return;
- if (!syscall_table->sc_filter) {
- syscall_table->sc_filter = kzalloc(sizeof(struct lttng_syscall_filter),
- GFP_KERNEL);
- if (!syscall_table->sc_filter)
- return -ENOMEM;
+ switch (type) {
+ case SC_TYPE_ENTRY:
+ desc = &__event_desc___syscall_entry_unknown;
+ break;
+ case SC_TYPE_EXIT:
+ desc = &__event_desc___syscall_exit_unknown;
+ break;
+ case SC_TYPE_COMPAT_ENTRY:
+ desc = &__event_desc___compat_syscall_entry_unknown;
+ break;
+ case SC_TYPE_COMPAT_EXIT:
+ desc = &__event_desc___compat_syscall_exit_unknown;
+ break;
+ default:
+ WARN_ON_ONCE(1);
}
- if (!syscall_table->sys_enter_registered) {
- ret = lttng_wrapper_tracepoint_probe_register("sys_enter",
- (void *) syscall_entry_event_probe, syscall_table);
- if (ret)
- return ret;
- syscall_table->sys_enter_registered = 1;
- }
/*
- * We change the name of sys_exit tracepoint due to namespace
- * conflict with sys_exit syscall entry.
+ * Check if already created.
*/
- if (!syscall_table->sys_exit_registered) {
- ret = lttng_wrapper_tracepoint_probe_register("sys_exit",
- (void *) syscall_exit_event_probe, syscall_table);
- if (ret) {
- WARN_ON_ONCE(lttng_wrapper_tracepoint_probe_unregister("sys_enter",
- (void *) syscall_entry_event_probe, syscall_table));
- return ret;
+ 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_enabler, desc, event_priv->pub)) {
+ found = true;
+ break;
}
- syscall_table->sys_exit_registered = 1;
}
- return ret;
+ if (!found)
+ lttng_syscall_event_enabler_create_event(event_enabler, desc, type, -1U);
+}
+
+static
+void lttng_syscall_event_enabler_create_matching_events(struct lttng_event_enabler_common *event_enabler)
+{
+ enum lttng_kernel_abi_syscall_entryexit entryexit = event_enabler->event_param.u.syscall.entryexit;
+
+ if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) {
+ lttng_syscall_event_enabler_create_matching_syscall_table_events(event_enabler,
+ sc_table.table, sc_table.len, SC_TYPE_ENTRY);
+ lttng_syscall_event_enabler_create_matching_syscall_table_events(event_enabler,
+ compat_sc_table.table, compat_sc_table.len, SC_TYPE_COMPAT_ENTRY);
+ create_unknown_syscall_event(event_enabler, SC_TYPE_ENTRY);
+ create_unknown_syscall_event(event_enabler, SC_TYPE_COMPAT_ENTRY);
+ }
+
+ if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_EXIT || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) {
+ lttng_syscall_event_enabler_create_matching_syscall_table_events(event_enabler,
+ sc_exit_table.table, sc_exit_table.len, SC_TYPE_EXIT);
+ lttng_syscall_event_enabler_create_matching_syscall_table_events(event_enabler,
+ compat_sc_exit_table.table, compat_sc_exit_table.len, SC_TYPE_COMPAT_EXIT);
+ create_unknown_syscall_event(event_enabler, SC_TYPE_EXIT);
+ create_unknown_syscall_event(event_enabler, SC_TYPE_COMPAT_EXIT);
+ }
}
/*
* 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;
- struct lttng_kernel_syscall_table *syscall_table = &group->syscall_table;
- 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 (!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;
}
-
if (!syscall_table->syscall_exit_dispatch) {
- syscall_table->syscall_exit_dispatch = kzalloc(sizeof(struct hlist_head) * sc_table.len, GFP_KERNEL);
+ /* 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;
}
#ifdef CONFIG_COMPAT
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;
}
if (!syscall_table->compat_syscall_exit_dispatch) {
- syscall_table->compat_syscall_exit_dispatch =
- kzalloc(sizeof(struct hlist_head) * compat_sc_exit_table.len,
- GFP_KERNEL);
+ /* 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;
}
#endif
-
if (!syscall_table->sc_filter) {
syscall_table->sc_filter = kzalloc(sizeof(struct lttng_syscall_filter),
GFP_KERNEL);
}
if (!syscall_table->sys_enter_registered) {
- ret = lttng_wrapper_tracepoint_probe_register("sys_enter",
+ ret = lttng_tracepoint_probe_register("sys_enter",
(void *) syscall_entry_event_probe, syscall_table);
if (ret)
return ret;
syscall_table->sys_enter_registered = 1;
}
-
if (!syscall_table->sys_exit_registered) {
- ret = lttng_wrapper_tracepoint_probe_register("sys_exit",
+ ret = lttng_tracepoint_probe_register("sys_exit",
(void *) syscall_exit_event_probe, syscall_table);
if (ret) {
- WARN_ON_ONCE(lttng_wrapper_tracepoint_probe_unregister("sys_enter",
+ WARN_ON_ONCE(lttng_tracepoint_probe_unregister("sys_enter",
(void *) syscall_entry_event_probe, syscall_table));
return ret;
}
syscall_table->sys_exit_registered = 1;
}
- return ret;
-}
-
-static
-int 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;
- const struct lttng_kernel_event_desc *desc;
- struct lttng_event_notifier_group *group = event_notifier_enabler->group;
- struct lttng_kernel_syscall_table *syscall_table = &group->syscall_table;
- struct lttng_kernel_abi_event_notifier event_notifier_param;
- uint64_t user_token = event_notifier_enabler->parent.user_token;
- uint64_t error_counter_index = event_notifier_enabler->error_counter_index;
- struct lttng_event_enabler_common *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 = &syscall_table->unknown_syscall_dispatch;
- entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY;
- abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE;
- break;
- case SC_TYPE_EXIT:
- desc = &__event_desc___syscall_exit_unknown;
- unknown_dispatch_list = &syscall_table->unknown_syscall_exit_dispatch;
- entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT;
- abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE;
- break;
- case SC_TYPE_COMPAT_ENTRY:
- desc = &__event_desc___compat_syscall_entry_unknown;
- unknown_dispatch_list = &syscall_table->compat_unknown_syscall_dispatch;
- entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY;
- abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT;
- break;
- case SC_TYPE_COMPAT_EXIT:
- desc = &__event_desc___compat_syscall_exit_unknown;
- unknown_dispatch_list = &syscall_table->compat_unknown_syscall_exit_dispatch;
- entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT;
- abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT;
- break;
- default:
- BUG_ON(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)
- 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;
-}
-
-static int create_matching_event_notifiers(
- struct lttng_event_notifier_enabler *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;
- 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;
- 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 hlist_head *head;
- int found = 0;
-
- desc = table[i].desc;
- if (!desc) {
- /* Unknown syscall */
- continue;
- }
-
- if (!lttng_desc_match_enabler(desc,
- lttng_event_notifier_enabler_as_enabler(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)
- 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;
- }
-
-end:
- return ret;
-
-}
-
-int lttng_syscalls_create_matching_event_notifiers(
- struct lttng_event_notifier_enabler *event_notifier_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;
-
- if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRY || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) {
- ret = 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,
- 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;
- }
-
- if (entryexit == LTTNG_KERNEL_ABI_SYSCALL_EXIT || entryexit == LTTNG_KERNEL_ABI_SYSCALL_ENTRYEXIT) {
- ret = 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,
- 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;
- }
+ lttng_syscall_event_enabler_create_matching_events(syscall_event_enabler);
-end:
- return ret;
+ return 0;
}
int lttng_syscalls_unregister_syscall_table(struct lttng_kernel_syscall_table *syscall_table)
if (!syscall_table->syscall_dispatch)
return 0;
if (syscall_table->sys_enter_registered) {
- ret = lttng_wrapper_tracepoint_probe_unregister("sys_enter",
+ ret = lttng_tracepoint_probe_unregister("sys_enter",
(void *) syscall_entry_event_probe, syscall_table);
if (ret)
return ret;
syscall_table->sys_enter_registered = 0;
}
if (syscall_table->sys_exit_registered) {
- ret = lttng_wrapper_tracepoint_probe_unregister("sys_exit",
+ ret = lttng_tracepoint_probe_unregister("sys_exit",
(void *) syscall_exit_event_probe, syscall_table);
if (ret)
return ret;
return 0;
}
-static
-int get_syscall_nr(const char *syscall_name)
-{
- int syscall_nr = -1;
- int i;
-
- for (i = 0; i < sc_table.len; i++) {
- const struct trace_syscall_entry *entry;
- const char *it_name;
-
- entry = &sc_table.table[i];
- if (!entry->desc)
- continue;
- it_name = entry->desc->event_name;
- it_name += strlen(SYSCALL_ENTRY_STR);
- if (!strcmp(syscall_name, it_name)) {
- syscall_nr = i;
- break;
- }
- }
- return syscall_nr;
-}
-
-static
-int get_compat_syscall_nr(const char *syscall_name)
-{
- int syscall_nr = -1;
- int i;
-
- for (i = 0; i < compat_sc_table.len; i++) {
- const struct trace_syscall_entry *entry;
- const char *it_name;
-
- entry = &compat_sc_table.table[i];
- if (!entry->desc)
- continue;
- it_name = entry->desc->event_name;
- it_name += strlen(COMPAT_SYSCALL_ENTRY_STR);
- if (!strcmp(syscall_name, it_name)) {
- syscall_nr = i;
- break;
- }
- }
- return syscall_nr;
-}
-
static
uint32_t get_sc_tables_len(void)
{
int lttng_syscall_filter_enable(
struct lttng_syscall_filter *filter,
const char *desc_name, enum lttng_syscall_abi abi,
- enum lttng_syscall_entryexit entryexit)
+ enum lttng_syscall_entryexit entryexit,
+ unsigned int syscall_id)
{
const char *syscall_name;
unsigned long *bitmap;
- int syscall_nr;
+ u32 *refcount_map;
syscall_name = get_syscall_name(desc_name, abi, entryexit);
- switch (abi) {
- case LTTNG_SYSCALL_ABI_NATIVE:
- syscall_nr = get_syscall_nr(syscall_name);
- break;
- case LTTNG_SYSCALL_ABI_COMPAT:
- syscall_nr = get_compat_syscall_nr(syscall_name);
- break;
- default:
- return -EINVAL;
- }
- if (syscall_nr < 0)
- return -ENOENT;
-
switch (entryexit) {
case LTTNG_SYSCALL_ENTRY:
switch (abi) {
case LTTNG_SYSCALL_ABI_NATIVE:
bitmap = filter->sc_entry;
+ refcount_map = filter->sc_entry_refcount_map;
break;
case LTTNG_SYSCALL_ABI_COMPAT:
bitmap = filter->sc_compat_entry;
+ refcount_map = filter->sc_compat_entry_refcount_map;
break;
default:
return -EINVAL;
switch (abi) {
case LTTNG_SYSCALL_ABI_NATIVE:
bitmap = filter->sc_exit;
+ refcount_map = filter->sc_exit_refcount_map;
break;
case LTTNG_SYSCALL_ABI_COMPAT:
bitmap = filter->sc_compat_exit;
+ refcount_map = filter->sc_compat_exit_refcount_map;
break;
default:
return -EINVAL;
default:
return -EINVAL;
}
- if (test_bit(syscall_nr, bitmap))
- return -EEXIST;
- bitmap_set(bitmap, syscall_nr, 1);
+ if (refcount_map[syscall_id] == U32_MAX)
+ return -EOVERFLOW;
+ if (refcount_map[syscall_id]++ == 0)
+ bitmap_set(bitmap, syscall_id, 1);
return 0;
}
int lttng_syscall_filter_enable_event(struct lttng_kernel_event_common *event)
{
struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_event(event);
- int ret;
+ unsigned int syscall_id = event->priv->u.syscall.syscall_id;
+ struct hlist_head *dispatch_list;
+ int ret = 0;
WARN_ON_ONCE(event->priv->instrumentation != LTTNG_KERNEL_ABI_SYSCALL);
- 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->type) {
- case LTTNG_KERNEL_EVENT_TYPE_RECORDER:
- break;
- case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER:
- {
- unsigned int syscall_id = event->priv->u.syscall.syscall_id;
- struct hlist_head *dispatch_list;
+ /* Unknown syscall */
+ if (syscall_id == -1U) {
+ 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->unknown_syscall_dispatch;
+ break;
+ case LTTNG_SYSCALL_ABI_COMPAT:
+ dispatch_list = &syscall_table->compat_unknown_syscall_dispatch;
+ break;
+ default:
+ ret = -EINVAL;
+ goto end;
+ }
+ break;
+ case LTTNG_SYSCALL_EXIT:
+ switch (event->priv->u.syscall.abi) {
+ case LTTNG_SYSCALL_ABI_NATIVE:
+ dispatch_list = &syscall_table->unknown_syscall_exit_dispatch;
+ break;
+ case LTTNG_SYSCALL_ABI_COMPAT:
+ dispatch_list = &syscall_table->compat_unknown_syscall_exit_dispatch;
+ break;
+ default:
+ ret = -EINVAL;
+ goto end;
+ }
+ break;
+ default:
+ ret = -EINVAL;
+ goto end;
+ }
+ } else {
+ ret = lttng_syscall_filter_enable(syscall_table->sc_filter,
+ event->priv->desc->event_name, event->priv->u.syscall.abi,
+ event->priv->u.syscall.entryexit, syscall_id);
+ if (ret)
+ return ret;
switch (event->priv->u.syscall.entryexit) {
case LTTNG_SYSCALL_ENTRY:
ret = -EINVAL;
goto end;
}
-
- hlist_add_head_rcu(&event->priv->u.syscall.node, dispatch_list);
- break;
- }
- default:
- WARN_ON_ONCE(1);
- return -ENOSYS;
}
+
+ hlist_add_head_rcu(&event->priv->u.syscall.node, dispatch_list);
end:
return ret;
}
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)
+ enum lttng_syscall_entryexit entryexit,
+ unsigned int syscall_id)
{
const char *syscall_name;
unsigned long *bitmap;
- int syscall_nr;
+ u32 *refcount_map;
syscall_name = get_syscall_name(desc_name, abi, entryexit);
- switch (abi) {
- case LTTNG_SYSCALL_ABI_NATIVE:
- syscall_nr = get_syscall_nr(syscall_name);
- break;
- case LTTNG_SYSCALL_ABI_COMPAT:
- syscall_nr = get_compat_syscall_nr(syscall_name);
- break;
- default:
- return -EINVAL;
- }
- if (syscall_nr < 0)
- return -ENOENT;
-
switch (entryexit) {
case LTTNG_SYSCALL_ENTRY:
switch (abi) {
case LTTNG_SYSCALL_ABI_NATIVE:
bitmap = filter->sc_entry;
+ refcount_map = filter->sc_entry_refcount_map;
break;
case LTTNG_SYSCALL_ABI_COMPAT:
bitmap = filter->sc_compat_entry;
+ refcount_map = filter->sc_compat_entry_refcount_map;
break;
default:
return -EINVAL;
switch (abi) {
case LTTNG_SYSCALL_ABI_NATIVE:
bitmap = filter->sc_exit;
+ refcount_map = filter->sc_exit_refcount_map;
break;
case LTTNG_SYSCALL_ABI_COMPAT:
bitmap = filter->sc_compat_exit;
+ refcount_map = filter->sc_compat_exit_refcount_map;
break;
default:
return -EINVAL;
default:
return -EINVAL;
}
- if (!test_bit(syscall_nr, bitmap))
- return -EEXIST;
- bitmap_clear(bitmap, syscall_nr, 1);
-
+ if (refcount_map[syscall_id] == 0)
+ return -ENOENT;
+ if (--refcount_map[syscall_id] == 0)
+ bitmap_clear(bitmap, syscall_id, 1);
return 0;
}
int lttng_syscall_filter_disable_event(struct lttng_kernel_event_common *event)
{
struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_event(event);
+ unsigned int syscall_id = event->priv->u.syscall.syscall_id;
int ret;
- 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;
-
- 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;
+ /* Except for unknown syscall */
+ if (syscall_id != -1U) {
+ ret = lttng_syscall_filter_disable(syscall_table->sc_filter,
+ event->priv->desc->event_name, event->priv->u.syscall.abi,
+ event->priv->u.syscall.entryexit, syscall_id);
+ if (ret)
+ return ret;
}
+ hlist_del_rcu(&event->priv->u.syscall.node);
return 0;
}
+void lttng_syscall_table_set_wildcard_all(struct lttng_event_enabler_common *event_enabler)
+{
+ 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 (!lttng_syscall_event_enabler_is_wildcard_all(event_enabler))
+ 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
const struct trace_syscall_entry *syscall_list_get_entry(loff_t *pos)
{
/*
* 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;
struct file *syscall_list_file;
int file_fd, ret;
- file_fd = lttng_get_unused_fd();
+ file_fd = get_unused_fd_flags(0);
if (file_fd < 0) {
ret = file_fd;
goto fd_error;
projects / lttng-modules.git / blobdiff