selftests/ftrace: Have reset_ftrace_filter handle multiple instances
If a probe is attached to a static function that is in multiple files with the same name, removing it by name will remove all instances: # grep jump_label_unlock set_ftrace_filter jump_label_unlock:traceoff:unlimited jump_label_unlock:traceoff:unlimited # echo '!jump_label_unlock:traceoff' >> set_ftrace_filter # grep jump_label_unlock set_ftrace_filter # But the loop in reset_ftrace_filter will try to remove multiple instances multiple times. If this happens the second time will error and cause the test to fail. At each iteration of the loop, check to see if the probe being removed still exists. Cc: Shuah Khan <shuah@kernel.org> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
This commit is contained in:
parent
df9d36d9e8
commit
0787ce3360
|
@ -37,6 +37,9 @@ reset_ftrace_filter() { # reset all triggers in set_ftrace_filter
|
||||||
if [ "$tr" = "" ]; then
|
if [ "$tr" = "" ]; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
|
if ! grep -q "$t" set_ftrace_filter; then
|
||||||
|
continue;
|
||||||
|
fi
|
||||||
name=`echo $t | cut -d: -f1 | cut -d' ' -f1`
|
name=`echo $t | cut -d: -f1 | cut -d' ' -f1`
|
||||||
if [ $tr = "enable_event" -o $tr = "disable_event" ]; then
|
if [ $tr = "enable_event" -o $tr = "disable_event" ]; then
|
||||||
tr=`echo $t | cut -d: -f2-4`
|
tr=`echo $t | cut -d: -f2-4`
|
||||||
|
|
Loading…
Reference in New Issue