Commit 16d06120 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

Pull workqueue updates from Tejun Heo:
 "Just a couple tracepoint patches"

* 'for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
  workqueue: remove workqueue_work event class
  workqueue: add worker function to workqueue_execute_end tracepoint
parents 6a1000bd e8ab20d9
...@@ -8,23 +8,6 @@ ...@@ -8,23 +8,6 @@
#include <linux/tracepoint.h> #include <linux/tracepoint.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
DECLARE_EVENT_CLASS(workqueue_work,
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)
);
struct pool_workqueue; struct pool_workqueue;
/** /**
...@@ -73,11 +56,21 @@ TRACE_EVENT(workqueue_queue_work, ...@@ -73,11 +56,21 @@ TRACE_EVENT(workqueue_queue_work,
* which happens immediately after queueing unless @max_active limit * which happens immediately after queueing unless @max_active limit
* is reached. * is reached.
*/ */
DEFINE_EVENT(workqueue_work, workqueue_activate_work, TRACE_EVENT(workqueue_activate_work,
TP_PROTO(struct work_struct *work), TP_PROTO(struct work_struct *work),
TP_ARGS(work) TP_ARGS(work),
TP_STRUCT__entry(
__field( void *, work )
),
TP_fast_assign(
__entry->work = work;
),
TP_printk("work struct %p", __entry->work)
); );
/** /**
...@@ -108,14 +101,27 @@ TRACE_EVENT(workqueue_execute_start, ...@@ -108,14 +101,27 @@ TRACE_EVENT(workqueue_execute_start,
/** /**
* workqueue_execute_end - called immediately after the workqueue callback * workqueue_execute_end - called immediately after the workqueue callback
* @work: pointer to struct work_struct * @work: pointer to struct work_struct
* @function: pointer to worker function
* *
* Allows to track workqueue execution. * Allows to track workqueue execution.
*/ */
DEFINE_EVENT(workqueue_work, workqueue_execute_end, TRACE_EVENT(workqueue_execute_end,
TP_PROTO(struct work_struct *work), TP_PROTO(struct work_struct *work, work_func_t function),
TP_ARGS(work) TP_ARGS(work, function),
TP_STRUCT__entry(
__field( void *, work )
__field( void *, function)
),
TP_fast_assign(
__entry->work = work;
__entry->function = function;
),
TP_printk("work struct %p: function %ps", __entry->work, __entry->function)
); );
#endif /* _TRACE_WORKQUEUE_H */ #endif /* _TRACE_WORKQUEUE_H */
......
...@@ -2266,7 +2266,7 @@ __acquires(&pool->lock) ...@@ -2266,7 +2266,7 @@ __acquires(&pool->lock)
* While we must be careful to not use "work" after this, the trace * While we must be careful to not use "work" after this, the trace
* point will only record its address. * point will only record its address.
*/ */
trace_workqueue_execute_end(work); trace_workqueue_execute_end(work, worker->current_func);
lock_map_release(&lockdep_map); lock_map_release(&lockdep_map);
lock_map_release(&pwq->wq->lockdep_map); lock_map_release(&pwq->wq->lockdep_map);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment