Commit e6e1e259 authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt
Browse files

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: default avatarSteven Rostedt <rostedt@goodmis.org>
parent de29be5e

include/linux/ftrace_event.h

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ struct trace_entry { 
	unsigned char		flags;

	unsigned char		preempt_count;

	int			pid;

	int			lock_depth;

};



#define FTRACE_MAX_EVENT						\

kernel/trace/trace.c

+3 −5
Original line number Diff line number Diff line
@@ -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)

kernel/trace/trace_events.c

+0 −1
Original line number Diff line number Diff line
@@ -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;

}

kernel/trace/trace_output.c

+2 −8
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE