Drop support for kernels < 3.0 from module instrumentation

[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 2e83431a87e3589e350c859116936bfa84cb812f..89b1e7980d7d0a928d4753303d26eb6381328003 100644 (file)
--- a/instrumentation/events/lttng-module/module.h
+++ b/instrumentation/events/lttng-module/module.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
  * Because linux/module.h has tracepoints in the header, and ftrace.h
  * eventually includes this file, define_trace.h includes linux/module.h
@@ -11,10 +12,11 @@
 #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
 
@@ -22,81 +24,59 @@
 #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),
 
        TP_ARGS(mod),
 
-       TP_STRUCT__entry(
-               __field(        unsigned int,   taints          )
-               __string(       name,           mod->name       )
-       ),
-
-       TP_fast_assign(
-               tp_assign(taints, mod->taints);
-               tp_strcpy(name, mod->name);
-       ),
-
-       TP_printk("%s %s", __get_str(name), show_module_flags(__entry->taints))
+       TP_FIELDS(
+               ctf_integer(unsigned int, taints, mod->taints)
+               ctf_string(name, mod->name)
+       )
 )
 
-TRACE_EVENT(module_free,
+LTTNG_TRACEPOINT_EVENT(module_free,
 
        TP_PROTO(struct module *mod),
 
        TP_ARGS(mod),
 
-       TP_STRUCT__entry(
-               __string(       name,           mod->name       )
-       ),
-
-       TP_fast_assign(
-               tp_strcpy(name, mod->name);
-       ),
-
-       TP_printk("%s", __get_str(name))
+       TP_FIELDS(
+               ctf_string(name, mod->name)
+       )
 )
 
 #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,
 
        TP_PROTO(struct module *mod, unsigned long ip),
 
        TP_ARGS(mod, ip),
 
-       TP_STRUCT__entry(
-               __field(        unsigned long,  ip              )
-               __field(        int,            refcnt          )
-               __string(       name,           mod->name       )
-       ),
-
-       TP_fast_assign(
-               tp_assign(ip, ip);
-               tp_assign(refcnt, __this_cpu_read(mod->refptr->incs) + __this_cpu_read(mod->refptr->decs));
-               tp_strcpy(name, mod->name);
-       ),
-
-       TP_printk("%s call_site=%pf refcnt=%d",
-                 __get_str(name), (void *)__entry->ip, __entry->refcnt)
+       TP_FIELDS(
+               ctf_integer(unsigned long, ip, ip)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0))
+               ctf_integer(int, refcnt, atomic_read(&mod->refcnt))
+#else
+               ctf_integer(int, refcnt, __this_cpu_read(mod->refptr->incs) + __this_cpu_read(mod->refptr->decs))
+#endif
+               ctf_string(name, mod->name)
+       )
 )
 
-DEFINE_EVENT(module_refcnt, module_get,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(module_refcnt, module_get,
 
        TP_PROTO(struct module *mod, unsigned long ip),
 
        TP_ARGS(mod, ip)
 )
 
-DEFINE_EVENT(module_refcnt, module_put,
+LTTNG_TRACEPOINT_EVENT_INSTANCE(module_refcnt, module_put,
 
        TP_PROTO(struct module *mod, unsigned long ip),
 
@@ -104,31 +84,22 @@ 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),
 
        TP_ARGS(name, wait, ip),
 
-       TP_STRUCT__entry(
-               __field(        unsigned long,  ip              )
-               __field(        bool,           wait            )
-               __string(       name,           name            )
-       ),
-
-       TP_fast_assign(
-               tp_assign(ip, ip);
-               tp_assign(wait, wait);
-               tp_strcpy(name, name);
-       ),
-
-       TP_printk("%s wait=%d call_site=%pf",
-                 __get_str(name), (int)__entry->wait, (void *)__entry->ip)
+       TP_FIELDS(
+               ctf_integer(unsigned long, ip, ip)
+               ctf_integer(bool, wait, wait)
+               ctf_string(name, name)
+       )
 )
 
 #endif /* CONFIG_MODULES */
 
-#endif /* _TRACE_MODULE_H */
+#endif /* LTTNG_TRACE_MODULE_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>