tracing: Remove lock_depth from event entry

The lock_depth field in the event headers was added as a temporary
data point for help in removing the BKL. Now that the BKL is pretty
much been removed, we can remove this field.

This in turn changes the header from 12 bytes to 8 bytes,
removing the 4 byte buffer that gcc would insert if the first field
in the data load was 8 bytes in size.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index 1a99e7939c2b7274cc6d8efec7f3e93d1035f232..22b32af1b5ec3d1aa81ddebbc2de1ace29c17cc6 100644 (file)
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -37,7 +37,6 @@ struct trace_entry {
        unsigned char           flags;
        unsigned char           preempt_count;
        int                     pid;
-       int                     lock_depth;
 };
 
 #define FTRACE_MAX_EVENT                                               \

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 85e3ee1e474e1a1336507dd592c1ab9f8619344f..fd6e1b906b3c53fe91749b951f179c0a009b3f58 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1101,7 +1101,6 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags,
 
        entry->preempt_count            = pc & 0xff;
        entry->pid                      = (tsk) ? tsk->pid : 0;
-       entry->lock_depth               = (tsk) ? tsk->lock_depth : 0;
        entry->flags =
 #ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT
                (irqs_disabled_flags(flags) ? TRACE_FLAG_IRQS_OFF : 0) |
@@ -1748,10 +1747,9 @@ static void print_lat_help_header(struct seq_file *m)
        seq_puts(m, "#                | / _----=> need-resched    \n");
        seq_puts(m, "#                || / _---=> hardirq/softirq \n");
        seq_puts(m, "#                ||| / _--=> preempt-depth   \n");
-       seq_puts(m, "#                |||| /_--=> lock-depth       \n");
-       seq_puts(m, "#                |||||/     delay             \n");
-       seq_puts(m, "#  cmd     pid   |||||| time  |   caller      \n");
-       seq_puts(m, "#     \\   /      ||||||   \\   |   /           \n");
+       seq_puts(m, "#                |||| /     delay             \n");
+       seq_puts(m, "#  cmd     pid   ||||| time  |   caller      \n");
+       seq_puts(m, "#     \\   /      |||||  \\    |   /           \n");
 }
 
 static void print_func_help_header(struct seq_file *m)

diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 5f499e0438a4f9137b66055331cb8c3b048138ed..e1d579b19834f0d2975fda029c363959638b7b1a 100644 (file)
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -116,7 +116,6 @@ static int trace_define_common_fields(void)
        __common_field(unsigned char, flags);
        __common_field(unsigned char, preempt_count);
        __common_field(int, pid);
-       __common_field(int, lock_depth);
 
        return ret;
 }

diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index 02272baa22065c14c98e1c7394d2486a4d6a473e..151f32e5f2c6c4b681e6d0776cdd39b289081bd2 100644 (file)
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -529,7 +529,7 @@ seq_print_ip_sym(struct trace_seq *s, unsigned long ip, unsigned long sym_flags)
  * @entry: The trace entry field from the ring buffer
  *
  * Prints the generic fields of irqs off, in hard or softirq, preempt
- * count and lock depth.
+ * count.
  */
 int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
 {
@@ -554,13 +554,7 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
        else
                ret = trace_seq_putc(s, '.');
 
-       if (!ret)
-               return 0;
-
-       if (entry->lock_depth < 0)
-               return trace_seq_putc(s, '.');
-
-       return trace_seq_printf(s, "%d", entry->lock_depth);
+       return ret;
 }
 
 static int