Fix: writeback: out-of-bound reads

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

diff --git a/instrumentation/events/lttng-module/workqueue.h b/instrumentation/events/lttng-module/workqueue.h
index 8393a3311440e47cbece61a92e3a9d583b3236e4..f26d96b4bc29ce45fdc40a8e6f5491e0274435dc 100644 (file)
--- a/instrumentation/events/lttng-module/workqueue.h
+++ b/instrumentation/events/lttng-module/workqueue.h
@@ -4,11 +4,11 @@
 #if !defined(LTTNG_TRACE_WORKQUEUE_H) || defined(TRACE_HEADER_MULTI_READ)
 #define LTTNG_TRACE_WORKQUEUE_H
 
-#include "../../../probes/lttng-tracepoint-event.h"
+#include <probes/lttng-tracepoint-event.h>
 #include <linux/workqueue.h>
-#include <linux/version.h>
+#include <lttng-kernel-version.h>
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(2,6,36))
 
 #ifndef _TRACE_WORKQUEUE_DEF_
 #define _TRACE_WORKQUEUE_DEF_
@@ -24,18 +24,12 @@ LTTNG_TRACEPOINT_EVENT_CLASS(workqueue_work,
 
        TP_ARGS(work),
 
-       TP_STRUCT__entry(
-               __field( void *,        work    )
-       ),
-
-       TP_fast_assign(
-               tp_assign(work, work)
-       ),
-
-       TP_printk("work struct %p", __entry->work)
+       TP_FIELDS(
+               ctf_integer_hex(void *, work, work)
+       )
 )
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(2,6,37))
 /**
  * workqueue_queue_work - called when a work gets queued
  * @req_cpu:   the requested cpu
@@ -48,7 +42,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(workqueue_work,
  */
 LTTNG_TRACEPOINT_EVENT(workqueue_queue_work,
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,9,0))
        TP_PROTO(unsigned int req_cpu, struct pool_workqueue *pwq,
                 struct work_struct *work),
 
@@ -60,21 +54,11 @@ LTTNG_TRACEPOINT_EVENT(workqueue_queue_work,
        TP_ARGS(req_cpu, cwq, work),
 #endif
 
-       TP_STRUCT__entry(
-               __field( void *,        work    )
-               __field( void *,        function)
-               __field( unsigned int,  req_cpu )
-       ),
-
-       TP_fast_assign(
-               tp_assign(work, work)
-               tp_assign(function, work->func)
-               tp_assign(req_cpu, req_cpu)
-       ),
-
-       TP_printk("work struct=%p function=%pf req_cpu=%u",
-                 __entry->work, __entry->function,
-                 __entry->req_cpu)
+       TP_FIELDS(
+               ctf_integer_hex(void *, work, work)
+               ctf_integer_hex(void *, function, work->func)
+               ctf_integer(unsigned int, req_cpu, req_cpu)
+       )
 )
 
 /**
@@ -105,19 +89,32 @@ LTTNG_TRACEPOINT_EVENT(workqueue_execute_start,
 
        TP_ARGS(work),
 
-       TP_STRUCT__entry(
-               __field( void *,        work    )
-               __field( void *,        function)
-       ),
+       TP_FIELDS(
+               ctf_integer_hex(void *, work, work)
+               ctf_integer_hex(void *, function, work->func)
+       )
+)
 
-       TP_fast_assign(
-               tp_assign(work, work)
-               tp_assign(function, work->func)
-       ),
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0))
+/**
+ * workqueue_execute_end - called immediately after the workqueue callback
+ * @work:      pointer to struct work_struct
+ * @function:  pointer to worker function
+ *
+ * Allows to track workqueue execution.
+ */
+LTTNG_TRACEPOINT_EVENT(workqueue_execute_end,
 
-       TP_printk("work struct %p: function %pf", __entry->work, __entry->function)
-)
+       TP_PROTO(struct work_struct *work, work_func_t function),
 
