2019-02-15 00:29:08

by Quentin Perret

Subject: [PATCH] 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.

Signed-off-by: Quentin Perret <[email protected]>
---
kernel/trace/trace.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index c521b7347482..c4238b441624 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -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",
--
2.20.1

2019-02-15 00:39:51

by Joel Fernandes

Subject: Re: [PATCH] tracing: Fix number of entries in trace header

On Thu, Feb 14, 2019 at 10:01 AM Quentin Perret <[email protected]> wrote:
>
> 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.

Acked-by: Joel Fernandes <[email protected]>

Thanks a lot Quentin!

- Joel

2019-02-15 00:45:04

by Quentin Perret

Subject: Re: [PATCH] tracing: Fix number of entries in trace header

On Thursday 14 Feb 2019 at 10:12:52 (-0500), Joel Fernandes wrote:
> On Thu, Feb 14, 2019 at 10:01 AM Quentin Perret <[email protected]> wrote:
> >
> > 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.

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

> Acked-by: Joel Fernandes <[email protected]>

Thanks !
Quentin

2019-02-15 00:47:20

by Quentin Perret

Subject: [PATCH v2] 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.

Fixes: 441dae8f2f29 ("tracing: Add support for display of tgid in trace output")
Cc: 4.13+ <[email protected]> # v4.13+
Signed-off-by: Quentin Perret <[email protected]>
Acked-by: Joel Fernandes <[email protected]>
---
kernel/trace/trace.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index c521b7347482..c4238b441624 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -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",
--
2.20.1

2019-02-15 00:54:57

by Steven Rostedt

Subject: Re: [PATCH v2] tracing: Fix number of entries in trace header

On Thu, 14 Feb 2019 15:29:50 +0000
Quentin Perret <[email protected]> wrote:

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

Thanks, I'll take a look at this.

>
> 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

Cc: [email protected]

is sufficient.

-- Steve

> Signed-off-by: Quentin Perret <[email protected]>
> Acked-by: Joel Fernandes <[email protected]>
> ---
> kernel/trace/trace.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
> index c521b7347482..c4238b441624 100644
> --- a/kernel/trace/trace.c
> +++ b/kernel/trace/trace.c
> @@ -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",