projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 2.12.15
[lttng-modules.git]
/
lttng-syscalls.c
diff --git
a/lttng-syscalls.c
b/lttng-syscalls.c
index 26cead68252f336221b31a3e54c9f86aeb8cdf08..97a12c4835a896e0a0e050c98d5aa5cd0e25af5a 100644
(file)
--- a/
lttng-syscalls.c
+++ b/
lttng-syscalls.c
@@
-27,6
+27,7
@@
#include <wrapper/rcu.h>
#include <wrapper/syscall.h>
#include <lttng-events.h>
#include <wrapper/rcu.h>
#include <wrapper/syscall.h>
#include <lttng-events.h>
+#include <lttng-kernel-version.h>
#ifndef CONFIG_COMPAT
# ifndef is_compat_task
#ifndef CONFIG_COMPAT
# ifndef is_compat_task
@@
-36,7
+37,14
@@
/* in_compat_syscall appears in kernel 4.6. */
#ifndef in_compat_syscall
/* 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 {
#endif
enum sc_type {
@@
-81,7
+89,7
@@
struct timeval;
struct itimerval;
struct itimerspec;
struct itimerval;
struct itimerspec;
-#if (L
INUX_VERSION_CODE >=
KERNEL_VERSION(5,6,0))
+#if (L
TTNG_LINUX_VERSION_CODE >= LTTNG_
KERNEL_VERSION(5,6,0))
typedef __kernel_old_time_t time_t;
#endif
typedef __kernel_old_time_t time_t;
#endif
@@
-392,6
+400,12
@@
void syscall_entry_probe(void *__data, struct pt_regs *regs, long id)
const struct trace_syscall_entry *table, *entry;
size_t table_len;
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 = chan->sc_filter;
if (unlikely(in_compat_syscall())) {
struct lttng_syscall_filter *filter = chan->sc_filter;
@@
-539,6
+553,12
@@
void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret)
size_t table_len;
long id;
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())) {
struct lttng_syscall_filter *filter = chan->sc_filter;
id = syscall_get_nr(current, regs);
if (unlikely(in_compat_syscall())) {
struct lttng_syscall_filter *filter = chan->sc_filter;
@@
-719,7
+739,7
@@
int fill_table(const struct trace_syscall_entry *table, size_t table_len,
ev.u.syscall.abi = LTTNG_KERNEL_SYSCALL_ABI_COMPAT;
break;
}
ev.u.syscall.abi = LTTNG_KERNEL_SYSCALL_ABI_COMPAT;
break;
}
- strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN);
+ strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN
- 1
);
ev.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
ev.instrumentation = LTTNG_KERNEL_SYSCALL;
chan_table[i] = _lttng_event_create(chan, &ev, filter,
ev.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
ev.instrumentation = LTTNG_KERNEL_SYSCALL;
chan_table[i] = _lttng_event_create(chan, &ev, filter,
@@
-1057,7
+1077,6
@@
int lttng_syscall_filter_enable(struct lttng_channel *chan,
if (syscall_nr < 0)
return -ENOENT;
if (syscall_nr < 0)
return -ENOENT;
-
switch (event->u.syscall.entryexit) {
case LTTNG_SYSCALL_ENTRY:
switch (event->u.syscall.abi) {
switch (event->u.syscall.entryexit) {
case LTTNG_SYSCALL_ENTRY:
switch (event->u.syscall.abi) {
@@
-1067,6
+1086,8
@@
int lttng_syscall_filter_enable(struct lttng_channel *chan,
case LTTNG_SYSCALL_ABI_COMPAT:
bitmap = filter->sc_compat_entry;
break;
case LTTNG_SYSCALL_ABI_COMPAT:
bitmap = filter->sc_compat_entry;
break;
+ default:
+ return -EINVAL;
}
break;
case LTTNG_SYSCALL_EXIT:
}
break;
case LTTNG_SYSCALL_EXIT:
@@
-1077,6
+1098,8
@@
int lttng_syscall_filter_enable(struct lttng_channel *chan,
case LTTNG_SYSCALL_ABI_COMPAT:
bitmap = filter->sc_compat_exit;
break;
case LTTNG_SYSCALL_ABI_COMPAT:
bitmap = filter->sc_compat_exit;
break;
+ default:
+ return -EINVAL;
}
break;
default:
}
break;
default:
@@
-1113,7
+1136,6
@@
int lttng_syscall_filter_disable(struct lttng_channel *chan,
if (syscall_nr < 0)
return -ENOENT;
if (syscall_nr < 0)
return -ENOENT;
-
switch (event->u.syscall.entryexit) {
case LTTNG_SYSCALL_ENTRY:
switch (event->u.syscall.abi) {
switch (event->u.syscall.entryexit) {
case LTTNG_SYSCALL_ENTRY:
switch (event->u.syscall.abi) {
@@
-1123,6
+1145,8
@@
int lttng_syscall_filter_disable(struct lttng_channel *chan,
case LTTNG_SYSCALL_ABI_COMPAT:
bitmap = filter->sc_compat_entry;
break;
case LTTNG_SYSCALL_ABI_COMPAT:
bitmap = filter->sc_compat_entry;
break;
+ default:
+ return -EINVAL;
}
break;
case LTTNG_SYSCALL_EXIT:
}
break;
case LTTNG_SYSCALL_EXIT:
@@
-1133,6
+1157,8
@@
int lttng_syscall_filter_disable(struct lttng_channel *chan,
case LTTNG_SYSCALL_ABI_COMPAT:
bitmap = filter->sc_compat_exit;
break;
case LTTNG_SYSCALL_ABI_COMPAT:
bitmap = filter->sc_compat_exit;
break;
+ default:
+ return -EINVAL;
}
break;
default:
}
break;
default:
This page took
0.031125 seconds
and
4
git commands to generate.