Add support for kvm x86 specific tracepoints

[lttng-modules.git] / lttng-syscalls.c

diff --git a/lttng-syscalls.c b/lttng-syscalls.c
index b8a1813c7c5f3506d1dd8fdd12b334863d7134de..62ed24aa66723c2cb16b8abe2a83cd6b5a8ccb48 100644 (file)
--- a/lttng-syscalls.c
+++ b/lttng-syscalls.c
@@ -1,11 +1,23 @@
 /*
  * lttng-syscalls.c
  *
- * Copyright 2010-2011 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
  * LTTng syscall probes.
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; only
+ * version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <linux/module.h>
@@ -14,18 +26,28 @@
 #include <asm/ptrace.h>
 #include <asm/syscall.h>
 
+#include "wrapper/tracepoint.h"
 #include "lttng-events.h"
 
 #ifndef CONFIG_COMPAT
-static inline int is_compat_task(void)
-{
-       return 0;
-}
+# ifndef is_compat_task
+#  define is_compat_task()     (0)
+# endif
 #endif
 
 static
 void syscall_entry_probe(void *__data, struct pt_regs *regs, long id);
 
+/*
+ * Forward declarations for old kernels.
+ */
+struct mmsghdr;
+struct rlimit64;
+struct oldold_utsname;
+struct old_utsname;
+struct sel_arg_struct;
+struct mmap_arg_struct;
+
 /*
  * Take care of NOARGS not supported by mainline.
  */
@@ -38,7 +60,7 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id);
  */
 #define LTTNG_PACKAGE_BUILD
 #define CREATE_TRACE_POINTS
-#define TP_MODULE_OVERRIDE
+#define TP_MODULE_NOINIT
 #define TRACE_INCLUDE_PATH ../instrumentation/syscalls/headers
 
 #define PARAMS(args...)        args
@@ -96,7 +118,7 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id);
 #undef SC_DEFINE_EVENT_NOARGS
 #undef TP_PROBE_CB
 
-#undef TP_MODULE_OVERRIDE
+#undef TP_MODULE_NOINIT
 #undef LTTNG_PACKAGE_BUILD
 #undef CREATE_TRACE_POINTS
 
@@ -392,7 +414,7 @@ int lttng_syscalls_register(struct lttng_channel *chan, void *filter)
        if (ret)
                return ret;
 #endif
-       ret = tracepoint_probe_register("sys_enter",
+       ret = kabi_2635_tracepoint_probe_register("sys_enter",
                        (void *) syscall_entry_probe, chan);
        if (ret)
                return ret;
@@ -400,11 +422,11 @@ int lttng_syscalls_register(struct lttng_channel *chan, void *filter)
         * We change the name of sys_exit tracepoint due to namespace
         * conflict with sys_exit syscall entry.
         */
-       ret = tracepoint_probe_register("sys_exit",
+       ret = kabi_2635_tracepoint_probe_register("sys_exit",
                        (void *) __event_probe__exit_syscall,
                        chan->sc_exit);
        if (ret) {
-               WARN_ON_ONCE(tracepoint_probe_unregister("sys_enter",
+               WARN_ON_ONCE(kabi_2635_tracepoint_probe_unregister("sys_enter",
                        (void *) syscall_entry_probe, chan));
        }
        return ret;
@@ -419,12 +441,12 @@ int lttng_syscalls_unregister(struct lttng_channel *chan)
 
        if (!chan->sc_table)
                return 0;
-       ret = tracepoint_probe_unregister("sys_exit",
+       ret = kabi_2635_tracepoint_probe_unregister("sys_exit",
                        (void *) __event_probe__exit_syscall,
                        chan->sc_exit);
        if (ret)
                return ret;
-       ret = tracepoint_probe_unregister("sys_enter",
+       ret = kabi_2635_tracepoint_probe_unregister("sys_enter",
                        (void *) syscall_entry_probe, chan);
        if (ret)
                return ret;