tracing: move binary buffers into per cpu directory

The binary_buffers directory in /debugfs/tracing held the files
to read the trace buffers in a binary format. This held one file
per CPU buffer. But we also have a per_cpu directory that holds
a way to read the pretty-print formats.

This patch moves the binary buffers into the per_cpu_directory:

 # ls /debug/tracing/per_cpu/cpu1/
trace  trace_pipe  trace_pipe_raw

The new name is called "trace_pipe_raw". The binary buffers always
acted similar to trace_pipe, except that they produce raw data.

Requested-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Steven Rostedt <srostedt@redhat.com>

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index dbb077d8a172940af33dac21a55d0e5506c99e37..efe3202c02092188d14a3eb32f8c9d92024a8dca 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3543,6 +3543,11 @@ static void tracing_init_debugfs_percpu(long cpu)
                                (void *) cpu, &tracing_fops);
        if (!entry)
                pr_warning("Could not create debugfs 'trace' entry\n");
+
+       entry = debugfs_create_file("trace_pipe_raw", 0444, d_cpu,
+                                   (void *) cpu, &tracing_buffers_fops);
+       if (!entry)
+               pr_warning("Could not create debugfs 'trace_pipe_raw' entry\n");
 }
 
 #ifdef CONFIG_FTRACE_SELFTEST
@@ -3826,7 +3831,6 @@ static __init void create_trace_options_dir(void)
 static __init int tracer_init_debugfs(void)
 {
        struct dentry *d_tracer;
-       struct dentry *buffers;
        struct dentry *entry;
        int cpu;
 
@@ -3899,26 +3903,6 @@ static __init int tracer_init_debugfs(void)
                pr_warning("Could not create debugfs "
                           "'trace_marker' entry\n");
 
-       buffers = debugfs_create_dir("binary_buffers", d_tracer);
-
-       if (!buffers)
-               pr_warning("Could not create buffers directory\n");
-       else {
-               int cpu;
-               char buf[64];
-
-               for_each_tracing_cpu(cpu) {
-                       sprintf(buf, "%d", cpu);
-
-                       entry = debugfs_create_file(buf, 0444, buffers,
-                                                   (void *)(long)cpu,
-                                                   &tracing_buffers_fops);
-                       if (!entry)
-                               pr_warning("Could not create debugfs buffers "
-                                          "'%s' entry\n", buf);
-               }
-       }
-
 #ifdef CONFIG_DYNAMIC_FTRACE
        entry = debugfs_create_file("dyn_ftrace_total_info", 0444, d_tracer,
                                    &ftrace_update_tot_cnt,