tracing: Remove sysprof
cover tracing: Remove sysprof
Hi Soeren,
Can I get your ACK on the first patch, so that I can propose it for the -tip tree?
Thanks.
Frederic Weisbecker (2):
tracing: Remove sysprof ftrace plugin
tracing: Remove special traces
include/linux/kernel.h | 5 - include/linux/sched.h | 12 -- kernel/trace/Kconfig | 9 - kernel/trace/Makefile | 1 - kernel/trace/trace.c | 58 ------- kernel/trace/trace.h | 9 - kernel/trace/trace_entries.h | 17 -- kernel/trace/trace_output.c | 66 -------- kernel/trace/trace_selftest.c | 33 ---- kernel/trace/trace_sysprof.c | 330 ----------------------------------------- 10 files changed, 0 insertions(+), 540 deletions(-) delete mode 100644 kernel/trace/trace_sysprof.c
RFC PATCH 1/2 tracing: Remove sysprof ftrace plugin
The sysprof ftrace plugin doesn't seem to be seriously used somewhere. There is a branch in the sysprof tree that makes an interface to it, but the real sysprof tool uses either its own module or perf events.
Drop the sysprof ftrace plugin then, as it's mostly useless.
--- kernel/trace/Kconfig | 9 - kernel/trace/Makefile | 1 - kernel/trace/trace.c | 3 - kernel/trace/trace.h | 3 - kernel/trace/trace_selftest.c | 32 ---- kernel/trace/trace_sysprof.c | 330 ----------------------------------------- 6 files changed, 0 insertions(+), 378 deletions(-) delete mode 100644 kernel/trace/trace_sysprof.c
kernel/trace/Kconfig +0 -9
@@ -194,15 +194,6 @@ config PREEMPT_TRACER enabled. This option and the irqs-off timing option can be used together or separately.) -config SYSPROF_TRACER - bool "Sysprof Tracer" - depends on X86 - select GENERIC_TRACER - select CONTEXT_SWITCH_TRACER - help - This tracer provides the trace needed by the 'Sysprof' userspace - tool. - config SCHED_TRACER bool "Scheduling Latency Tracer" select GENERIC_TRACER
kernel/trace/Makefile +0 -1
@@ -30,7 +30,6 @@ obj-$(CONFIG_TRACING) += trace_output.o obj-$(CONFIG_TRACING) += trace_stat.o obj-$(CONFIG_TRACING) += trace_printk.o obj-$(CONFIG_CONTEXT_SWITCH_TRACER) += trace_sched_switch.o -obj-$(CONFIG_SYSPROF_TRACER) += trace_sysprof.o obj-$(CONFIG_FUNCTION_TRACER) += trace_functions.o obj-$(CONFIG_IRQSOFF_TRACER) += trace_irqsoff.o obj-$(CONFIG_PREEMPT_TRACER) += trace_irqsoff.o
kernel/trace/trace.c +0 -3
@@ -4354,9 +4354,6 @@ static __init int tracer_init_debugfs(void)trace_create_file ("dyn_ftrace_total_info" ,0444 , d_tracer, &ftrace_update_tot_cnt, &tracing_dyn_info_fops);#endif -#ifdef CONFIG_SYSPROF_TRACER -init_tracer_sysprof_debugfs (d_tracer); -#endif create_trace_options_dir ();
kernel/trace/trace.h +0 -3
@@ -296,7 +296,6 @@ struct dentry *trace_create_file(const char *name, const struct file_operations *fops);struct dentry *tracing_init_dentry (void ); -void init_tracer_sysprof_debugfs (struct dentry *d_tracer);struct ring_buffer_event ;
@@ -428,8 +427,6 @@ extern int trace_selftest_startup_nop(struct tracer *trace, struct trace_array *tr);extern int trace_selftest_startup_sched_switch (struct tracer *trace,struct trace_array *tr); -extern int trace_selftest_startup_sysprof (struct tracer *trace, -struct trace_array *tr);extern int trace_selftest_startup_branch (struct tracer *trace,struct trace_array *tr);#endif /* CONFIG_FTRACE_STARTUP_TEST */
kernel/trace/trace_selftest.c +0 -32
@@ -690,38 +690,6 @@ trace_selftest_startup_sched_switch(struct tracer *trace, struct trace_array *tr }#endif /* CONFIG_CONTEXT_SWITCH_TRACER */ -#ifdef CONFIG_SYSPROF_TRACER -int -trace_selftest_startup_sysprof (struct tracer *trace,struct trace_array *tr) -{ -unsigned long count; -int ret; - -/* start the tracing */ - ret =tracer_init (trace, tr); -if (ret) { -warn_failed_init_tracer (trace, ret); -return ret; - } - -/* Sleep for a 1/10 of a second */ -msleep (100 ); -/* stop the tracing. */ -tracing_stop (); -/* check the trace buffer */ - ret =trace_test_buffer (tr, &count); - trace->reset (tr); -tracing_start (); - -if (!ret && !count) { -printk (KERN_CONT ".. no entries found .." ); - ret =-1 ; - } - -return ret; -} -#endif /* CONFIG_SYSPROF_TRACER */ -#ifdef CONFIG_BRANCH_TRACER int trace_selftest_startup_branch (struct tracer *trace,struct trace_array *tr)
kernel/trace/trace_sysprof.c deleted +0 -330
330 lines not on this page · raw message
Signature · 1 line
1.6.2.3
RFC PATCH 2/2 tracing: Remove special traces
In reply to Frederic WeisbeckerSpecial traces type was only used by sysprof. Lets remove it now that sysprof ftrace plugin has been dropped.
--- include/linux/kernel.h | 5 --- include/linux/sched.h | 12 ------- kernel/trace/trace.c | 55 ---------------------------------- kernel/trace/trace.h | 6 ---- kernel/trace/trace_entries.h | 17 ---------- kernel/trace/trace_output.c | 66 ----------------------------------------- kernel/trace/trace_selftest.c | 1 - 7 files changed, 0 insertions(+), 162 deletions(-)
include/linux/kernel.h +0 -5
@@ -508,9 +508,6 @@ extern void tracing_start(void);extern void tracing_stop (void );extern void ftrace_off_permanent (void ); -extern void -ftrace_special (unsigned long arg1,unsigned long arg2,unsigned long arg3); -static inline void __attribute__ ((format (printf,1 ,2 )))____trace_printk_check_format (const char *fmt, ...) {
@@ -586,8 +583,6 @@ __ftrace_vprintk(unsigned long ip, const char *fmt, va_list ap);extern void ftrace_dump (enum ftrace_dump_mode oops_dump_mode);#else -static inline void -ftrace_special (unsigned long arg1,unsigned long arg2,unsigned long arg3) { }static inline int trace_printk (const char *fmt, ...) __attribute__ ((format (printf,1 ,2 )));
include/linux/sched.h +0 -12
@@ -2434,18 +2434,6 @@ static inline void set_task_cpu(struct task_struct *p, unsigned int cpu)#endif /* CONFIG_SMP */ -#ifdef CONFIG_TRACING -extern void -__trace_special (void *__tr,void *__data, -unsigned long arg1,unsigned long arg2,unsigned long arg3); -#else -static inline void -__trace_special (void *__tr,void *__data, -unsigned long arg1,unsigned long arg2,unsigned long arg3) -{ -} -#endif -extern long sched_setaffinity (pid_t pid,const struct cpumask *new_mask);extern long sched_getaffinity (pid_t pid,struct cpumask *mask);
kernel/trace/trace.c +0 -55
61 lines not on this page · raw message
kernel/trace/trace.h +0 -6
@@ -22,7 +22,6 @@ enum trace_type {TRACE_STACK ,TRACE_PRINT ,TRACE_BPRINT , -TRACE_SPECIAL ,TRACE_MMIO_RW ,TRACE_MMIO_MAP , TRACE_BRANCH,
@@ -332,11 +331,6 @@ void tracing_sched_wakeup_trace(struct trace_array *tr,struct task_struct *wakee, struct task_struct *cur, unsigned long flags, int pc); -void trace_special (struct trace_array *tr, -struct trace_array_cpu *data, -unsigned long arg1, -unsigned long arg2, -unsigned long arg3,int pc); void trace_function(struct trace_array *tr, unsigned long ip, unsigned long parent_ip,
kernel/trace/trace_entries.h +0 -17
@@ -151,23 +151,6 @@ FTRACE_ENTRY_DUP(wakeup, ctx_switch_entry, );/* -* Special (free-form) trace entry: -*/ -FTRACE_ENTRY (special, special_entry, - -TRACE_SPECIAL , - -F_STRUCT ( - __field( unsigned long, arg1 ) - __field( unsigned long, arg2 ) - __field( unsigned long, arg3 ) - ), - -F_printk ("(%08lx) (%08lx) (%08lx)" , - __entry->arg1, __entry->arg2, __entry->arg3) -); - -/* * Stack-trace entry: */
kernel/trace/trace_output.c +0 -66
90 lines not on this page · raw message
kernel/trace/trace_selftest.c +0 -1
@@ -13,7 +13,6 @@ static inline int trace_valid_entry(struct trace_entry *entry)case TRACE_WAKE :case TRACE_STACK :case TRACE_PRINT : -case TRACE_SPECIAL :case TRACE_BRANCH :case TRACE_GRAPH_ENT :case TRACE_GRAPH_RET :
Signature · 1 line
1.6.2.3
Re: [RFC PATCH 2/2] tracing: Remove special traces
Quoted 14 lines
kernel/trace/trace.h +0
-1@@ -22,7 +22,6 @@ enum trace_type {TRACE_STACK ,TRACE_PRINT ,TRACE_BPRINT , -TRACE_SPECIAL ,TRACE_MMIO_RW ,TRACE_MMIO_MAP , TRACE_BRANCH,@@ -332,11 +331,6 @@ void tracing_sched_wakeup_trace(struct trace_array *tr, struct task_struct *wakee,
kernel/trace/trace.h void tracing_sched_wakeup_trace(struct trace_array *tr, · line 336
Quoted 10 lines
kernel/trace/trace.h +0
-5struct task_struct *cur, unsigned long flags, int pc); -void trace_special (struct trace_array *tr, -struct trace_array_cpu *data, -unsigned long arg1, -unsigned long arg2, -unsigned long arg3,int pc); void trace_function(struct trace_array *tr, unsigned long ip, unsigned long parent_ip,
You forgot to delete this:
IF_ASSIGN(var, ent, struct special_entry, 0); \
Re: [RFC PATCH 2/2] tracing: Remove special traces
Quoted 27 lines · Li Zefan
Quoted 14 lines
kernel/trace/trace.h +0
-1@@ -22,7 +22,6 @@ enum trace_type {TRACE_STACK ,TRACE_PRINT ,TRACE_BPRINT , -TRACE_SPECIAL ,TRACE_MMIO_RW ,TRACE_MMIO_MAP , TRACE_BRANCH,@@ -332,11 +331,6 @@ void tracing_sched_wakeup_trace(struct trace_array *tr, struct task_struct *wakee,kernel/trace/trace.h void tracing_sched_wakeup_trace(struct trace_array *tr, · line 336
Quoted 10 lines
kernel/trace/trace.h +0
-5struct task_struct *cur, unsigned long flags, int pc); -void trace_special (struct trace_array *tr, -struct trace_array_cpu *data, -unsigned long arg1, -unsigned long arg2, -unsigned long arg3,int pc); void trace_function(struct trace_array *tr, unsigned long ip, unsigned long parent_ip,You forgot to delete this:
Quoted 1 line
IF_ASSIGN(var, ent, struct special_entry, 0); \
Oops, right, I forgot that. And I forgot to Cc you as well, sorry.
Will fix, thanks.
Quoted 4 lines · Frederic Weisbecker
Hi Soeren,
Can I get your ACK on the first patch, so that I can propose it for the -tip tree?
Sure,
Soren