tracing/core: make the per cpu trace files in per cpu directories
PATCH 1/2 tracing/core: make the per cpu trace files in per cpu directories
Impact: scale per cpu tracing
The per cpu trace files are all in a single directory: /debug/tracing/per_cpu. In case of a large number of cpu, the content of this directory becomes messy so we create now one directory per cpu inside /debug/tracing/per_cpu which contain each their own trace_pipe and trace files.
Ie:
nobody@nowhere:/debug/tracing$ ls -R per_cpu per_cpu: cpu0 cpu1
per_cpu/cpu0:
trace trace_pipe
per_cpu/cpu1:
trace trace_pipe
--- kernel/trace/trace.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-)
kernel/trace/trace.c +14 -11
@@ -3061,28 +3061,31 @@ struct dentry *tracing_dentry_percpu(void)static void tracing_init_debugfs_percpu (long cpu) {struct dentry *d_percpu =tracing_dentry_percpu (); -struct dentry *entry; -/* strlen(trace_pipe) + MAX(log10(cpu)) + '\0' */ -char filename[17 ]; +struct dentry *entry, *d_cpu; +/* strlen(cpu) + MAX(log10(cpu)) + '\0' */ +char cpu_dir[7 ];if (cpu >999 || cpu <0 )return ; -/* per cpu trace_pipe */ -sprintf (filename,"trace_pipe%ld" , cpu); +sprintf (cpu_dir,"cpu%ld" , cpu); + d_cpu =debugfs_create_dir (cpu_dir, d_percpu); +if (!d_cpu) { +pr_warning ("Could not create debugfs '%s' entry\n" , cpu_dir); +return ; + } - entry =debugfs_create_file (filename,0444 , d_percpu, +/* per cpu trace_pipe */ + entry =debugfs_create_file ("trace_pipe" ,0444 , d_cpu, (void *) cpu, &tracing_pipe_fops);if (!entry) -pr_warning ("Could not create debugfs '%s' entry\n" , filename); +pr_warning ("Could not create debugfs 'trace_pipe' entry\n" );/* per cpu trace */ -sprintf (filename,"trace%ld" , cpu); - - entry =debugfs_create_file (filename,0444 , d_percpu, + entry =debugfs_create_file ("trace" ,0444 , d_cpu, (void *) cpu, &tracing_fops);if (!entry) -pr_warning ("Could not create debugfs '%s' entry\n" , filename); +pr_warning ("Could not create debugfs 'trace' entry\n" ); }
Signature · 1 line
1.6.1
Quoted 16 lines · Frederic Weisbecker
Impact: scale per cpu tracing
The per cpu trace files are all in a single directory: /debug/tracing/per_cpu. In case of a large number of cpu, the content of this directory becomes messy so we create now one directory per cpu inside /debug/tracing/per_cpu which contain each their own
trace_pipeand trace files.Ie:
nobody@nowhere:/debug/tracing$ ls -R per_cpu per_cpu: cpu0 cpu1per_cpu/cpu0:
tracetrace_pipe
Quoted 8 lines
per_cpu/cpu1:
tracetrace_pipeSigned-off-by Frederic Weisbecker <[email protected]>Cc Steven Rostedt <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc Peter Zijlstra <[email protected]>Cc Lai Jiangshan <[email protected]>
Oh, I forgot to mention: they apply on top of latest -tip + the ftrace_bprintk 3 patches.
Ingo Molnar
AppliedQuoted 7 lines · Frederic Weisbecker
Impact: scale per cpu tracing
The per cpu trace files are all in a single directory:
/debug/tracing/per_cpu. In case of a large number of cpu, the content of this directory becomes messy so we create now one directory per cpu inside /debug/tracing/per_cpu which contain each their owntrace_pipeand trace files.
Applied to tip:tracing/ftrace, thanks Frederic!
Ingo
Quoted 11 lines · Ingo Molnar
Quoted 7 lines · Frederic Weisbecker
Impact: scale per cpu tracing
The per cpu trace files are all in a single directory:
/debug/tracing/per_cpu. In case of a large number of cpu, the content of this directory becomes messy so we create now one directory per cpu inside /debug/tracing/per_cpu which contain each their owntrace_pipeand trace files.Applied to tip:tracing/ftrace, thanks Frederic!
The layout looks much more structured on a 16-way box now:
phoenix:/debug/tracing/per_cpu> ll
total 0
drwxr-xr-x 2 root root 0 2009-02-26 14:19 cpu0 drwxr-xr-x 2 root root 0 2009-02-26 14:19 cpu1 drwxr-xr-x 2 root root 0 2009-02-26 14:19 cpu10 drwxr-xr-x 2 root root 0 2009-02-26 14:19 cpu11 drwxr-xr-x 2 root root 0 2009-02-26 14:19 cpu12 drwxr-xr-x 2 root root 0 2009-02-26 14:19 cpu13 drwxr-xr-x 2 root root 0 2009-02-26 14:19 cpu14 drwxr-xr-x 2 root root 0 2009-02-26 14:19 cpu15 drwxr-xr-x 2 root root 0 2009-02-26 14:19 cpu2 drwxr-xr-x 2 root root 0 2009-02-26 14:19 cpu3 drwxr-xr-x 2 root root 0 2009-02-26 14:19 cpu4 drwxr-xr-x 2 root root 0 2009-02-26 14:19 cpu5 drwxr-xr-x 2 root root 0 2009-02-26 14:19 cpu6 drwxr-xr-x 2 root root 0 2009-02-26 14:19 cpu7 drwxr-xr-x 2 root root 0 2009-02-26 14:19 cpu8 drwxr-xr-x 2 root root 0 2009-02-26 14:19 cpu9 phoenix:/debug/tracing/per_cpu> cd cpu0 phoenix:/debug/tracing/per_cpu/cpu0> ll total 0
-r--r--r-- 1 root root 0 2009-02-26 14:19 trace -r--r--r-- 1 root root 0 2009-02-26 14:19 trace_pipe phoenix:/debug/tracing/per_cpu/cpu0>
Ingo