public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] event: fix TP_printk() argument in sched_switch
@ 2011-11-02 22:40 Andrew Vagin
  2011-11-02 23:07 ` Steven Rostedt
  0 siblings, 1 reply; 11+ messages in thread
From: Andrew Vagin @ 2011-11-02 22:40 UTC (permalink / raw)
  To: linux-kernel
  Cc: Peter Zijlstra, Ingo Molnar, Frederic Weisbecker, Steven Rostedt,
	avagin, devel

process_arg(...) can't parse "__entry->prev_state & (TASK_STATE_MAX-1)",
because a complicated argument should be within brackets.

Without this patch "perf report" prints following errors:
$ ./perf record -ag -e sched:sched_switch
...
$ ./perf report
  Warning: Error: expected type 5 but read 4
  Warning: Error: expected type 4 but read 0
  Fatal: bad op token {

Signed-off-by: Andrew Vagin <avagin@openvz.org>
---
 include/trace/events/sched.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h
index 959ff18..1838237 100644
--- a/include/trace/events/sched.h
+++ b/include/trace/events/sched.h
@@ -140,7 +140,7 @@ TRACE_EVENT(sched_switch,
 	TP_printk("prev_comm=%s prev_pid=%d prev_prio=%d prev_state=%s%s ==> next_comm=%s next_pid=%d next_prio=%d",
 		__entry->prev_comm, __entry->prev_pid, __entry->prev_prio,
 		__entry->prev_state & (TASK_STATE_MAX-1) ?
-		  __print_flags(__entry->prev_state & (TASK_STATE_MAX-1), "|",
+		  __print_flags((__entry->prev_state & (TASK_STATE_MAX-1)), "|",
 				{ 1, "S"} , { 2, "D" }, { 4, "T" }, { 8, "t" },
 				{ 16, "Z" }, { 32, "X" }, { 64, "x" },
 				{ 128, "W" }) : "R",
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH] event: fix TP_printk() argument in sched_switch
  2011-11-02 22:40 [PATCH] event: fix TP_printk() argument in sched_switch Andrew Vagin
@ 2011-11-02 23:07 ` Steven Rostedt
  2011-11-02 23:23   ` David Ahern
                     ` (2 more replies)
  0 siblings, 3 replies; 11+ messages in thread
From: Steven Rostedt @ 2011-11-02 23:07 UTC (permalink / raw)
  To: Andrew Vagin
  Cc: linux-kernel, Peter Zijlstra, Ingo Molnar, Frederic Weisbecker,
	devel, Arnaldo Carvalho de Melo

On Thu, 2011-11-03 at 01:40 +0300, Andrew Vagin wrote:
> process_arg(...) can't parse "__entry->prev_state & (TASK_STATE_MAX-1)",
> because a complicated argument should be within brackets.

No it is fine, the userspace tool is broken.

> 
> Without this patch "perf report" prints following errors:
> $ ./perf record -ag -e sched:sched_switch
> ...
> $ ./perf report
>   Warning: Error: expected type 5 but read 4
>   Warning: Error: expected type 4 but read 0
>   Fatal: bad op token {
> 
> Signed-off-by: Andrew Vagin <avagin@openvz.org>

NACK!

This is a perf userspace bug, not a kernel one. Please fix the userspace
tool instead.

Note, the new version of libparsevent handles this case without issue.
Perf just needs to be updated.

-- Steve

> ---
>  include/trace/events/sched.h |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h
> index 959ff18..1838237 100644
> --- a/include/trace/events/sched.h
> +++ b/include/trace/events/sched.h
> @@ -140,7 +140,7 @@ TRACE_EVENT(sched_switch,
>  	TP_printk("prev_comm=%s prev_pid=%d prev_prio=%d prev_state=%s%s ==> next_comm=%s next_pid=%d next_prio=%d",
>  		__entry->prev_comm, __entry->prev_pid, __entry->prev_prio,
>  		__entry->prev_state & (TASK_STATE_MAX-1) ?
> -		  __print_flags(__entry->prev_state & (TASK_STATE_MAX-1), "|",
> +		  __print_flags((__entry->prev_state & (TASK_STATE_MAX-1)), "|",
>  				{ 1, "S"} , { 2, "D" }, { 4, "T" }, { 8, "t" },
>  				{ 16, "Z" }, { 32, "X" }, { 64, "x" },
>  				{ 128, "W" }) : "R",



^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] event: fix TP_printk() argument in sched_switch
  2011-11-02 23:07 ` Steven Rostedt
@ 2011-11-02 23:23   ` David Ahern
  2011-11-03  0:13     ` Steven Rostedt
  2011-11-03 12:57   ` Andrew Vagin
  2011-11-03 14:19   ` Steven Rostedt
  2 siblings, 1 reply; 11+ messages in thread
From: David Ahern @ 2011-11-02 23:23 UTC (permalink / raw)
  To: Steven Rostedt
  Cc: Andrew Vagin, linux-kernel, Peter Zijlstra, Ingo Molnar,
	Frederic Weisbecker, devel, Arnaldo Carvalho de Melo

On 11/02/2011 05:07 PM, Steven Rostedt wrote:
> This is a perf userspace bug, not a kernel one. Please fix the userspace
> tool instead.
> 
> Note, the new version of libparsevent handles this case without issue.
> Perf just needs to be updated.

I dare ask..... has any progress been made on that front? ie., with
respect to lib names and locations within the tools dir.

David

> 
> -- Steve
> 

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] event: fix TP_printk() argument in sched_switch
  2011-11-02 23:23   ` David Ahern
@ 2011-11-03  0:13     ` Steven Rostedt
  0 siblings, 0 replies; 11+ messages in thread
From: Steven Rostedt @ 2011-11-03  0:13 UTC (permalink / raw)
  To: David Ahern
  Cc: Andrew Vagin, linux-kernel, Peter Zijlstra, Ingo Molnar,
	Frederic Weisbecker, devel, Arnaldo Carvalho de Melo

On Wed, 2011-11-02 at 17:23 -0600, David Ahern wrote:
> On 11/02/2011 05:07 PM, Steven Rostedt wrote:
> > This is a perf userspace bug, not a kernel one. Please fix the userspace
> > tool instead.
> > 
> > Note, the new version of libparsevent handles this case without issue.
> > Perf just needs to be updated.
> 
> I dare ask..... has any progress been made on that front? ie., with
> respect to lib names and locations within the tools dir.
> 

You dare too much... going into dangerous territory ;)


No, unfortunately, no progress has been made. I spoke a little with Ingo
in Prague, with Arjan too, and we still seem to disagree how to go
forward with this.

I may just punt and start pushing a separate library as it is today.
That is, a separate package, outside the kernel proper.

-- Steve



^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] event: fix TP_printk() argument in sched_switch
  2011-11-02 23:07 ` Steven Rostedt
  2011-11-02 23:23   ` David Ahern
@ 2011-11-03 12:57   ` Andrew Vagin
  2011-11-03 14:01     ` David Ahern
                       ` (2 more replies)
  2011-11-03 14:19   ` Steven Rostedt
  2 siblings, 3 replies; 11+ messages in thread
From: Andrew Vagin @ 2011-11-03 12:57 UTC (permalink / raw)
  To: Steven Rostedt
  Cc: Andrew Vagin, linux-kernel, Peter Zijlstra, Ingo Molnar,
	Frederic Weisbecker, devel, Arnaldo Carvalho de Melo


> NACK!
>
> This is a perf userspace bug, not a kernel one. Please fix the userspace
> tool instead.
>
> Note, the new version of libparsevent handles this case without issue.
> Perf just needs to be updated.
I don't understand. I've got 
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git
and it reports the same error. Where am I wrong?

# ./trace-cmd report 2> log

<idle>-0     [001] 1516333.292126: sched_switch:         [FAILED TO 
PARSE] prev_comm=kworker/0:0 prev_pid=0 prev_prio=120 prev_state=0x0 
next_comm=trace-cmd next_pid=2900 next_prio=120

# cat log
trace-cmd: No such file or directory
   Error: expected type 5 but read 4
   Error: expected type 4 but read 0
   failed to read event print fmt for sched_switch
trace-cmd: Received SIGINT

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] event: fix TP_printk() argument in sched_switch
  2011-11-03 12:57   ` Andrew Vagin
@ 2011-11-03 14:01     ` David Ahern
  2011-11-03 14:11       ` Steven Rostedt
  2011-11-03 14:02     ` Steven Rostedt
  2011-11-03 14:15     ` Steven Rostedt
  2 siblings, 1 reply; 11+ messages in thread
From: David Ahern @ 2011-11-03 14:01 UTC (permalink / raw)
  To: avagin
  Cc: Steven Rostedt, Andrew Vagin, linux-kernel, Peter Zijlstra,
	Ingo Molnar, Frederic Weisbecker, devel, Arnaldo Carvalho de Melo

On 11/03/2011 06:57 AM, Andrew Vagin wrote:
> 
>> NACK!
>>
>> This is a perf userspace bug, not a kernel one. Please fix the userspace
>> tool instead.
>>
>> Note, the new version of libparsevent handles this case without issue.
>> Perf just needs to be updated.
> I don't understand. I've got
> git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git
> and it reports the same error. Where am I wrong?

Have you installed the plugins?

David

> 
> # ./trace-cmd report 2> log
> 
> <idle>-0     [001] 1516333.292126: sched_switch:         [FAILED TO
> PARSE] prev_comm=kworker/0:0 prev_pid=0 prev_prio=120 prev_state=0x0
> next_comm=trace-cmd next_pid=2900 next_prio=120
> 
> # cat log
> trace-cmd: No such file or directory
>   Error: expected type 5 but read 4
>   Error: expected type 4 but read 0
>   failed to read event print fmt for sched_switch
> trace-cmd: Received SIGINT
> -- 
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] event: fix TP_printk() argument in sched_switch
  2011-11-03 12:57   ` Andrew Vagin
  2011-11-03 14:01     ` David Ahern
@ 2011-11-03 14:02     ` Steven Rostedt
  2011-11-03 14:15     ` Steven Rostedt
  2 siblings, 0 replies; 11+ messages in thread
From: Steven Rostedt @ 2011-11-03 14:02 UTC (permalink / raw)
  To: avagin
  Cc: Andrew Vagin, linux-kernel, Peter Zijlstra, Ingo Molnar,
	Frederic Weisbecker, devel, Arnaldo Carvalho de Melo

On Thu, 2011-11-03 at 16:57 +0400, Andrew Vagin wrote:
> > NACK!
> >
> > This is a perf userspace bug, not a kernel one. Please fix the userspace
> > tool instead.
> >
> > Note, the new version of libparsevent handles this case without issue.
> > Perf just needs to be updated.
> I don't understand. I've got 
> git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git
> and it reports the same error. Where am I wrong?
> 
> # ./trace-cmd report 2> log
> 
> <idle>-0     [001] 1516333.292126: sched_switch:         [FAILED TO 
> PARSE] prev_comm=kworker/0:0 prev_pid=0 prev_prio=120 prev_state=0x0 
> next_comm=trace-cmd next_pid=2900 next_prio=120

Ah, I tested on a kernel without the updated format field.

But I still stand that the tool is broken and not the kernel.

I'll update both trace-cmd and perf to handle this breakage. Sad that I
still need to update two locations :(

-- Steve


> 
> # cat log
> trace-cmd: No such file or directory
>    Error: expected type 5 but read 4
>    Error: expected type 4 but read 0
>    failed to read event print fmt for sched_switch
> trace-cmd: Received SIGINT



^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] event: fix TP_printk() argument in sched_switch
  2011-11-03 14:01     ` David Ahern
@ 2011-11-03 14:11       ` Steven Rostedt
  0 siblings, 0 replies; 11+ messages in thread
From: Steven Rostedt @ 2011-11-03 14:11 UTC (permalink / raw)
  To: David Ahern
  Cc: avagin, Andrew Vagin, linux-kernel, Peter Zijlstra, Ingo Molnar,
	Frederic Weisbecker, devel, Arnaldo Carvalho de Melo

On Thu, 2011-11-03 at 08:01 -0600, David Ahern wrote:
> On 11/03/2011 06:57 AM, Andrew Vagin wrote:
> > 
> >> NACK!
> >>
> >> This is a perf userspace bug, not a kernel one. Please fix the userspace
> >> tool instead.
> >>
> >> Note, the new version of libparsevent handles this case without issue.
> >> Perf just needs to be updated.
> > I don't understand. I've got
> > git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git
> > and it reports the same error. Where am I wrong?
> 
> Have you installed the plugins?
> 

That's cheating ;)  Yeah, the plugins override what is printed, but this
is a trivial thing that the parsing itself should easily be able to
handle. I'm working on a fix now.

trace-cmd report -N

will fail.  That's because -N does not load the plugins.

-- Steve



^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] event: fix TP_printk() argument in sched_switch
  2011-11-03 12:57   ` Andrew Vagin
  2011-11-03 14:01     ` David Ahern
  2011-11-03 14:02     ` Steven Rostedt
@ 2011-11-03 14:15     ` Steven Rostedt
  2 siblings, 0 replies; 11+ messages in thread
From: Steven Rostedt @ 2011-11-03 14:15 UTC (permalink / raw)
  To: avagin
  Cc: Andrew Vagin, linux-kernel, Peter Zijlstra, Ingo Molnar,
	Frederic Weisbecker, devel, Arnaldo Carvalho de Melo

On Thu, 2011-11-03 at 16:57 +0400, Andrew Vagin wrote:
> > NACK!
> >
> > This is a perf userspace bug, not a kernel one. Please fix the userspace
> > tool instead.
> >
> > Note, the new version of libparsevent handles this case without issue.
> > Perf just needs to be updated.
> I don't understand. I've got 
> git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git
> and it reports the same error. Where am I wrong?
> 
> # ./trace-cmd report 2> log
> 
> <idle>-0     [001] 1516333.292126: sched_switch:         [FAILED TO 
> PARSE] prev_comm=kworker/0:0 prev_pid=0 prev_prio=120 prev_state=0x0 
> next_comm=trace-cmd next_pid=2900 next_prio=120
> 
> # cat log
> trace-cmd: No such file or directory
>    Error: expected type 5 but read 4
>    Error: expected type 4 but read 0
>    failed to read event print fmt for sched_switch
> trace-cmd: Received SIGINT

Add the below patch to trace-cmd and see if it fixes the issue. I'll
start working on something that fixes perf too.

Thanks,

-- Steve


diff --git a/parse-events.c b/parse-events.c
index 2dbd47b..8ed018d 100644
--- a/parse-events.c
+++ b/parse-events.c
@@ -2167,6 +2167,10 @@ process_flags(struct event_format *event, struct print_arg *arg, char **tok)
 	field = alloc_arg();
 
 	type = process_arg(event, field, &token);
+	/* Handle operations in the first argument */
+	while (type == EVENT_OP) {
+		type = process_op(event, field, &token);
+	}
 	if (test_type_token(type, token, EVENT_DELIM, ","))
 		goto out_free;
 	free_token(token);



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH] event: fix TP_printk() argument in sched_switch
  2011-11-02 23:07 ` Steven Rostedt
  2011-11-02 23:23   ` David Ahern
  2011-11-03 12:57   ` Andrew Vagin
@ 2011-11-03 14:19   ` Steven Rostedt
  2011-11-03 21:36     ` avagin
  2 siblings, 1 reply; 11+ messages in thread
From: Steven Rostedt @ 2011-11-03 14:19 UTC (permalink / raw)
  To: Andrew Vagin
  Cc: linux-kernel, Peter Zijlstra, Ingo Molnar, Frederic Weisbecker,
	devel, Arnaldo Carvalho de Melo

On Wed, 2011-11-02 at 19:07 -0400, Steven Rostedt wrote:
> On Thu, 2011-11-03 at 01:40 +0300, Andrew Vagin wrote:
> > process_arg(...) can't parse "__entry->prev_state & (TASK_STATE_MAX-1)",
> > because a complicated argument should be within brackets.
> 
> No it is fine, the userspace tool is broken.
> 
> > 
> > Without this patch "perf report" prints following errors:
> > $ ./perf record -ag -e sched:sched_switch
> > ...
> > $ ./perf report
> >   Warning: Error: expected type 5 but read 4
> >   Warning: Error: expected type 4 but read 0
> >   Fatal: bad op token {
> > 
> > Signed-off-by: Andrew Vagin <avagin@openvz.org>
> 
> NACK!
> 
> This is a perf userspace bug, not a kernel one. Please fix the userspace
> tool instead.
> 
> Note, the new version of libparsevent handles this case without issue.
> Perf just needs to be updated.
> 

Can you try this patch on perf. It's untested (not even compiled tested)

-- Steve

diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index 0a7ed5b..6c164dc 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -1537,6 +1537,8 @@ process_flags(struct event *event, struct print_arg *arg, char **tok)
 	field = malloc_or_die(sizeof(*field));
 
 	type = process_arg(event, field, &token);
+	while (type == EVENT_OP)
+		type = process_op(event, field, &token);
 	if (test_type_token(type, token, EVENT_DELIM, ","))
 		goto out_free;
 



^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH] event: fix TP_printk() argument in sched_switch
  2011-11-03 14:19   ` Steven Rostedt
@ 2011-11-03 21:36     ` avagin
  0 siblings, 0 replies; 11+ messages in thread
From: avagin @ 2011-11-03 21:36 UTC (permalink / raw)
  To: Steven Rostedt
  Cc: Andrew Vagin, linux-kernel, Peter Zijlstra, Ingo Molnar,
	Frederic Weisbecker, devel, Arnaldo Carvalho de Melo

Hi Steve,

>
> Can you try this patch on perf. It's untested (not even compiled tested)
It looks like it works now. Thanks.
>
> -- Steve
>
> diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
> index 0a7ed5b..6c164dc 100644
> --- a/tools/perf/util/trace-event-parse.c
> +++ b/tools/perf/util/trace-event-parse.c
> @@ -1537,6 +1537,8 @@ process_flags(struct event *event, struct print_arg *arg, char **tok)
>   	field = malloc_or_die(sizeof(*field));
>
>   	type = process_arg(event, field,&token);
> +	while (type == EVENT_OP)
> +		type = process_op(event, field,&token);
>   	if (test_type_token(type, token, EVENT_DELIM, ","))
>   		goto out_free;
>
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/


^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2011-11-03 21:36 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-02 22:40 [PATCH] event: fix TP_printk() argument in sched_switch Andrew Vagin
2011-11-02 23:07 ` Steven Rostedt
2011-11-02 23:23   ` David Ahern
2011-11-03  0:13     ` Steven Rostedt
2011-11-03 12:57   ` Andrew Vagin
2011-11-03 14:01     ` David Ahern
2011-11-03 14:11       ` Steven Rostedt
2011-11-03 14:02     ` Steven Rostedt
2011-11-03 14:15     ` Steven Rostedt
2011-11-03 14:19   ` Steven Rostedt
2011-11-03 21:36     ` avagin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox