tracing/histograms: Fix parsing of "sym-offset" modifier
Steven Rostedt
maintainerPATCH 1/1 tracing/histograms: Fix parsing of "sym-offset" modifier
From: "Steven Rostedt (VMware)" <[email protected]>
With the addition of simple mathematical operations (plus and minus), the parsing of the "sym-offset" modifier broke, as it took the '-' part of the "sym-offset" as a minus, and tried to break it up into a mathematical operation of "field.sym - offset", in which case it failed to parse (unless the event had a field called "offset").
Both .sym and .sym-offset modifiers should not be entered into mathematical calculations anyway. If ".sym-offset" is found in the modifier, then simply make it not an operation that can be calculated on.
--- kernel/trace/trace_events_hist.c | 7 +++++++ 1 file changed, 7 insertions(+)
kernel/trace/trace_events_hist.c +7 -0
@@ -1555,6 +1555,13 @@ static int contains_operator(char *str)switch (*op) {case '-' : +/* +* Unfortunately, the modifier ".sym-offset" +* can confuse things. +*/ +if (op - str >=4 && !strncmp (op -4 ,".sym-offset" ,11 )) +return FIELD_OP_NONE ; +if (*str =='-' ) field_op =FIELD_OP_UNARY_MINUS ;else
Signature · 1 line
2.31.1
Hi Steve,
Quoted 29 lines · Steven Rostedt
From: "Steven Rostedt (VMware)" <[email protected]>
With the addition of simple mathematical operations (plus and minus), the
parsing of the "sym-offset" modifier broke, as it took the '-' part of the
"sym-offset" as a minus, and tried to break it up into a mathematical operation of "field.sym - offset", in which case it failed to parse (unless the event had a field called "offset").Both .sym and .sym-offset modifiers should not be entered into mathematical calculations anyway. If ".sym-offset" is found in the modifier, then simply make it not an operation that can be calculated on.
Fixes 100719dcef447 ("tracing: Add simple expression support to histtriggers")
Signed-off-by Steven Rostedt (VMware) <[email protected]>--- kernel/trace/trace_events_hist.c | 7 +++++++ 1 file changed, 7 insertions(+)kernel/trace/trace_events_hist.c +0
-0
kernel/trace/trace_events_hist.c static int contains_operator(char *str) · line 1561
Quoted 7 lines
kernel/trace/trace_events_hist.c +4
-0@@ -1555,6 +1555,13 @@ static int contains_operator(char *str)switch (*op) {case '-' : +/* +* Unfortunately, the modifier ".sym-offset" +* can confuse things. +*/
Good catch.
Quoted 7 lines
kernel/trace/trace_events_hist.c +3
-0+if (op - str >=4 && !strncmp (op -4 ,".sym-offset" ,11 )) +return FIELD_OP_NONE ; +if (*str =='-' ) field_op =FIELD_OP_UNARY_MINUS ;else