tracing stat and tracing workqueue bits
Hi Ingo,
Here is a rebase of stat and workqueue bits against tracing/core.
- Workqueue tracer bits:
Those are only fixes from -rc1 and exclude the features that were done on it (worklet tracing, etc...).
The features part are waiting for another cycle to reduce the amount of code, ie: by using the internal stat hashlist.
The exception is the conversion from existing tracepoints to TRACE_EVENT, which is a pretty natural evolution of the tracepoints themselves.
- Histogram tracing bits
They are all included, features and fixes (rbtree sort based, etc..).
Thanks,
Frederic.
The following changes since commit f2aebaee653a35b01c3665de2cbb1e31456b8ea8:
Zhaolei (1):
ftrace: don't convert function's local variable name in macro
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git tracing/fixes
Frederic Weisbecker (3):
tracing/stat: replace trace_stat_session by stat_session tracing/stat: replace linked list by an rbtree for sorting tracing/stat: remove unappropriate safe walk on list
Li Zefan (3):
tracing/stat: change dummpy_cmp() to return -1 tracing/stat: remember to free root node tracing/stat: do some cleanups
Zhaolei (4):
ftrace, workqueuetrace: make workqueue tracepoints use TRACE_EVENT macro
trace_workqueue: use list_for_each_entry() instead of list_for_each_entry_safe()
trace_workqueue: remove cpu_workqueue_stats->first_entry
trace_workqueue: remove blank line between each cpu
include/trace/events/workqueue.h | 100 ++++++++++++++++++ include/trace/workqueue.h | 25 ----- kernel/trace/trace_stat.c | 206 +++++++++++++++++++++++--------------- kernel/trace/trace_workqueue.c | 23 +---- kernel/workqueue.c | 11 +-- 5 files changed, 234 insertions(+), 131 deletions(-) create mode 100644 include/trace/events/workqueue.h delete mode 100644 include/trace/workqueue.h
---
include/trace/events/workqueue.h new file +100 -0
@@ -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>
include/trace/workqueue.h deleted +0 -25
@@ -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 */
kernel/trace/trace_stat.c +127 -79
359 lines not on this page · raw message
kernel/trace/trace_workqueue.c +5 -18
@@ -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"
@@ -16,8 +16,6 @@/* A cpu workqueue thread */ struct cpu_workqueue_stats {struct list_head list; -/* Useful to know if we print the cpu headers */ -bool first_entry;int cpu;pid_t pid;/* Can be inserted from interrupt or user context, need to be atomic */
@@ -47,12 +45,11 @@ probe_workqueue_insertion(struct task_struct *wq_thread, struct work_struct *work) {int cpu =cpumask_first (&wq_thread->cpus_allowed); -struct cpu_workqueue_stats *node, *next; +struct cpu_workqueue_stats *node;unsigned long flags;spin_lock_irqsave (&workqueue_cpu_stat (cpu)->lock, flags); -list_for_each_entry_safe (node, next, &workqueue_cpu_stat (cpu)->list, - list) { +list_for_each_entry (node, &workqueue_cpu_stat (cpu)->list, list) {if (node->pid == wq_thread->pid) {atomic_inc (&node->inserted); goto found;
@@ -69,12 +66,11 @@ probe_workqueue_execution(struct task_struct *wq_thread, struct work_struct *work) {int cpu =cpumask_first (&wq_thread->cpus_allowed); -struct cpu_workqueue_stats *node, *next; +struct cpu_workqueue_stats *node;unsigned long flags;spin_lock_irqsave (&workqueue_cpu_stat (cpu)->lock, flags); -list_for_each_entry_safe (node, next, &workqueue_cpu_stat (cpu)->list, - list) { +list_for_each_entry (node, &workqueue_cpu_stat (cpu)->list, list) {if (node->pid == wq_thread->pid) { node->executed++; goto found;
@@ -105,8 +101,6 @@ static void probe_workqueue_creation(struct task_struct *wq_thread, int cpu) cws->pid = wq_thread->pid;spin_lock_irqsave (&workqueue_cpu_stat (cpu)->lock, flags); -if (list_empty (&workqueue_cpu_stat (cpu)->list)) - cws->first_entry = true;list_add_tail (&cws->list, &workqueue_cpu_stat (cpu)->list);spin_unlock_irqrestore (&workqueue_cpu_stat (cpu)->lock, flags); }
@@ -191,16 +185,9 @@ static void *workqueue_stat_next(void *prev, int idx)static int workqueue_stat_show (struct seq_file *s,void *p) {struct cpu_workqueue_stats *cws = p; -unsigned long flags; -int cpu = cws->cpu;struct pid *pid;struct task_struct *tsk; -spin_lock_irqsave (&workqueue_cpu_stat (cpu)->lock, flags); -if (&cws->list ==workqueue_cpu_stat (cpu)->list.next) -seq_printf (s,"\n" ); -spin_unlock_irqrestore (&workqueue_cpu_stat (cpu)->lock, flags); - pid =find_get_pid (cws->pid);if (pid) { tsk =get_pid_task (pid,PIDTYPE_PID );
kernel/workqueue.c +2 -9
@@ -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) {/*