tracing: Some minor clean ups and fixes for 5.14
Subsystems (4)
Steven Rostedt
maintainercover tracing: Some minor clean ups and fixes for 5.14
Baokun Li (1):
ftrace: Use list_move instead of list_del/list_add
Steven Rostedt (VMware) (2):
tracing/histograms: Fix parsing of "sym-offset" modifier tracing/selftests: Add tests to test histogram sym and sym-offset modifiers
----
kernel/trace/ftrace.c | 3 +-- kernel/trace/trace_events_hist.c | 7 +++++++ .../selftests/ftrace/test.d/trigger/trigger-hist.tc | 18 ++++++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-)
Steven Rostedt
maintainerPATCH 1/3 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.30.2
Steven Rostedt
maintainerPATCH 2/3 tracing/selftests: Add tests to test histogram sym and sym-offset modifiers
In reply to Steven RostedtFrom: "Steven Rostedt (VMware)" <[email protected]>
Add a test to the tracing selftests that will catch if the .sym or .sym-offset modifiers break in the future.
--- .../ftrace/test.d/trigger/trigger-hist.tc | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc +18 -0
@@ -39,6 +39,24 @@ grep "parent_comm: $COMM" events/sched/sched_process_fork/hist > /dev/null || \ reset_trigger +echo "Test histogram with sym modifier" + +echo 'hist:keys=call_site.sym' > events/kmem/kmalloc/trigger +for i in `seq 1 10` ; do ( echo "forked" > /dev/null); done +grep '{ call_site: \[[0-9a-f][0-9a-f]*\] [_a-zA-Z][_a-zA-Z]* *}' events/kmem/kmalloc/hist > /dev/null || \ + fail "sym modifier on kmalloc call_site did not work" + +reset_trigger + +echo "Test histogram with sym-offset modifier" + +echo 'hist:keys=call_site.sym-offset' > events/kmem/kmalloc/trigger +for i in `seq 1 10` ; do ( echo "forked" > /dev/null); done +grep '{ call_site: \[[0-9a-f][0-9a-f]*\] [_a-zA-Z][_a-zA-Z]*+0x[0-9a-f][0-9a-f]*' events/kmem/kmalloc/hist > /dev/null || \ + fail "sym-offset modifier on kmalloc call_site did not work" + +reset_trigger + echo "Test histogram with sort key" echo 'hist:keys=parent_pid,child_pid:sort=child_pid.ascending' > events/sched/sched_process_fork/trigger
Signature · 1 line
2.30.2
Steven Rostedt
maintainerPATCH 3/3 ftrace: Use list_move instead of list_del/list_add
In reply to Steven RostedtFrom: Baokun Li <[email protected]>
Using list_move() instead of list_del() + list_add().
--- kernel/trace/ftrace.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/trace/ftrace.c +1 -2
@@ -4212,8 +4212,7 @@ static void process_mod_list(struct list_head *head, struct ftrace_ops *ops,if (!func)/* warn? */ continue ; -list_del (&ftrace_mod->list); -list_add (&ftrace_mod->list, &process_mods); +list_move (&ftrace_mod->list, &process_mods);/* Use the newly allocated func, as it may be "*" */ kfree (ftrace_mod->func);
Signature · 1 line
2.30.2