[PATCH] workqueue: tracing the name of the workqueue instead of it's address

[PATCH] workqueue: tracing the name of the workqueue instead of it's address

[qiang.zhang]

From: Zqiang <qiang.zhang@windriver.com>

This patch tracing workqueue name instead of it's address, the
new format is as follows.

workqueue_queue_work: work struct=0000000084e3df56 function=
drm_fb_helper_dirty_work workqueue=events req_cpu=256 cpu=1

This tell us to know which workqueue our work is queued.

Signed-off-by: Zqiang <qiang.zhang@windriver.com>
---
 include/trace/events/workqueue.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/trace/events/workqueue.h b/include/trace/events/workqueue.h
index 9b8ae961acc5..970cc2ea2850 100644
--- a/include/trace/events/workqueue.h
+++ b/include/trace/events/workqueue.h
@@ -30,7 +30,7 @@ TRACE_EVENT(workqueue_queue_work,
 	TP_STRUCT__entry(
 		__field( void *,	work	)
 		__field( void *,	function)
-		__field( void *,	workqueue)
+		__field( const char *,	workqueue)
 		__field( unsigned int,	req_cpu	)
 		__field( unsigned int,	cpu	)
 	),
@@ -38,12 +38,12 @@ TRACE_EVENT(workqueue_queue_work,
 	TP_fast_assign(
 		__entry->work		= work;
 		__entry->function	= work->func;
-		__entry->workqueue	= pwq->wq;
+		__entry->workqueue	= pwq->wq->name;
 		__entry->req_cpu	= req_cpu;
 		__entry->cpu		= pwq->pool->cpu;
 	),
 
-	TP_printk("work struct=%p function=%ps workqueue=%p req_cpu=%u cpu=%u",
+	TP_printk("work struct=%p function=%ps workqueue=%s req_cpu=%u cpu=%u",
 		  __entry->work, __entry->function, __entry->workqueue,
 		  __entry->req_cpu, __entry->cpu)
 );
-- 
2.17.1

Re: [PATCH] workqueue: tracing the name of the workqueue instead of it's address

[Tejun Heo]

On Mon, Jan 04, 2021 at 08:43:06PM +0800, qiang.zhang@windriver.com wrote:
> From: Zqiang <qiang.zhang@windriver.com>
> 
> This patch tracing workqueue name instead of it's address, the
> new format is as follows.
> 
> workqueue_queue_work: work struct=0000000084e3df56 function=
> drm_fb_helper_dirty_work workqueue=events req_cpu=256 cpu=1
> 
> This tell us to know which workqueue our work is queued.
> 
> Signed-off-by: Zqiang <qiang.zhang@windriver.com>

Applied to wq/for-5.12.

Thanks.

-- 
tejun