projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: KVM: x86: Use gpa_t for cr2/gpa to fix TDP support on 32-bit (v5.6)
[lttng-modules.git]
/
lttng-syscalls.c
diff --git
a/lttng-syscalls.c
b/lttng-syscalls.c
index 080355f4e00408922e609df45948c044dc1116a1..b8a3eac4bcaecb349ba09ae5f0da447b7116df0b 100644
(file)
--- a/
lttng-syscalls.c
+++ b/
lttng-syscalls.c
@@
-38,6
+38,7
@@
#include <wrapper/tracepoint.h>
#include <wrapper/file.h>
#include <wrapper/rcu.h>
#include <wrapper/tracepoint.h>
#include <wrapper/file.h>
#include <wrapper/rcu.h>
+#include <wrapper/syscall.h>
#include <lttng-events.h>
#ifndef CONFIG_COMPAT
#include <lttng-events.h>
#ifndef CONFIG_COMPAT
@@
-85,6
+86,18
@@
struct mmap_arg_struct;
struct file_handle;
struct user_msghdr;
struct file_handle;
struct user_msghdr;
+/*
+ * Forward declaration for kernels >= 5.6
+ */
+struct timex;
+struct timeval;
+struct itimerval;
+struct itimerspec;
+
+#if (LINUX_VERSION_CODE >= 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
#ifdef IA32_NR_syscalls
#define NR_compat_syscalls IA32_NR_syscalls
#else
@@
-157,6
+170,7
@@
struct user_msghdr;
/* Hijack probe callback for compat system call enter */
#define TP_PROBE_CB(_template) &syscall_entry_probe
/* Hijack probe callback for compat system call enter */
#define TP_PROBE_CB(_template) &syscall_entry_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), \
PARAMS(_fields))
#define SC_LTTNG_TRACEPOINT_EVENT(_name, _proto, _args, _fields) \
LTTNG_TRACEPOINT_EVENT(compat_syscall_entry_##_name, PARAMS(_proto), PARAMS(_args), \
PARAMS(_fields))
@@
-188,6
+202,7
@@
struct user_msghdr;
#undef TP_PROBE_CB
#undef _TRACE_SYSCALLS_INTEGERS_H
#undef _TRACE_SYSCALLS_POINTERS_H
#undef TP_PROBE_CB
#undef _TRACE_SYSCALLS_INTEGERS_H
#undef _TRACE_SYSCALLS_POINTERS_H
+#undef LTTNG_SC_COMPAT
#undef SC_ENTER
#undef SC_ENTER
@@
-239,6
+254,7
@@
struct user_msghdr;
/* Hijack probe callback for compat system call exit */
#define TP_PROBE_CB(_template) &syscall_exit_probe
/* Hijack probe callback for compat system call exit */
#define TP_PROBE_CB(_template) &syscall_exit_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), \
PARAMS(_fields))
#define SC_LTTNG_TRACEPOINT_EVENT(_name, _proto, _args, _fields) \
LTTNG_TRACEPOINT_EVENT(compat_syscall_exit_##_name, PARAMS(_proto), PARAMS(_args), \
PARAMS(_fields))
@@
-270,6
+286,7
@@
struct user_msghdr;
#undef TP_PROBE_CB
#undef _TRACE_SYSCALLS_INTEGERS_H
#undef _TRACE_SYSCALLS_POINTERS_H
#undef TP_PROBE_CB
#undef _TRACE_SYSCALLS_INTEGERS_H
#undef _TRACE_SYSCALLS_POINTERS_H
+#undef LTTNG_SC_COMPAT
#undef SC_EXIT
#undef SC_EXIT
@@
-370,9
+387,9
@@
struct lttng_syscall_filter {
static void syscall_entry_unknown(struct lttng_event *event,
struct pt_regs *regs, unsigned int id)
{
static void syscall_entry_unknown(struct lttng_event *event,
struct pt_regs *regs, unsigned int id)
{
- unsigned long args[
UNKNOWN_SYSCALL_NR
ARGS];
+ unsigned long args[
LTTNG_SYSCALL_NR_
ARGS];
-
syscall_get_arguments(current, regs, 0, UNKNOWN_SYSCALL_NRARGS
, args);
+
lttng_syscall_get_arguments(current, regs
, args);
if (unlikely(in_compat_syscall()))
__event_probe__compat_syscall_entry_unknown(event, id, args);
else
if (unlikely(in_compat_syscall()))
__event_probe__compat_syscall_entry_unknown(event, id, args);
else
@@
-441,9
+458,9
@@
void syscall_entry_probe(void *__data, struct pt_regs *regs, long id)
case 1:
{
void (*fptr)(void *__data, unsigned long arg0) = entry->func;
case 1:
{
void (*fptr)(void *__data, unsigned long arg0) = entry->func;
- unsigned long args[
1
];
+ unsigned long args[
LTTNG_SYSCALL_NR_ARGS
];
-
syscall_get_arguments(current, regs, 0, entry->nrar
gs, args);
+
lttng_syscall_get_arguments(current, re
gs, args);
fptr(event, args[0]);
break;
}
fptr(event, args[0]);
break;
}
@@
-452,9
+469,9
@@
void syscall_entry_probe(void *__data, struct pt_regs *regs, long id)
void (*fptr)(void *__data,
unsigned long arg0,
unsigned long arg1) = entry->func;
void (*fptr)(void *__data,
unsigned long arg0,
unsigned long arg1) = entry->func;
- unsigned long args[
2
];
+ unsigned long args[
LTTNG_SYSCALL_NR_ARGS
];
-
syscall_get_arguments(current, regs, 0, entry->nrar
gs, args);
+
lttng_syscall_get_arguments(current, re
gs, args);
fptr(event, args[0], args[1]);
break;
}
fptr(event, args[0], args[1]);
break;
}
@@
-464,9
+481,9
@@
void syscall_entry_probe(void *__data, struct pt_regs *regs, long id)
unsigned long arg0,
unsigned long arg1,
unsigned long arg2) = entry->func;
unsigned long arg0,
unsigned long arg1,
unsigned long arg2) = entry->func;
- unsigned long args[
3
];
+ unsigned long args[
LTTNG_SYSCALL_NR_ARGS
];
-
syscall_get_arguments(current, regs, 0, entry->nrar
gs, args);
+
lttng_syscall_get_arguments(current, re
gs, args);
fptr(event, args[0], args[1], args[2]);
break;
}
fptr(event, args[0], args[1], args[2]);
break;
}
@@
-477,9
+494,9
@@
void syscall_entry_probe(void *__data, struct pt_regs *regs, long id)
unsigned long arg1,
unsigned long arg2,
unsigned long arg3) = entry->func;
unsigned long arg1,
unsigned long arg2,
unsigned long arg3) = entry->func;
- unsigned long args[
4
];
+ unsigned long args[
LTTNG_SYSCALL_NR_ARGS
];
-
syscall_get_arguments(current, regs, 0, entry->nrar
gs, args);
+
lttng_syscall_get_arguments(current, re
gs, args);
fptr(event, args[0], args[1], args[2], args[3]);
break;
}
fptr(event, args[0], args[1], args[2], args[3]);
break;
}
@@
-491,9
+508,9
@@
void syscall_entry_probe(void *__data, struct pt_regs *regs, long id)
unsigned long arg2,
unsigned long arg3,
unsigned long arg4) = entry->func;
unsigned long arg2,
unsigned long arg3,
unsigned long arg4) = entry->func;
- unsigned long args[
5
];
+ unsigned long args[
LTTNG_SYSCALL_NR_ARGS
];
-
syscall_get_arguments(current, regs, 0, entry->nrar
gs, args);
+
lttng_syscall_get_arguments(current, re
gs, args);
fptr(event, args[0], args[1], args[2], args[3], args[4]);
break;
}
fptr(event, args[0], args[1], args[2], args[3], args[4]);
break;
}
@@
-506,9
+523,9
@@
void syscall_entry_probe(void *__data, struct pt_regs *regs, long id)
unsigned long arg3,
unsigned long arg4,
unsigned long arg5) = entry->func;
unsigned long arg3,
unsigned long arg4,
unsigned long arg5) = entry->func;
- unsigned long args[
6
];
+ unsigned long args[
LTTNG_SYSCALL_NR_ARGS
];
-
syscall_get_arguments(current, regs, 0, entry->nrar
gs, args);
+
lttng_syscall_get_arguments(current, re
gs, args);
fptr(event, args[0], args[1], args[2],
args[3], args[4], args[5]);
break;
fptr(event, args[0], args[1], args[2],
args[3], args[4], args[5]);
break;
@@
-521,9
+538,9
@@
void syscall_entry_probe(void *__data, struct pt_regs *regs, long id)
static void syscall_exit_unknown(struct lttng_event *event,
struct pt_regs *regs, int id, long ret)
{
static void syscall_exit_unknown(struct lttng_event *event,
struct pt_regs *regs, int id, long ret)
{
- unsigned long args[
UNKNOWN_SYSCALL_NR
ARGS];
+ unsigned long args[
LTTNG_SYSCALL_NR_
ARGS];
-
syscall_get_arguments(current, regs, 0, UNKNOWN_SYSCALL_NRARGS
, args);
+
lttng_syscall_get_arguments(current, regs
, args);
if (unlikely(in_compat_syscall()))
__event_probe__compat_syscall_exit_unknown(event, id, ret,
args);
if (unlikely(in_compat_syscall()))
__event_probe__compat_syscall_exit_unknown(event, id, ret,
args);
@@
-597,9
+614,9
@@
void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret)
void (*fptr)(void *__data,
long ret,
unsigned long arg0) = entry->func;
void (*fptr)(void *__data,
long ret,
unsigned long arg0) = entry->func;
- unsigned long args[
1
];
+ unsigned long args[
LTTNG_SYSCALL_NR_ARGS
];
-
syscall_get_arguments(current, regs, 0, entry->nrar
gs, args);
+
lttng_syscall_get_arguments(current, re
gs, args);
fptr(event, ret, args[0]);
break;
}
fptr(event, ret, args[0]);
break;
}
@@
-609,9
+626,9
@@
void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret)
long ret,
unsigned long arg0,
unsigned long arg1) = entry->func;
long ret,
unsigned long arg0,
unsigned long arg1) = entry->func;
- unsigned long args[
2
];
+ unsigned long args[
LTTNG_SYSCALL_NR_ARGS
];
-
syscall_get_arguments(current, regs, 0, entry->nrar
gs, args);
+
lttng_syscall_get_arguments(current, re
gs, args);
fptr(event, ret, args[0], args[1]);
break;
}
fptr(event, ret, args[0], args[1]);
break;
}
@@
-622,9
+639,9
@@
void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret)
unsigned long arg0,
unsigned long arg1,
unsigned long arg2) = entry->func;
unsigned long arg0,
unsigned long arg1,
unsigned long arg2) = entry->func;
- unsigned long args[
3
];
+ unsigned long args[
LTTNG_SYSCALL_NR_ARGS
];
-
syscall_get_arguments(current, regs, 0, entry->nrar
gs, args);
+
lttng_syscall_get_arguments(current, re
gs, args);
fptr(event, ret, args[0], args[1], args[2]);
break;
}
fptr(event, ret, args[0], args[1], args[2]);
break;
}
@@
-636,9
+653,9
@@
void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret)
unsigned long arg1,
unsigned long arg2,
unsigned long arg3) = entry->func;
unsigned long arg1,
unsigned long arg2,
unsigned long arg3) = entry->func;
- unsigned long args[
4
];
+ unsigned long args[
LTTNG_SYSCALL_NR_ARGS
];
-
syscall_get_arguments(current, regs, 0, entry->nrar
gs, args);
+
lttng_syscall_get_arguments(current, re
gs, args);
fptr(event, ret, args[0], args[1], args[2], args[3]);
break;
}
fptr(event, ret, args[0], args[1], args[2], args[3]);
break;
}
@@
-651,9
+668,9
@@
void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret)
unsigned long arg2,
unsigned long arg3,
unsigned long arg4) = entry->func;
unsigned long arg2,
unsigned long arg3,
unsigned long arg4) = entry->func;
- unsigned long args[
5
];
+ unsigned long args[
LTTNG_SYSCALL_NR_ARGS
];
-
syscall_get_arguments(current, regs, 0, entry->nrar
gs, args);
+
lttng_syscall_get_arguments(current, re
gs, args);
fptr(event, ret, args[0], args[1], args[2], args[3], args[4]);
break;
}
fptr(event, ret, args[0], args[1], args[2], args[3], args[4]);
break;
}
@@
-667,9
+684,9
@@
void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret)
unsigned long arg3,
unsigned long arg4,
unsigned long arg5) = entry->func;
unsigned long arg3,
unsigned long arg4,
unsigned long arg5) = entry->func;
- unsigned long args[
6
];
+ unsigned long args[
LTTNG_SYSCALL_NR_ARGS
];
-
syscall_get_arguments(current, regs, 0, entry->nrar
gs, args);
+
lttng_syscall_get_arguments(current, re
gs, args);
fptr(event, ret, args[0], args[1], args[2],
args[3], args[4], args[5]);
break;
fptr(event, ret, args[0], args[1], args[2],
args[3], args[4], args[5]);
break;
@@
-913,15
+930,15
@@
int lttng_syscalls_unregister(struct lttng_channel *chan)
if (!chan->sc_table)
return 0;
if (chan->sys_enter_registered) {
if (!chan->sc_table)
return 0;
if (chan->sys_enter_registered) {
- ret = lttng_wrapper_tracepoint_probe_unregister("sys_e
xit
",
- (void *) syscall_e
xit
_probe, chan);
+ ret = lttng_wrapper_tracepoint_probe_unregister("sys_e
nter
",
+ (void *) syscall_e
ntry
_probe, chan);
if (ret)
return ret;
chan->sys_enter_registered = 0;
}
if (chan->sys_exit_registered) {
if (ret)
return ret;
chan->sys_enter_registered = 0;
}
if (chan->sys_exit_registered) {
- ret = lttng_wrapper_tracepoint_probe_unregister("sys_e
nter
",
- (void *) syscall_e
ntry
_probe, chan);
+ ret = lttng_wrapper_tracepoint_probe_unregister("sys_e
xit
",
+ (void *) syscall_e
xit
_probe, chan);
if (ret)
return ret;
chan->sys_exit_registered = 0;
if (ret)
return ret;
chan->sys_exit_registered = 0;
@@
-1255,7
+1272,7
@@
long lttng_channel_syscall_mask(struct lttng_channel *channel,
filter = channel->sc_filter;
for (bit = 0; bit < ARRAY_SIZE(sc_table); bit++) {
filter = channel->sc_filter;
for (bit = 0; bit < ARRAY_SIZE(sc_table); bit++) {
-
bool
state;
+
char
state;
if (channel->sc_table) {
if (filter)
if (channel->sc_table) {
if (filter)
@@
-1268,7
+1285,7
@@
long lttng_channel_syscall_mask(struct lttng_channel *channel,
bt_bitfield_write_be(tmp_mask, char, bit, 1, state);
}
for (; bit < sc_tables_len; bit++) {
bt_bitfield_write_be(tmp_mask, char, bit, 1, state);
}
for (; bit < sc_tables_len; bit++) {
-
bool
state;
+
char
state;
if (channel->compat_sc_table) {
if (filter)
if (channel->compat_sc_table) {
if (filter)
This page took
0.029264 seconds
and
4
git commands to generate.