Skip to contentSkip to conversation

perf, tools: Handle events including .c and .o

PATCH In review Andi Kleen 4 participants 6 messages Sep 18, 2016 – Sep 19, 2016 perf events

lore
Share & tools
lore

Andi Kleen

author
#0 lore raw

PATCH 1/1 perf, tools: Handle events including .c and .o

From: Andi Kleen <[email protected]>

This is a generic bug fix, but it helps with Sukadev's JSON event tree where such events can happen.

Any event inclduing a .c/.o/.bpf currently triggers BPF compilation or loading and then an error. This can happen for some Intel JSON events, which cannot be used.

Fix the scanner to only match for .o or .c or .bpf at the end. This will prevent loading multiple BPF scripts separated with comma, but I assume this is acceptable.

---
 tools/perf/util/parse-events.l | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/parse-events.l +2 -2
index 7a2519435da0..64ca26e4ed2d 100644
@@ -162,8 +162,8 @@ modifier_bp	[rwx]{1,3}
 		}
 
 {event_pmu}	|
-{bpf_object}	|
-{bpf_source}	|
+({bpf_object}$)	|
+({bpf_source}$)	|
 {event}		{
 			BEGIN(INITIAL);
 			REWIND(1);
Signature · 1 line
2.5.5
Acked-by on v1 1/1
#1 lore raw
Quoted 25 lines · Andi Kleen

From: Andi Kleen <[email protected]>

This is a generic bug fix, but it helps with Sukadev's JSON event tree where such events can happen.

Any event inclduing a .c/.o/.bpf currently triggers BPF compilation or loading and then an error. This can happen for some Intel JSON events, which cannot be used.

Fix the scanner to only match for .o or .c or .bpf at the end. This will prevent loading multiple BPF scripts separated with comma, but I assume this is acceptable.

---
 tools/perf/util/parse-events.l | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/parse-events.l +0 -0
index 7a2519435da0..64ca26e4ed2d 100644

tools/perf/util/parse-events.l modifier_bp [rwx]{1,3} · line 166

Quoted 7 lines
tools/perf/util/parse-events.l +2 -2
@@ -162,8 +162,8 @@ modifier_bp	[rwx]{1,3}
 		}
 
 {event_pmu}	|
-{bpf_object}	|
-{bpf_source}	|
+({bpf_object}$)	|
+({bpf_source}$)	|

why are the () braces necessary? anyway:

thanks,
jirka

Quoted 6 lines
tools/perf/util/parse-events.l +0 -0
 {event}		{
 			BEGIN(INITIAL);
 			REWIND(1);
Signature · 1 line
2.5.5
#2 lore raw
Quoted 28 lines · Jiri Olsa
Quoted 27 lines · Andi Kleen

From: Andi Kleen <[email protected]>

This is a generic bug fix, but it helps with Sukadev's JSON event tree where such events can happen.

Any event inclduing a .c/.o/.bpf currently triggers BPF compilation or loading and then an error. This can happen for some Intel JSON events, which cannot be used.

Fix the scanner to only match for .o or .c or .bpf at the end. This will prevent loading multiple BPF scripts separated with comma, but I assume this is acceptable.

---
 tools/perf/util/parse-events.l | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/parse-events.l +0 -0
index 7a2519435da0..64ca26e4ed2d 100644
@@ -162,8 +162,8 @@ modifier_bp	[rwx]{1,3}
 		}
 
Quoted 7 lines

tools/perf/util/parse-events.l modifier_bp [rwx]{1,3} · line 166

Quoted 5 lines
tools/perf/util/parse-events.l +2 -2
 {event_pmu}	|
-{bpf_object}	|
-{bpf_source}	|
+({bpf_object}$)	|
+({bpf_source}$)	|

why are the () braces necessary? anyway:

Flex complains otherwise, I think because it's used with OR (|)

-Andi

#3 lore raw
In reply to Andi Kleen
Quoted 9 lines · Andi Kleen

From: Andi Kleen <[email protected]>

This is a generic bug fix, but it helps with Sukadev's JSON event tree where such events can happen.

Any event inclduing a .c/.o/.bpf currently triggers BPF compilation or loading and then an error. This can happen for some Intel JSON events, which cannot be used.

Quoted 7 lines

Fix the scanner to only match for .o or .c or .bpf at the end. This will prevent loading multiple BPF scripts separated with comma, but I assume this is acceptable.

I tested '.c' in middle of an event:

 # perf trace --event 'aaa.ccc'
 invalid or unsupported event: 'aaa.ccc'
 Run 'perf list' for a list of valid events
 ...

