2 files changed, 100 insertions, 25 deletions

diff --git a/include/trace/events/workqueue.h b/include/trace/events/workqueue.h
new file mode 100644
index 000000000000..035f1bff288e
--- /dev/null
+++ b/include/trace/events/workqueue.h
@@ -0,0 +1,100 @@
+#if !defined(_TRACE_WORKQUEUE_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_WORKQUEUE_H
+
+#include <linux/workqueue.h>
+#include <linux/sched.h>
+#include <linux/tracepoint.h>
+
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM workqueue
+
+TRACE_EVENT(workqueue_insertion,
+
+        TP_PROTO(struct task_struct *wq_thread, struct work_struct *work),
+
+        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(
+                memcpy(__entry->thread_comm, wq_thread->comm, TASK_COMM_LEN);
+                __entry->thread_pid     = wq_thread->pid;
+                __entry->func           = work->func;
+        ),
+
+        TP_printk("thread=%s:%d func=%pF", __entry->thread_comm,
+                __entry->thread_pid, __entry->func)
+);
+
+TRACE_EVENT(workqueue_execution,
+
+        TP_PROTO(struct task_struct *wq_thread, struct work_struct *work),
+
+        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(
+                memcpy(__entry->thread_comm, wq_thread->comm, TASK_COMM_LEN);
+                __entry->thread_pid     = wq_thread->pid;
+                __entry->func           = work->func;
+        ),
+
+        TP_printk("thread=%s:%d func=%pF", __entry->thread_comm,
+                __entry->thread_pid, __entry->func)
+);
+
+/* Trace the creation of one workqueue thread on a cpu */
+TRACE_EVENT(workqueue_creation,
+
+        TP_PROTO(struct task_struct *wq_thread, int cpu),
+
+        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(
+                memcpy(__entry->thread_comm, wq_thread->comm, TASK_COMM_LEN);
+                __entry->thread_pid     = wq_thread->pid;
+                __entry->cpu            = cpu;
+        ),
+
+        TP_printk("thread=%s:%d cpu=%d", __entry->thread_comm,
+                __entry->thread_pid, __entry->cpu)
+);
+
+TRACE_EVENT(workqueue_destruction,
+
+        TP_PROTO(struct task_struct *wq_thread),
+
+        TP_ARGS(wq_thread),
+
+        TP_STRUCT__entry(
+                __array(char,   thread_comm,    TASK_COMM_LEN)
+                __field(pid_t,  thread_pid)
+        ),
+
+        TP_fast_assign(
+                memcpy(__entry->thread_comm, wq_thread->comm, TASK_COMM_LEN);
+                __entry->thread_pid     = wq_thread->pid;
+        ),
+
+        TP_printk("thread=%s:%d", __entry->thread_comm, __entry->thread_pid)
+);
+
+#endif /* _TRACE_WORKQUEUE_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/include/trace/workqueue.h b/include/trace/workqueue.h
deleted file mode 100644
index 7626523deeba..000000000000
--- a/include/trace/workqueue.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef __TRACE_WORKQUEUE_H
-#define __TRACE_WORKQUEUE_H
-
-#include <linux/tracepoint.h>
-#include <linux/workqueue.h>
-#include <linux/sched.h>
-
-DECLARE_TRACE(workqueue_insertion,
-           TP_PROTO(struct task_struct *wq_thread, struct work_struct *work),
-           TP_ARGS(wq_thread, work));
-
-DECLARE_TRACE(workqueue_execution,
-           TP_PROTO(struct task_struct *wq_thread, struct work_struct *work),
-           TP_ARGS(wq_thread, work));
-
-/* Trace the creation of one workqueue thread on a cpu */
-DECLARE_TRACE(workqueue_creation,
-           TP_PROTO(struct task_struct *wq_thread, int cpu),
-           TP_ARGS(wq_thread, cpu));
-
-DECLARE_TRACE(workqueue_destruction,
-           TP_PROTO(struct task_struct *wq_thread),
-           TP_ARGS(wq_thread));
-
-#endif /* __TRACE_WORKQUEUE_H */