testing/selftests: Have instance test stress instances more
cover testing/selftests: Have instance test stress instances more
I found that the instance test doesn't actually stress the creation and deletion of instances while reading them as I thought it did. This was due to the rmdir failing to remove the instance because it was busy (by the reads that were happening).
Make the tests do 10 creations and removals while reading the instance and mkae sure the removal succeeds.
Also add reading of more files that were not tested before.
Steven Rostedt (2):
tracing/selftests: Fix instance test actually test races tracing/selftests: Add reading all instance files to instance test
----
.../ftrace/test.d/instances/instance-event.tc | 34 ++++++++++++++++------ 1 file changed, 25 insertions(+), 9 deletions(-)
PATCH 1/2 tracing/selftests: Fix instance test to actually test races
From: Steven Rostedt <[email protected]>
The instance selftest creates and removes the "foo" instance while enabling sched_switch event and reading its trace file. The issue is that the read of the trace file prevents the removal of foo, and it constantly fails to remove it. The stress test is not really stressing the situation.
Instead of running the creating and deletion in a loop as a separate process and sleeping for one second, call it directly in a loop that forces it to happen 10 times. Also update the removal to keep trying until it removes the instance, otherwise if it doesn't remove it then the next mkdir is a nop.
Convert the reading of the trace file to use "head" instead of "cat" so it is limited in how much it reads and add a .1 sleep in between reads. This gives the removal of the instance time to succeed.
--- .../ftrace/test.d/instances/instance-event.tc | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-)
tools/testing/selftests/ftrace/test.d/instances/instance-event.tc +12 -14
@@ -25,15 +25,16 @@ if [ $result -ne 0 ]; then fi instance_slam() { - while :; do - mkdir foo 2> /dev/null - rmdir foo 2> /dev/null - done + mkdir foo 2> /dev/null + while ! rmdir foo; do + echo could not rmdir foo + done } instance_read() { while :; do - cat foo/trace 1> /dev/null 2>&1 + head foo/trace 1> /dev/null 2>&1 + sleep 0.1 done }
@@ -43,26 +44,23 @@ instance_set() { done 2> /dev/null } -instance_slam & +instance_set & p1=$! echo $p1 -instance_set & +instance_read & p2=$! echo $p2 -instance_read & -p3=$! -echo $p3 - -sleep 1 +for i in `seq 10`; do + instance_slam +done -kill -1 $p3 kill -1 $p2 kill -1 $p1 echo "Wait for processes to finish" -wait $p1 $p2 $p3 +wait $p1 $p2 echo "all processes finished, wait for cleanup" sleep 1
Signature · 1 line
2.53.0
Masami Hiramatsu (Google)
maintainerRe: [PATCH 1/2] tracing/selftests: Fix instance test to actually test races
Quoted 28 lines · Steven Rostedt
From: Steven Rostedt <[email protected]>
The instance selftest creates and removes the "foo" instance while enabling
sched_switchevent and reading its trace file. The issue is that the read of the trace file prevents the removal of foo, and it constantly fails to remove it. The stress test is not really stressing the situation.Instead of running the creating and deletion in a loop as a separate process and sleeping for one second, call it directly in a loop that forces it to happen 10 times. Also update the removal to keep trying until it removes the instance, otherwise if it doesn't remove it then the next mkdir is a nop.
Convert the reading of the trace file to use "head" instead of "cat" so it is limited in how much it reads and add a .1 sleep in between reads. This gives the removal of the instance time to succeed.
Fixes 91e6f1ce86577 ("ftracetest: Add instance created, delete, read and enable event test")Signed-off-by Steven Rostedt <[email protected]>--- .../ftrace/test.d/instances/instance-event.tc | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-)tools/testing/selftests/ftrace/test.d/instances/instance-event.tc +0
-0
tools/testing/selftests/ftrace/test.d/instances/instance-event.tc if [ $result -ne 0 ]; then · line 30
Quoted 10 lines
tools/testing/selftests/ftrace/test.d/instances/instance-event.tc +3
-4@@ -25,15 +25,16 @@ if [ $result -ne 0 ]; then fi instance_slam() { - while :; do - mkdir foo 2> /dev/null - rmdir foo 2> /dev/null - done + mkdir foo 2> /dev/null + while ! rmdir foo; do + echo could not rmdir foo
nit: If we retry this, do we need to warn it?
(maybe we can add a limitation of continuous failure and make the test fail if the failure exceeds it.)
tools/testing/selftests/ftrace/test.d/instances/instance-event.tc if [ $result -ne 0 ]; then · line 33
Quoted 3 lines
tools/testing/selftests/ftrace/test.d/instances/instance-event.tc +1
-0+ done }
Thanks,
Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>
Re: [PATCH 1/2] tracing/selftests: Fix instance test to actually test races
Quoted 4 lines · On Fri, 30 Oct 2026 10:01:19 +0900 "Masami Hiramatsu (Google)"…
Quoted 4 lines
instance_slam(){tools/testing/selftests/ftrace/test.d/instances/instance-event.tc +0
-3- while :; do - mkdir foo 2> /dev/null - rmdir foo 2> /dev/null
Quoted 8 lines
tools/testing/selftests/ftrace/test.d/instances/instance-event.tc if [ $result -ne 0 ]; then · line 30
Quoted 4 lines
tools/testing/selftests/ftrace/test.d/instances/instance-event.tc +3
-1- done + mkdir foo 2> /dev/null + while ! rmdir foo; do + echo could not rmdir foonit: If we retry this, do we need to warn it?
(maybe we can add a limitation of continuous failure and make the test fail if the failure exceeds it.)
Retrying is actually quite normal. The rmdir *should* fail if one of the instance files is open.
Now perhaps we can add a counter to make it fail if it exceeds a large threshold?
let x=0 while ! rmdir foo; do let x=$x+1 if [ $x -gt 10000 ]; then exit_fail fi done
?
-- Steve
PATCH 2/2 tracing/selftests: Add reading all instance files to instance test
In reply to Steven RostedtFrom: Steven Rostedt <[email protected]>
Commit f4a771cc684c7 ("tracing: Have show_event_filters/triggers files take trace array ref") fixed a bug where the show_event_filters and triggers did not take a trace array reference allowing an instance to be removed while active. This would have the reader of these files read data that was freed by the remove.
Update the instance test to read all the files in the instance, instance/events, instance/events/sched and instance/events/sched/sched_switch directories (with the exception of not reading trace or trace_pipe). This would hopefully catch issues with files not taking references.
--- .../ftrace/test.d/instances/instance-event.tc | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
tools/testing/selftests/ftrace/test.d/instances/instance-event.tc +19 -1
@@ -44,6 +44,19 @@ instance_set() { done 2> /dev/null } +instance_cat() { + while :; do + find instances/foo -maxdepth 1 -type f ! \( -name trace -o -name trace_pipe \) -exec head {} \; + sleep 0.1 + find instances/foo/events -maxdepth 1 -type f -exec cat {} \; + sleep 0.1 + find instances/foo/events/sched -maxdepth 1 -type f -exec cat {} \; + sleep 0.1 + find instances/foo/events/sched/sched_waking -maxdepth 1 -type f -exec cat {} \; + sleep 0.1 + done 2> /dev/null +} + instance_set & p1=$! echo $p1
@@ -52,15 +65,20 @@ instance_read & p2=$! echo $p2 +instance_cat & +p3=$! +echo $p3 + for i in `seq 10`; do instance_slam done +kill -1 $p3 kill -1 $p2 kill -1 $p1 echo "Wait for processes to finish" -wait $p1 $p2 +wait $p1 $p2 $p3 echo "all processes finished, wait for cleanup" sleep 1
Signature · 1 line
2.53.0
Re: [PATCH 2/2] tracing/selftests: Add reading all instance files to instance test
Quoted 8 lines · Steven Rostedt
From: Steven Rostedt <[email protected]>
Commit
f4a771cc684c7("tracing: Have show_event_filters/triggers files take trace array ref") fixed a bug where theshow_event_filtersand triggers did not take a trace array reference allowing an instance to be removed while active. This would have the reader of these files read data that was freed by the remove.
Quoted 7 lines
Update the instance test to read all the files in the instance, instance/events, instance/events/sched and instance/events/sched/sched_switch directories (with the exception of not reading trace or
trace_pipe). This would hopefully catch issues with files not taking references.Signed-off-by Steven Rostedt <[email protected]>
Looks good to me.
Thanks,
Quoted 53 lines
--- .../ftrace/test.d/instances/instance-event.tc | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)tools/testing/selftests/ftrace/test.d/instances/instance-event.tc +19
-1@@ -44,6 +44,19 @@ instance_set() { done 2> /dev/null } +instance_cat() { + while :; do + find instances/foo -maxdepth 1 -type f ! \( -name trace -o -name trace_pipe \) -exec head {} \; + sleep 0.1 + find instances/foo/events -maxdepth 1 -type f -exec cat {} \; + sleep 0.1 + find instances/foo/events/sched -maxdepth 1 -type f -exec cat {} \; + sleep 0.1 + find instances/foo/events/sched/sched_waking -maxdepth 1 -type f -exec cat {} \; + sleep 0.1 + done 2> /dev/null +} + instance_set & p1=$! echo $p1@@ -52,15 +65,20 @@ instance_read & p2=$! echo $p2 +instance_cat & +p3=$! +echo $p3 + for i in `seq 10`; do instance_slam done +kill -1 $p3 kill -1 $p2 kill -1 $p1 echo "Wait for processes to finish" -wait $p1 $p2 +wait $p1 $p2 $p3 echo "all processes finished, wait for cleanup" sleep 1Signature · 1 line
2.53.0
Signature · 1 line
Masami Hiramatsu (Google) <[email protected]>