Skip to contentSkip to conversation

tracing: Fix number of entries in trace header

PATCH Superseded Quentin Perret 3 participants 5 messages Feb 14, 2019 Tracing

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tracing: Fix number of entries in trace header

The following commit

441dae8f2f29 ("tracing: Add support for display of tgid in trace output")

removed the call to print_event_info() from print_func_help_header_irq() which results in the ftrace header not reporting the number of entries written in the buffer. As this wasn't the original intent of the patch, re-introduce the call to print_event_info() to restore the orginal behaviour.

---
 kernel/trace/trace.c | 2 ++
 1 file changed, 2 insertions(+)
kernel/trace/trace.c +2 -0
index c521b7347482..c4238b441624 100644
@@ -3384,6 +3384,8 @@ static void print_func_help_header_irq(struct trace_buffer *buf, struct seq_file
 	const char tgid_space[] = "          ";
 	const char space[] = "  ";
 
+	print_event_info(buf, m);
+
 	seq_printf(m, "#                          %s  _-----=> irqs-off\n",
 		   tgid ? tgid_space : space);
 	seq_printf(m, "#                          %s / _----=> need-resched\n",
Signature · 1 line
2.20.1
Acked-by on v1 1/1
#1 lore raw
Quoted 10 lines · Quentin Perret

The following commit

441dae8f2f29 ("tracing: Add support for display of tgid in trace output")

removed the call to print_event_info() from print_func_help_header_irq() which results in the ftrace header not reporting the number of entries written in the buffer. As this wasn't the original intent of the patch, re-introduce the call to print_event_info() to restore the orginal behaviour.

Needs a "Fixes:" tag, and a CC to stable.

Thanks a lot Quentin!

- Joel

#2 lore raw
Quoted 6 lines · Joel Fernandes
Quoted 5 lines · Quentin Perret

The following commit

441dae8f2f29 ("tracing: Add support for display of tgid in trace output")

Quoted 7 lines
Quoted 5 lines

removed the call to print_event_info() from print_func_help_header_irq() which results in the ftrace header not reporting the number of entries written in the buffer. As this wasn't the original intent of the patch, re-introduce the call to print_event_info() to restore the orginal behaviour.

Needs a "Fixes:" tag, and a CC to stable.

Hrmpf, good point, I always forget those, sorry about that :/ I'll send a v2 shortly.

Quoted 1 line

Thanks !
Quentin

#3 lore raw

PATCH v2 1/1 tracing: Fix number of entries in trace header

In reply to Quentin Perret

The following commit

441dae8f2f29 ("tracing: Add support for display of tgid in trace output")

removed the call to print_event_info() from print_func_help_header_irq() which results in the ftrace header not reporting the number of entries written in the buffer. As this wasn't the original intent of the patch, re-introduce the call to print_event_info() to restore the orginal behaviour.

Fixes 441dae8f2f29 ("tracing: Add support for display of tgid in trace output")
Cc 4.13+ <[email protected]> # v4.13+
---
 kernel/trace/trace.c | 2 ++
 1 file changed, 2 insertions(+)
kernel/trace/trace.c +2 -0
index c521b7347482..c4238b441624 100644
@@ -3384,6 +3384,8 @@ static void print_func_help_header_irq(struct trace_buffer *buf, struct seq_file
 	const char tgid_space[] = "          ";
 	const char space[] = "  ";
 
+	print_event_info(buf, m);
+
 	seq_printf(m, "#                          %s  _-----=> irqs-off\n",
 		   tgid ? tgid_space : space);
 	seq_printf(m, "#                          %s / _----=> need-resched\n",
Signature · 1 line
2.20.1
maintainer
#4 lore raw
Quoted 3 lines · On Thu, 14 Feb 2019 15:29:50 +0000 Quentin Perret <[email protected]>…

The following commit

441dae8f2f29 ("tracing: Add support for display of tgid in trace output")

Thanks, I'll take a look at this.

Quoted 9 lines

removed the call to print_event_info() from print_func_help_header_irq() which results in the ftrace header not reporting the number of entries written in the buffer. As this wasn't the original intent of the patch, re-introduce the call to print_event_info() to restore the orginal behaviour.

Fixes 441dae8f2f29 ("tracing: Add support for display of tgid in trace output")
Cc 4.13+ <[email protected]> # v4.13+

Note, with the "Fixes:" tag, adding the version number is obsolete. Just

is sufficient.

-- Steve

Quoted 19 lines
---
 kernel/trace/trace.c | 2 ++
 1 file changed, 2 insertions(+)
kernel/trace/trace.c +2 -0
index c521b7347482..c4238b441624 100644
@@ -3384,6 +3384,8 @@ static void print_func_help_header_irq(struct trace_buffer *buf, struct seq_file
 	const char tgid_space[] = "          ";
 	const char space[] = "  ";
 
+	print_event_info(buf, m);
+
 	seq_printf(m, "#                          %s  _-----=> irqs-off\n",
 		   tgid ? tgid_space : space);
 	seq_printf(m, "#                          %s / _----=> need-resched\n",