Fix: update module instrumentation for 3.19+ kernels

[lttng-modules.git] / instrumentation / events / lttng-module / module.h

diff --git a/instrumentation/events/lttng-module/module.h b/instrumentation/events/lttng-module/module.h
index c63f86602555f59feb90d7e8957cc7707cfb0aaa..bc9493adba556b2ded8f58212858507d76a6f03b 100644 (file)
--- a/instrumentation/events/lttng-module/module.h
+++ b/instrumentation/events/lttng-module/module.h
@@ -11,10 +11,10 @@
 #define TRACE_SYSTEM module
 #endif
 
-#if !defined(_TRACE_MODULE_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_MODULE_H
+#if !defined(LTTNG_TRACE_MODULE_H) || defined(TRACE_HEADER_MULTI_READ)
+#define LTTNG_TRACE_MODULE_H
 
-#include <linux/tracepoint.h>
+#include "../../../probes/lttng-tracepoint-event.h"
 #include <linux/version.h>
 
 #ifdef CONFIG_MODULES
@@ -23,13 +23,9 @@
 #define _TRACE_MODULE_DEF
 struct module;
 
-#define show_module_flags(flags) __print_flags(flags, "",      \
-       { (1UL << TAINT_PROPRIETARY_MODULE),    "P" },          \
-       { (1UL << TAINT_FORCED_MODULE),         "F" },          \
-       { (1UL << TAINT_CRAP),                  "C" })
 #endif
 
-TRACE_EVENT(module_load,
+LTTNG_TRACEPOINT_EVENT(module_load,
 
        TP_PROTO(struct module *mod),
 
@@ -48,7 +44,7 @@ TRACE_EVENT(module_load,
        TP_printk("%s %s", __get_str(name), show_module_flags(__entry->taints))
 )
 
-TRACE_EVENT(module_free,
+LTTNG_TRACEPOINT_EVENT(module_free,
 
        TP_PROTO(struct module *mod),
 
@@ -68,7 +64,7 @@ TRACE_EVENT(module_free,
 #ifdef CONFIG_MODULE_UNLOAD
 /* trace_module_get/put are only used if CONFIG_MODULE_UNLOAD is defined */
 
-DECLARE_EVENT_CLASS(module_refcnt,
+LTTNG_TRACEPOINT_EVENT_CLASS(module_refcnt,
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
        TP_PROTO(struct module *mod, unsigned long ip),
@@ -88,7 +84,9 @@ DECLARE_EVENT_CLASS(module_refcnt,
 
        TP_fast_assign(
                tp_assign(ip, ip)
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0))
+               tp_assign(refcnt, atomic_read(&mod->refcnt))
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
                tp_assign(refcnt, __this_cpu_read(mod->refptr->incs) + __this_cpu_read(mod->refptr->decs))
 #else
                tp_assign(refcnt, refcnt)
@@ -100,7 +98,7 @@ DECLARE_EVENT_CLASS(module_refcnt,
                  __get_str(name), (void *)__entry->ip, __entry->refcnt)
 )
 
-DEFINE_EVENT(module_refcnt, module_get,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(module_refcnt, module_get,
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
        TP_PROTO(struct module *mod, unsigned long ip),
@@ -113,7 +111,7 @@ DEFINE_EVENT(module_refcnt, module_get,
 #endif
 )
 
-DEFINE_EVENT(module_refcnt, module_put,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(module_refcnt, module_put,
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
        TP_PROTO(struct module *mod, unsigned long ip),
@@ -127,7 +125,7 @@ DEFINE_EVENT(module_refcnt, module_put,
 )
 #endif /* CONFIG_MODULE_UNLOAD */
 
-TRACE_EVENT(module_request,
+LTTNG_TRACEPOINT_EVENT(module_request,
 
        TP_PROTO(char *name, bool wait, unsigned long ip),
 
@@ -151,7 +149,7 @@ TRACE_EVENT(module_request,
 
 #endif /* CONFIG_MODULES */
 
-#endif /* _TRACE_MODULE_H */
+#endif /* LTTNG_TRACE_MODULE_H */
 
 /* This part must be outside protection */
 #include "../../../probes/define_trace.h"