It is not recongnized as a BPF source.

So could you please provide an example to show how this potential bug breaks the parsing of new events?

Quoted 9 lines
---
  tools/perf/util/parse-events.l | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
tools/perf/util/parse-events.l +0 -0
index 7a2519435da0..64ca26e4ed2d 100644

tools/perf/util/parse-events.l modifier_bp [rwx]{1,3} · line 166

Quoted 7 lines
tools/perf/util/parse-events.l +2 -2
@@ -162,8 +162,8 @@ modifier_bp	[rwx]{1,3}
  		}
 
  {event_pmu}	|
-{bpf_object}	|
-{bpf_source}	|
+({bpf_object}$)	|
+({bpf_source}$)	|

What about putting '$' at the definition of bpf_xxx like this?

tools/perf/util/parse-events.l +2 -2
index 9f43fda..d9ff690 100644
@@ -136,8 +136,8 @@ do {                                                        \
 group          [^,{}/]*[{][^}]*[}][^,{}/]*
 event_pmu      [^,{}/]+[/][^/]*[/][^,{}/]*
 event          [^,{}/]+
-bpf_object     .*\.(o|bpf)
-bpf_source     .*\.c
+bpf_object     .*\.(o|bpf)$
+bpf_source     .*\.c$
 
 num_dec                [0-9]+
 num_hex                0x[a-fA-F0-9]+

Thank you.

Quoted 3 lines
tools/perf/util/parse-events.l +0 -0
  {event}		{
  			BEGIN(INITIAL);
  			REWIND(1);
#4 lore raw
Quoted 27 lines · Wangnan (F)
Quoted 9 lines · Andi Kleen

From: Andi Kleen <[email protected]>

This is a generic bug fix, but it helps with Sukadev's JSON event tree where such events can happen.

Any event inclduing a .c/.o/.bpf currently triggers BPF compilation or loading and then an error. This can happen for some Intel JSON events, which cannot be used.

Quoted 7 lines

Fix the scanner to only match for .o or .c or .bpf at the end. This will prevent loading multiple BPF scripts separated with comma, but I assume this is acceptable.

I tested '.c' in middle of an event:

 # perf trace --event 'aaa.ccc'
 invalid or unsupported event: 'aaa.ccc'
 Run 'perf list' for a list of valid events
 ...
Quoted 4 lines

It is not recongnized as a BPF source.

So could you please provide an example to show how this potential bug breaks the parsing of new events?

This is with the upcoming JSON uncore events:

$ perf stat -e '{unc_p_clockticks,unc_p_power_state_occupancy.cores_c0}' -a -I 1000
ERROR: problems with path {unc_p_clockticks,unc_p_power_state_occupancy.c: No such file or directory
event syntax error: '{unc_p_clockticks,unc_p_power_state_occupancy.cores_c0}'
                     \___ Failed to load {unc_p_clockticks,unc_p_power_state_occupancy.c from source: Error when compiling BPF scriptlet

(add -v to see detail)
Run 'perf list' for a list of valid events

-Andi

Tested-by
#5 lore raw
Quoted 37 lines · Andi Kleen
Quoted 25 lines · Wangnan (F)
Quoted 9 lines · Andi Kleen

From: Andi Kleen <[email protected]>

This is a generic bug fix, but it helps with Sukadev's JSON event tree where such events can happen.

Any event inclduing a .c/.o/.bpf currently triggers BPF compilation or loading and then an error. This can happen for some Intel JSON events, which cannot be used.

Quoted 7 lines

Fix the scanner to only match for .o or .c or .bpf at the end. This will prevent loading multiple BPF scripts separated with comma, but I assume this is acceptable.

I tested '.c' in middle of an event:

  # perf trace --event 'aaa.ccc'
  invalid or unsupported event: 'aaa.ccc'
  Run 'perf list' for a list of valid events
  ...
Quoted 4 lines

It is not recongnized as a BPF source.

So could you please provide an example to show how this potential bug breaks the parsing of new events?

This is with the upcoming JSON uncore events:

$ perf stat -e '{unc_p_clockticks,unc_p_power_state_occupancy.cores_c0}' -a -I 1000
ERROR: problems with path {unc_p_clockticks,unc_p_power_state_occupancy.c: No such file or directory
event syntax error: '{unc_p_clockticks,unc_p_power_state_occupancy.cores_c0}'
                      \___ Failed to load {unc_p_clockticks,unc_p_power_state_occupancy.c from source: Error when compiling BPF scriptlet
Quoted 4 lines

(add -v to see detail)
Run 'perf list' for a list of valid events

-Andi

I see, and your patch solve problem like this.