Fix: system call instrumentation overrides

[lttng-modules.git] / instrumentation / syscalls / headers / x86-32-syscalls-3.1.0-rc6_integers_override.h

diff --git a/instrumentation/syscalls/headers/x86-32-syscalls-3.1.0-rc6_integers_override.h b/instrumentation/syscalls/headers/x86-32-syscalls-3.1.0-rc6_integers_override.h
index 02a83dac2ecc98095267d73be61ac34b92aed69b..df814d30a754626e58eb31da07955bb76aa5375a 100644 (file)
--- a/instrumentation/syscalls/headers/x86-32-syscalls-3.1.0-rc6_integers_override.h
+++ b/instrumentation/syscalls/headers/x86-32-syscalls-3.1.0-rc6_integers_override.h
@@ -1,38 +1,85 @@
 #ifndef CONFIG_UID16
 
-#define OVERRIDE_sys_getuid16
-#define OVERRIDE_sys_getgid16
-#define OVERRIDE_sys_geteuid16
-#define OVERRIDE_sys_getegid16
-#define OVERRIDE_sys_setuid16
-#define OVERRIDE_sys_setgid16
-#define OVERRIDE_sys_setfsuid16
-#define OVERRIDE_sys_setfsgid16
-#define OVERRIDE_sys_setreuid16
-#define OVERRIDE_sys_setregid16
-#define OVERRIDE_sys_fchown16
-#define OVERRIDE_sys_setresuid16
-#define OVERRIDE_sys_setresgid16
-
-#define OVERRIDE_TABLE_sys_getuid16
-#define OVERRIDE_TABLE_sys_getgid16
-#define OVERRIDE_TABLE_sys_geteuid16
-#define OVERRIDE_TABLE_sys_getegid16
-#define OVERRIDE_TABLE_sys_setuid16
-#define OVERRIDE_TABLE_sys_setgid16
-#define OVERRIDE_TABLE_sys_setreuid16
-#define OVERRIDE_TABLE_sys_setregid16
-#define OVERRIDE_TABLE_sys_fchown16
-#define OVERRIDE_TABLE_sys_setfsuid16
-#define OVERRIDE_TABLE_sys_setfsgid16
-#define OVERRIDE_TABLE_sys_setresuid16
-#define OVERRIDE_TABLE_sys_setresgid16
+#define OVERRIDE_32_getuid16
+#define OVERRIDE_32_getgid16
+#define OVERRIDE_32_geteuid16
+#define OVERRIDE_32_getegid16
+#define OVERRIDE_32_setuid16
+#define OVERRIDE_32_setgid16
+#define OVERRIDE_32_setfsuid16
+#define OVERRIDE_32_setfsgid16
+#define OVERRIDE_32_setreuid16
+#define OVERRIDE_32_setregid16
+#define OVERRIDE_32_fchown16
+#define OVERRIDE_32_setresuid16
+#define OVERRIDE_32_setresgid16
+
+#define OVERRIDE_TABLE_32_getuid16
+#define OVERRIDE_TABLE_32_getgid16
+#define OVERRIDE_TABLE_32_geteuid16
+#define OVERRIDE_TABLE_32_getegid16
+#define OVERRIDE_TABLE_32_setuid16
+#define OVERRIDE_TABLE_32_setgid16
+#define OVERRIDE_TABLE_32_setreuid16
+#define OVERRIDE_TABLE_32_setregid16
+#define OVERRIDE_TABLE_32_fchown16
+#define OVERRIDE_TABLE_32_setfsuid16
+#define OVERRIDE_TABLE_32_setfsgid16
+#define OVERRIDE_TABLE_32_setresuid16
+#define OVERRIDE_TABLE_32_setresgid16
 
 #endif
 
-#ifdef CREATE_SYSCALL_TABLE
+#ifndef CREATE_SYSCALL_TABLE
 
-#define OVERRIDE_TABLE_sys_mmap
-TRACE_SYSCALL_TABLE(sys_mmap, sys_mmap, 90, 6)
+/* mmap_pgoff is kernel internal. mmap2 is exposed in unistd.h. */
+#define OVERRIDE_32_mmap_pgoff
+#define OVERRIDE_32_mmap2
+SC_LTTNG_TRACEPOINT_EVENT(mmap2,
+       TP_PROTO(sc_exit(unsigned long ret,)
+               unsigned long addr, unsigned long len,
+               unsigned long prot, unsigned long flags,
+               unsigned long fd, unsigned long pgoff),
+       TP_ARGS(sc_exit(ret,) addr, len, prot, flags, fd, pgoff),
+       TP_FIELDS(sc_exit(ctf_integer_hex(unsigned long, ret, ret))
+               sc_in(ctf_integer_hex(unsigned long, addr, addr))
+               sc_in(ctf_integer(size_t, len, len))
+               sc_in(ctf_integer(int, prot, prot))
+               sc_in(ctf_integer(int, flags, flags))
+               sc_in(ctf_integer(int, fd, fd))
+               sc_in(ctf_integer(off_t, pgoff, pgoff))
+       )
+)
 
-#endif
+#define OVERRIDE_32_sync_file_range
+SC_LTTNG_TRACEPOINT_EVENT(sync_file_range,
+       TP_PROTO(sc_exit(long ret,) int fd,
+               int32_t offset_low, int32_t offset_high,
+               int32_t nbytes_low, int32_t nbytes_high,
+               unsigned int flags),
+       TP_ARGS(sc_exit(ret,) fd, offset_low, offset_high,
+               nbytes_low, nbytes_high, flags),
+       TP_FIELDS(sc_exit(ctf_integer(long, ret, ret))
+               sc_in(ctf_integer(int, fd, fd))
+               sc_in(ctf_integer(loff_t, offset,
+                       ((loff_t) offset_high << 32) | offset_low))
+               sc_in(ctf_integer(loff_t, nbytes,
+                       ((loff_t) nbytes_high << 32) | nbytes_low))
+               sc_in(ctf_integer(unsigned int, flags, flags))
+       )
+)
+
+#else /* #ifndef CREATE_SYSCALL_TABLE */
+
+#define OVERRIDE_TABLE_32_mmap
+TRACE_SYSCALL_TABLE(mmap, mmap, 90, 6)
+
+/* mmap_pgoff is kernel internal. mmap2 is exposed in unistd.h. */
+#define OVERRIDE_TABLE_32_mmap_pgoff
+#define OVERRIDE_TABLE_32_mmap2
+TRACE_SYSCALL_TABLE(mmap2, mmap2, 192, 6)
+
+#define OVERRIDE_TABLE_32_sync_file_range
+TRACE_SYSCALL_TABLE(sync_file_range, sync_file_range, 314, 6)
+
+#endif /* #else #ifndef CREATE_SYSCALL_TABLE */