Commit 12b5da34 authored by Steven Rostedt's avatar Steven Rostedt Committed by Steven Rostedt

tracing: Fix ent_size in trace output

When reading the trace file, the records of each of the per_cpu buffers
are examined to find the next event to print out. At the point of looking
at the event, the size of the event is recorded. But if the first event is
chosen, the other events in the other CPU buffers will reset the event size
that is stored in the iterator descriptor, causing the event size passed to
the output functions to be incorrect.

In most cases this is not a problem, but for the case of stack traces, it
is. With the change to the stack tracing to record a dynamic number of
back traces, the output depends on the size of the entry instead of the
fixed 8 back traces. When the entry size is not correct, the back traces
would not be fully printed.

Note, reading from the per-cpu trace files were not affected.
Reported-by: default avatarThomas Gleixner <tglx@linutronix.de>
Tested-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 2c86bf17
...@@ -1698,6 +1698,7 @@ __find_next_entry(struct trace_iterator *iter, int *ent_cpu, ...@@ -1698,6 +1698,7 @@ __find_next_entry(struct trace_iterator *iter, int *ent_cpu,
int cpu_file = iter->cpu_file; int cpu_file = iter->cpu_file;
u64 next_ts = 0, ts; u64 next_ts = 0, ts;
int next_cpu = -1; int next_cpu = -1;
int next_size = 0;
int cpu; int cpu;
/* /*
...@@ -1729,9 +1730,12 @@ __find_next_entry(struct trace_iterator *iter, int *ent_cpu, ...@@ -1729,9 +1730,12 @@ __find_next_entry(struct trace_iterator *iter, int *ent_cpu,
next_cpu = cpu; next_cpu = cpu;
next_ts = ts; next_ts = ts;
next_lost = lost_events; next_lost = lost_events;
next_size = iter->ent_size;
} }
} }
iter->ent_size = next_size;
if (ent_cpu) if (ent_cpu)
*ent_cpu = next_cpu; *ent_cpu = next_cpu;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment