Commit a3a4a5ac authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Linus Torvalds
Browse files

Regression: partial revert "tracing: Remove lock_depth from event entry" 



This partially reverts commit e6e1e259.

That commit changed the structure layout of the trace structure, which
in turn broke PowerTOP (1.9x generation) quite badly.

I appreciate not wanting to expose the variable in question, and
PowerTOP was not using it, so I've replaced the variable with just a
padding field - that way if in the future a new field is needed it can
just use this padding field.

Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e5e06985

include/linux/ftrace_event.h

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

	unsigned char		preempt_count;

	int			pid;

	int			padding;

};



#define FTRACE_MAX_EVENT						\

kernel/trace/trace.c

+1 −0
Original line number Diff line number Diff line
@@ -1110,6 +1110,7 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags, 


	entry->preempt_count		= pc & 0xff;

	entry->pid			= (tsk) ? tsk->pid : 0;

	entry->padding			= 0;

	entry->flags =

#ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT

		(irqs_disabled_flags(flags) ? TRACE_FLAG_IRQS_OFF : 0) |

kernel/trace/trace_events.c

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ 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, padding);



	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE