#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
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())) {
{
switch (event_enabler->enabler_type) {
case LTTNG_EVENT_ENABLER_TYPE_RECORDER:
+ lttng_fallthrough;
+ case LTTNG_EVENT_ENABLER_TYPE_COUNTER:
{
- struct lttng_event_recorder_enabler *event_recorder_enabler =
- container_of(event_enabler, struct lttng_event_recorder_enabler, parent);
- return &event_recorder_enabler->chan->priv->parent.syscall_table;
+ struct lttng_event_enabler_session_common *event_enabler_session =
+ container_of(event_enabler, struct lttng_event_enabler_session_common, parent);
+ return &event_enabler_session->chan->priv->syscall_table;
}
case LTTNG_EVENT_ENABLER_TYPE_NOTIFIER:
{
{
switch (event->type) {
case LTTNG_KERNEL_EVENT_TYPE_RECORDER:
+ lttng_fallthrough;
+ case LTTNG_KERNEL_EVENT_TYPE_COUNTER:
{
- struct lttng_kernel_event_recorder *event_recorder =
- container_of(event, struct lttng_kernel_event_recorder, parent);
- return &event_recorder->chan->priv->parent.syscall_table;
+ struct lttng_kernel_event_common_private *event_priv = event->priv;
+ struct lttng_kernel_event_session_common_private *event_session_priv =
+ container_of(event_priv, struct lttng_kernel_event_session_common_private, parent);
+ return &event_session_priv->chan->priv->syscall_table;
}
case LTTNG_KERNEL_EVENT_TYPE_NOTIFIER:
{
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);
+ container_of(syscall_event_enabler, struct lttng_event_recorder_enabler, parent.parent);
struct lttng_event_recorder_enabler *event_recorder_enabler;
struct lttng_kernel_abi_event 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;
+ ev.token = syscall_event_enabler->user_token;
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);
+ event = _lttng_kernel_event_create(&event_recorder_enabler->parent.parent, desc, NULL);
WARN_ON_ONCE(IS_ERR(event));
- lttng_event_enabler_destroy(&event_recorder_enabler->parent);
+ lttng_event_enabler_destroy(&event_recorder_enabler->parent.parent);
if (IS_ERR(event)) {
printk(KERN_INFO "Unable to create event recorder %s\n", desc->event_name);
return;
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;
memset(&event_notifier_param, 0, sizeof(event_notifier_param));
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.event.token = syscall_event_enabler->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);
+ event = _lttng_kernel_event_create(&event_notifier_enabler->parent, desc, NULL);
WARN_ON_ONCE(IS_ERR(event));
lttng_event_enabler_destroy(&event_notifier_enabler->parent);
if (IS_ERR(event)) {
}
event->priv->u.syscall.syscall_id = syscall_nr;
break;
+ case LTTNG_EVENT_ENABLER_TYPE_COUNTER:
+ {
+ struct lttng_event_counter_enabler *syscall_event_counter_enabler =
+ container_of(syscall_event_enabler, struct lttng_event_counter_enabler, parent.parent);
+ struct lttng_event_counter_enabler *event_counter_enabler;
+ struct lttng_kernel_abi_event ev;
+
+ /* We need to create an event for this syscall/enabler. */
+ memset(&ev, 0, sizeof(ev));
+ switch (type) {
+ case SC_TYPE_ENTRY:
+ ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY;
+ ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE;
+ break;
+ case SC_TYPE_EXIT:
+ ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT;
+ ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_NATIVE;
+ break;
+ case SC_TYPE_COMPAT_ENTRY:
+ ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_ENTRY;
+ ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT;
+ break;
+ case SC_TYPE_COMPAT_EXIT:
+ ev.u.syscall.entryexit = LTTNG_KERNEL_ABI_SYSCALL_EXIT;
+ ev.u.syscall.abi = LTTNG_KERNEL_ABI_SYSCALL_ABI_COMPAT;
+ break;
+ }
+ 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;
+ ev.token = syscall_event_enabler->user_token;
+ event_counter_enabler = lttng_event_counter_enabler_create(LTTNG_ENABLER_FORMAT_NAME, &ev,
+ syscall_event_counter_enabler->key, syscall_event_counter_enabler->chan);
+ WARN_ON_ONCE(!event_counter_enabler);
+ if (!event_counter_enabler)
+ return;
+ event = _lttng_kernel_event_create(&event_counter_enabler->parent.parent, desc, NULL);
+ lttng_event_enabler_destroy(&event_counter_enabler->parent.parent);
+ if (IS_ERR(event)) {
+ if (PTR_ERR(event) != -EEXIST)
+ printk(KERN_INFO "Unable to create event counter %s\n", desc->event_name);
+ return;
+ }
+ event->priv->u.syscall.syscall_id = syscall_nr;
+ break;
+ }
+
}
default:
break;
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);
+ struct lttng_event_ht *events_name_ht = lttng_get_events_name_ht_from_enabler(syscall_event_enabler_common);
const struct lttng_kernel_event_desc *desc;
unsigned int i;
#endif
/* iterate over all syscall and create event that match */
for (i = 0; i < table_len; i++) {
+ char key_string[LTTNG_KERNEL_COUNTER_KEY_LEN] = { 0 };
struct lttng_kernel_event_common_private *event_priv;
struct hlist_head *head;
bool found = false;
if (!lttng_desc_match_enabler(desc, syscall_event_enabler_common))
continue;
+ if (format_event_key(syscall_event_enabler_common, key_string, desc->event_name))
+ continue;
+
/*
* 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)) {
+ head = utils_borrow_hash_table_bucket(events_name_ht->table, LTTNG_EVENT_HT_SIZE, desc->event_name);
+ lttng_hlist_for_each_entry(event_priv, head, hlist_name_node) {
+ if (lttng_event_enabler_event_name_key_match_event(syscall_event_enabler_common, desc->event_name, key_string, event_priv->pub)) {
found = true;
break;
}
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);
+ char key_string[LTTNG_KERNEL_COUNTER_KEY_LEN] = { 0 };
+ struct lttng_event_ht *events_name_ht = lttng_get_events_name_ht_from_enabler(event_enabler);
struct lttng_kernel_event_common_private *event_priv;
const struct lttng_kernel_event_desc *desc;
bool found = false;
WARN_ON_ONCE(1);
}
+ if (format_event_key(event_enabler, key_string, desc->event_name))
+ return;
+
/*
* 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(event_enabler, desc, event_priv->pub)) {
+ head = utils_borrow_hash_table_bucket(events_name_ht->table, LTTNG_EVENT_HT_SIZE, desc->event_name);
+ lttng_hlist_for_each_entry(event_priv, head, hlist_name_node) {
+ if (lttng_event_enabler_event_name_key_match_event(event_enabler, desc->event_name, key_string, event_priv->pub)) {
found = true;
break;
}
}
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;
}
lttng_syscall_event_enabler_create_matching_events(syscall_event_enabler);
- 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;
struct lttng_kernel_syscall_table *syscall_table = get_syscall_table_from_event(event);
unsigned int syscall_id = event->priv->u.syscall.syscall_id;
struct hlist_head *dispatch_list;
- int ret;
+ int ret = 0;
WARN_ON_ONCE(event->priv->instrumentation != LTTNG_KERNEL_ABI_SYSCALL);
kfree(tmp_mask);
return ret;
}
-
-int lttng_abi_syscall_list(void)
-{
- struct file *syscall_list_file;
- int file_fd, ret;
-
- file_fd = lttng_get_unused_fd();
- if (file_fd < 0) {
- ret = file_fd;
- goto fd_error;
- }
-
- syscall_list_file = anon_inode_getfile("[lttng_syscall_list]",
- <tng_syscall_list_fops,
- NULL, O_RDWR);
- if (IS_ERR(syscall_list_file)) {
- ret = PTR_ERR(syscall_list_file);
- goto file_error;
- }
- ret = lttng_syscall_list_fops.open(NULL, syscall_list_file);
- if (ret < 0)
- goto open_error;
- fd_install(file_fd, syscall_list_file);
- return file_fd;
-
-open_error:
- fput(syscall_list_file);
-file_error:
- put_unused_fd(file_fd);
-fd_error:
- return ret;
-}
projects / lttng-modules.git / blobdiff