+       TP_ARGS(work, function),
+
+       TP_FIELDS(
+               ctf_integer_hex(void *, work, work)
+               ctf_integer_hex(void *, function, function)
+       )
+)
+#else
 /**
  * workqueue_execute_end - called immediately after the workqueue callback
  * @work:      pointer to struct work_struct
@@ -130,6 +127,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(workqueue_work, workqueue_execute_end,
 
        TP_ARGS(work)
 )
+#endif
 
 #else
 
@@ -139,20 +137,11 @@ LTTNG_TRACEPOINT_EVENT_CLASS(workqueue,
 
        TP_ARGS(wq_thread, work),
 
-       TP_STRUCT__entry(
-               __array(char,           thread_comm,    TASK_COMM_LEN)
-               __field(pid_t,          thread_pid)
-               __field(work_func_t,    func)
-       ),
-
-       TP_fast_assign(
-               tp_memcpy(thread_comm, wq_thread->comm, TASK_COMM_LEN)
-               tp_assign(thread_pid, wq_thread->pid)
-               tp_assign(func, work->func)
-       ),
-
-       TP_printk("thread=%s:%d func=%pf", __entry->thread_comm,
-               __entry->thread_pid, __entry->func)
+       TP_FIELDS(
+               ctf_array(char, thread_comm, wq_thread->comm, TASK_COMM_LEN)
+               ctf_integer(pid_t, thread_pid, wq_thread->pid)
+               ctf_integer_hex(work_func_t, func, work->func)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT_INSTANCE(workqueue, workqueue_insertion,
@@ -176,20 +165,11 @@ LTTNG_TRACEPOINT_EVENT(workqueue_creation,
 
        TP_ARGS(wq_thread, cpu),
 
-       TP_STRUCT__entry(
-               __array(char,   thread_comm,    TASK_COMM_LEN)
-               __field(pid_t,  thread_pid)
-               __field(int,    cpu)
-       ),
-
-       TP_fast_assign(
-               tp_memcpy(thread_comm, wq_thread->comm, TASK_COMM_LEN)
-               tp_assign(thread_pid, wq_thread->pid)
-               tp_assign(cpu, cpu)
-       ),
-
-       TP_printk("thread=%s:%d cpu=%d", __entry->thread_comm,
-               __entry->thread_pid, __entry->cpu)
+       TP_FIELDS(
+               ctf_array(char, thread_comm, wq_thread->comm, TASK_COMM_LEN)
+               ctf_integer(pid_t, thread_pid, wq_thread->pid)
+               ctf_integer(int, cpu, cpu)
+       )
 )
 
 LTTNG_TRACEPOINT_EVENT(workqueue_destruction,
@@ -198,17 +178,10 @@ LTTNG_TRACEPOINT_EVENT(workqueue_destruction,
 
        TP_ARGS(wq_thread),
 
-       TP_STRUCT__entry(
-               __array(char,   thread_comm,    TASK_COMM_LEN)
-               __field(pid_t,  thread_pid)
-       ),
-
-       TP_fast_assign(
-               tp_memcpy(thread_comm, wq_thread->comm, TASK_COMM_LEN)
-               tp_assign(thread_pid, wq_thread->pid)
-       ),
-
-       TP_printk("thread=%s:%d", __entry->thread_comm, __entry->thread_pid)
+       TP_FIELDS(
+               ctf_array(char, thread_comm, wq_thread->comm, TASK_COMM_LEN)
+               ctf_integer(pid_t, thread_pid, wq_thread->pid)
+       )
 )
 
 #endif
@@ -216,4 +189,4 @@ LTTNG_TRACEPOINT_EVENT(workqueue_destruction,
 #endif /*  LTTNG_TRACE_WORKQUEUE_H */
 
 /* This part must be outside protection */
-#include "../../../probes/define_trace.h"
+#include <probes/define_trace.h>