Merge branch 'linus' into core/locking

Reason: Pull in the semaphore related changes

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

2 files changed, 68 insertions, 2 deletions

diff --git a/include/trace/events/timer.h b/include/trace/events/timer.h
index c624126a9c8a..425bcfe56c62 100644
--- a/include/trace/events/timer.h
+++ b/include/trace/events/timer.h
@@ -81,14 +81,16 @@ TRACE_EVENT(timer_expire_entry,
         TP_STRUCT__entry(
                 __field( void *,        timer   )
                 __field( unsigned long, now     )
+                __field( void *,        function)
         ),
 
         TP_fast_assign(
                 __entry->timer          = timer;
                 __entry->now            = jiffies;
+                __entry->function       = timer->function;
         ),
 
-        TP_printk("timer=%p now=%lu", __entry->timer, __entry->now)
+        TP_printk("timer=%p function=%pf now=%lu", __entry->timer, __entry->function,__entry->now)
 );
 
 /**
@@ -200,14 +202,16 @@ TRACE_EVENT(hrtimer_expire_entry,
         TP_STRUCT__entry(
                 __field( void *,        hrtimer )
                 __field( s64,           now     )
+                __field( void *,        function)
         ),
 
         TP_fast_assign(
                 __entry->hrtimer        = hrtimer;
                 __entry->now            = now->tv64;
+                __entry->function       = hrtimer->function;
         ),
 
-        TP_printk("hrtimer=%p now=%llu", __entry->hrtimer,
+        TP_printk("hrtimer=%p function=%pf now=%llu", __entry->hrtimer, __entry->function,
                   (unsigned long long)ktime_to_ns((ktime_t) { .tv64 = __entry->now }))
  );
 
diff --git a/include/trace/events/workqueue.h b/include/trace/events/workqueue.h
new file mode 100644
index 000000000000..49682d7e9d60
--- /dev/null
+++ b/include/trace/events/workqueue.h
@@ -0,0 +1,62 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM workqueue
+
+#if !defined(_TRACE_WORKQUEUE_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_WORKQUEUE_H
+
+#include <linux/tracepoint.h>
+#include <linux/workqueue.h>
+
+/**
+ * workqueue_execute_start - called immediately before the workqueue callback
+ * @work:       pointer to struct work_struct
+ *
+ * Allows to track workqueue execution.
+ */
+TRACE_EVENT(workqueue_execute_start,
+
+        TP_PROTO(struct work_struct *work),
+
+        TP_ARGS(work),
+
+        TP_STRUCT__entry(
+                __field( void *,        work    )
+                __field( void *,        function)
+        ),
+
+        TP_fast_assign(
+                __entry->work           = work;
+                __entry->function       = work->func;
+        ),
+
+        TP_printk("work struct %p: function %pf", __entry->work, __entry->function)
+);
+
+/**
+ * workqueue_execute_end - called immediately before the workqueue callback
+ * @work:       pointer to struct work_struct
+ *
+ * Allows to track workqueue execution.
+ */
+TRACE_EVENT(workqueue_execute_end,
+
+        TP_PROTO(struct work_struct *work),
+
+        TP_ARGS(work),
+
+        TP_STRUCT__entry(
+                __field( void *,        work    )
+        ),
+
+        TP_fast_assign(
+                __entry->work           = work;
+        ),
+
+        TP_printk("work struct %p", __entry->work)
+);
+
+
+#endif /*  _TRACE_WORKQUEUE_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>