Commit fb39125f authored by Zhaolei's avatar Zhaolei Committed by Frederic Weisbecker
Browse files

ftrace, workqueuetrace: make workqueue tracepoints use TRACE_EVENT macro 



v3: zhaolei@cn.fujitsu.com: Change TRACE_EVENT definition to new format
    introduced by Steven Rostedt: consolidate trace and trace_event headers
v2: kosaki@jp.fujitsu.com: print the function names instead of addr, and zap
    the work addr
v1: zhaolei@cn.fujitsu.com: Make workqueue tracepoints use TRACE_EVENT macro

TRACE_EVENT is a more generic way to define tracepoints.
Doing so adds these new capabilities to the tracepoints:

  - zero-copy and per-cpu splice() tracing
  - binary tracing without printf overhead
  - structured logging records exposed under /debug/tracing/events
  - trace events embedded in function tracer output and other plugins
  - user-defined, per tracepoint filter expressions

Then, this patch converts DEFINE_TRACE to TRACE_EVENT in workqueue related
tracepoints.

[ Impact: expand workqueue tracer to events tracing ]

Signed-off-by: default avatarZhao Lei <zhaolei@cn.fujitsu.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Tom Zanussi <tzanussi@gmail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
parent f2aebaee

include/trace/events/workqueue.h

0 → 100644
+100 −0
Original line number Diff line number Diff line 
#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>

include/trace/workqueue.h

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
#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 */

kernel/trace/trace_workqueue.c

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 */





#include <trace/workqueue.h>

#include <trace/events/workqueue.h>

#include <linux/list.h>

#include <linux/percpu.h>

#include "trace_stat.h"

kernel/workqueue.c

+2 −9
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ 
#include <linux/kallsyms.h>

#include <linux/debug_locks.h>

#include <linux/lockdep.h>

#include <trace/workqueue.h>

#define CREATE_TRACE_POINTS

#include <trace/events/workqueue.h>



/*

 * The per-CPU workqueue (if single thread, we always use the first
@@ -124,8 +125,6 @@ struct cpu_workqueue_struct *get_wq_data(struct work_struct *work) 
	return (void *) (atomic_long_read(&work->data) & WORK_STRUCT_WQ_DATA_MASK);

}



DEFINE_TRACE(workqueue_insertion);



static void insert_work(struct cpu_workqueue_struct *cwq,

			struct work_struct *work, struct list_head *head)

{
@@ -262,8 +261,6 @@ int queue_delayed_work_on(int cpu, struct workqueue_struct *wq, 
}

EXPORT_SYMBOL_GPL(queue_delayed_work_on);



DEFINE_TRACE(workqueue_execution);



static void run_workqueue(struct cpu_workqueue_struct *cwq)

{

	spin_lock_irq(&cwq->lock);
@@ -753,8 +750,6 @@ init_cpu_workqueue(struct workqueue_struct *wq, int cpu) 
	return cwq;

}



DEFINE_TRACE(workqueue_creation);



static int create_workqueue_thread(struct cpu_workqueue_struct *cwq, int cpu)

{

	struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 };
@@ -860,8 +855,6 @@ struct workqueue_struct *__create_workqueue_key(const char *name, 
}

EXPORT_SYMBOL_GPL(__create_workqueue_key);



DEFINE_TRACE(workqueue_destruction);



static void cleanup_workqueue_thread(struct cpu_workqueue_struct *cwq)

{

	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE