Torture-test changes for 3.15
Subsystems (6)
cover Torture-test changes for 3.15
Hello!
This series contains rcutorture changes, including adding a simple locktorture. Creating this locktorture while sharing the rcutorture infrastructure was the main point of this patch, but this effort uncovered a number of shortcomings in rcutorture, which this series also fixes.
1-6. Usability improvements in rcutorture scripting.
7-13. Enable concurrent rcutorture runs on systems with sufficient
numbers of CPUs.
14. Print the results directory at the end of the test.
15,17-25,27-28,30,32,37-41,46-48.
Abstract facilities from rcutorture module and scripting for later use by locktorture.
16. Don't create a results directory for dryruns.
26. Print date and time of each phase of torturing.
29. Issue a diagnostic if something does a system shutdown while
rcutorture is running.
31. Apply ACCESS_ONCE() to racy fullstop accesses.
33. Clean up rcu_torture_init() error handling.
34. Announce kthread creation.
35. Clean up a number of rcutorture shutdown races, unifying the
required shutdown actions into a new torture_kthread_stopping() function.
36. Add a missing return statement in rcu_torture_barrier_init().
42. Create a minimal locktorture module.
43-44. Add an on-purpose buggy RCU implementation to rcutorture to help
test the tests.
45. Create a file for Kconfig parameters that are commmon across all
rcutorture tests.
49. Add beginning set of config files for locktorture.
50. Avoid SEGV when cleanup-hooks function pointer is NULL.
51. Add locktorture plugin for kvm_recheck.sh.
52. Rename TREE_RCU-Kconfig.txt to avoid confusing scripts that
look for Kconfig files, courtesy of Paul Bolle.
53. Retain output from kvm-test-1-run.sh script.
54. Add an on-purpose buggy lock implementation to locktorture to
help test the tests.
55. Save kvm.sh progress messages to log so that they can be used
for later timing analysis.
Thanx, Paul
------------------------------------------------------------------------
a/kernel/rcu/torture.c | 2148 ------ a/tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh | 203 a/tools/testing/selftests/rcutorture/configs/BUSTED | 7 a/tools/testing/selftests/rcutorture/configs/BUSTED.boot | 1 a/tools/testing/selftests/rcutorture/configs/CFLIST | 13 a/tools/testing/selftests/rcutorture/configs/CFcommon | 2 a/tools/testing/selftests/rcutorture/configs/SRCU-N | 7 a/tools/testing/selftests/rcutorture/configs/SRCU-N.boot | 1 a/tools/testing/selftests/rcutorture/configs/SRCU-P | 7 a/tools/testing/selftests/rcutorture/configs/SRCU-P.boot | 1 a/tools/testing/selftests/rcutorture/configs/TINY01 | 12 a/tools/testing/selftests/rcutorture/configs/TINY02 | 12 a/tools/testing/selftests/rcutorture/configs/TREE01 | 22 a/tools/testing/selftests/rcutorture/configs/TREE01.boot | 1 a/tools/testing/selftests/rcutorture/configs/TREE02 | 25 a/tools/testing/selftests/rcutorture/configs/TREE03 | 22 a/tools/testing/selftests/rcutorture/configs/TREE04 | 24 a/tools/testing/selftests/rcutorture/configs/TREE04.boot | 1 a/tools/testing/selftests/rcutorture/configs/TREE05 | 24 a/tools/testing/selftests/rcutorture/configs/TREE05.boot | 1 a/tools/testing/selftests/rcutorture/configs/TREE06 | 25 a/tools/testing/selftests/rcutorture/configs/TREE07 | 23 a/tools/testing/selftests/rcutorture/configs/TREE08 | 25 a/tools/testing/selftests/rcutorture/configs/TREE08-T | 25 a/tools/testing/selftests/rcutorture/configs/TREE09 | 20 a/tools/testing/selftests/rcutorture/configs/v0.0/CFLIST | 14 a/tools/testing/selftests/rcutorture/configs/v0.0/N1-S-T-NH-SD-SMP-HP | 18 a/tools/testing/selftests/rcutorture/configs/v0.0/N2-2-t-nh-sd-SMP-hp | 20 a/tools/testing/selftests/rcutorture/configs/v0.0/N3-3-T-nh-SD-SMP-hp | 22 a/tools/testing/selftests/rcutorture/configs/v0.0/N4-A-t-NH-sd-SMP-HP | 18 a/tools/testing/selftests/rcutorture/configs/v0.0/N5-U-T-NH-sd-SMP-hp | 22 a/tools/testing/selftests/rcutorture/configs/v0.0/NT1-nh | 23 a/tools/testing/selftests/rcutorture/configs/v0.0/NT3-NH | 20 a/tools/testing/selftests/rcutorture/configs/v0.0/P1-S-T-NH-SD-SMP-HP | 19 a/tools/testing/selftests/rcutorture/configs/v0.0/P2-2-t-nh-sd-SMP-hp | 20 a/tools/testing/selftests/rcutorture/configs/v0.0/P3-3-T-nh-SD-SMP-hp | 20 a/tools/testing/selftests/rcutorture/configs/v0.0/P4-A-t-NH-sd-SMP-HP | 22 a/tools/testing/selftests/rcutorture/configs/v0.0/P5-U-T-NH-sd-SMP-hp | 28 a/tools/testing/selftests/rcutorture/configs/v0.0/PT1-nh | 23 a/tools/testing/selftests/rcutorture/configs/v0.0/PT2-NH | 22 a/tools/testing/selftests/rcutorture/configs/v0.0/ver_functions.sh | 33 a/tools/testing/selftests/rcutorture/configs/v3.12/CFLIST | 17 a/tools/testing/selftests/rcutorture/configs/v3.12/N1-S-T-NH-SD-SMP-HP | 19 a/tools/testing/selftests/rcutorture/configs/v3.12/N2-2-t-nh-sd-SMP-hp | 20 a/tools/testing/selftests/rcutorture/configs/v3.12/N3-3-T-nh-SD-SMP-hp | 22 a/tools/testing/selftests/rcutorture/configs/v3.12/N4-A-t-NH-sd-SMP-HP | 18 a/tools/testing/selftests/rcutorture/configs/v3.12/N5-U-T-NH-sd-SMP-hp | 22 a/tools/testing/selftests/rcutorture/configs/v3.12/N6---t-nh-SD-smp-hp | 19 a/tools/testing/selftests/rcutorture/configs/v3.12/N7-4-T-NH-SD-SMP-HP | 26 a/tools/testing/selftests/rcutorture/configs/v3.12/N8-2-T-NH-SD-SMP-HP | 22 a/tools/testing/selftests/rcutorture/configs/v3.12/NT1-nh | 23 a/tools/testing/selftests/rcutorture/configs/v3.12/NT3-NH | 20 a/tools/testing/selftests/rcutorture/configs/v3.12/P1-S-T-NH-SD-SMP-HP | 20 a/tools/testing/selftests/rcutorture/configs/v3.12/P2-2-t-nh-sd-SMP-hp | 20 a/tools/testing/selftests/rcutorture/configs/v3.12/P3-3-T-nh-SD-SMP-hp | 20 a/tools/testing/selftests/rcutorture/configs/v3.12/P4-A-t-NH-sd-SMP-HP | 22 a/tools/testing/selftests/rcutorture/configs/v3.12/P5-U-T-NH-sd-SMP-hp | 28 a/tools/testing/selftests/rcutorture/configs/v3.12/P6---t-nh-SD-smp-hp | 18 a/tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP | 30 a/tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-all | 30 a/tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-none | 30 a/tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-hp | 30 a/tools/testing/selftests/rcutorture/configs/v3.12/PT1-nh | 23 a/tools/testing/selftests/rcutorture/configs/v3.12/PT2-NH | 22 a/tools/testing/selftests/rcutorture/configs/v3.3/CFLIST | 14 a/tools/testing/selftests/rcutorture/configs/v3.3/N1-S-T-NH-SD-SMP-HP | 19 a/tools/testing/selftests/rcutorture/configs/v3.3/N2-2-t-nh-sd-SMP-hp | 20 a/tools/testing/selftests/rcutorture/configs/v3.3/N3-3-T-nh-SD-SMP-hp | 22 a/tools/testing/selftests/rcutorture/configs/v3.3/N4-A-t-NH-sd-SMP-HP | 18 a/tools/testing/selftests/rcutorture/configs/v3.3/N5-U-T-NH-sd-SMP-hp | 22 a/tools/testing/selftests/rcutorture/configs/v3.3/NT1-nh | 23 a/tools/testing/selftests/rcutorture/configs/v3.3/NT3-NH | 20 a/tools/testing/selftests/rcutorture/configs/v3.3/P1-S-T-NH-SD-SMP-HP | 20 a/tools/testing/selftests/rcutorture/configs/v3.3/P2-2-t-nh-sd-SMP-hp | 20 a/tools/testing/selftests/rcutorture/configs/v3.3/P3-3-T-nh-SD-SMP-hp | 20 a/tools/testing/selftests/rcutorture/configs/v3.3/P4-A-t-NH-sd-SMP-HP | 22 a/tools/testing/selftests/rcutorture/configs/v3.3/P5-U-T-NH-sd-SMP-hp | 28 a/tools/testing/selftests/rcutorture/configs/v3.3/PT1-nh | 23 a/tools/testing/selftests/rcutorture/configs/v3.3/PT2-NH | 22 a/tools/testing/selftests/rcutorture/configs/v3.3/ver_functions.sh | 44 a/tools/testing/selftests/rcutorture/configs/v3.5/CFLIST | 14 a/tools/testing/selftests/rcutorture/configs/v3.5/N1-S-T-NH-SD-SMP-HP | 19 a/tools/testing/selftests/rcutorture/configs/v3.5/N2-2-t-nh-sd-SMP-hp | 20 a/tools/testing/selftests/rcutorture/configs/v3.5/N3-3-T-nh-SD-SMP-hp | 22 a/tools/testing/selftests/rcutorture/configs/v3.5/N4-A-t-NH-sd-SMP-HP | 18 a/tools/testing/selftests/rcutorture/configs/v3.5/N5-U-T-NH-sd-SMP-hp | 22 a/tools/testing/selftests/rcutorture/configs/v3.5/NT1-nh | 23 a/tools/testing/selftests/rcutorture/configs/v3.5/NT3-NH | 20 a/tools/testing/selftests/rcutorture/configs/v3.5/P1-S-T-NH-SD-SMP-HP | 20 a/tools/testing/selftests/rcutorture/configs/v3.5/P2-2-t-nh-sd-SMP-hp | 20 a/tools/testing/selftests/rcutorture/configs/v3.5/P3-3-T-nh-SD-SMP-hp | 20 a/tools/testing/selftests/rcutorture/configs/v3.5/P4-A-t-NH-sd-SMP-HP | 22 a/tools/testing/selftests/rcutorture/configs/v3.5/P5-U-T-NH-sd-SMP-hp | 28 a/tools/testing/selftests/rcutorture/configs/v3.5/PT1-nh | 23 a/tools/testing/selftests/rcutorture/configs/v3.5/PT2-NH | 22 a/tools/testing/selftests/rcutorture/configs/v3.5/ver_functions.sh | 57 a/tools/testing/selftests/rcutorture/configs/ver_functions.sh | 57 a/tools/testing/selftests/rcutorture/doc/TREE_RCU-Kconfig.txt | 95 b/include/linux/torture.h | 146 b/kernel/Makefile | 1 b/kernel/locking/Makefile | 1 b/kernel/locking/locktorture.c | 454 + b/kernel/rcu/Makefile | 2 b/kernel/rcu/rcutorture.c | 3232 +++++++--- b/kernel/torture.c | 893 ++ b/lib/Kconfig.debug | 25 b/tools/testing/selftests/rcutorture/bin/functions.sh | 1 b/tools/testing/selftests/rcutorture/bin/kvm-recheck-lock.sh | 51 b/tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh | 51 b/tools/testing/selftests/rcutorture/bin/kvm-recheck.sh | 55 b/tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh | 41 b/tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh | 205 b/tools/testing/selftests/rcutorture/bin/kvm.sh | 378 - b/tools/testing/selftests/rcutorture/configs/BUSTED | 9 b/tools/testing/selftests/rcutorture/configs/BUSTED.boot | 1 b/tools/testing/selftests/rcutorture/configs/CFcommon | 2 b/tools/testing/selftests/rcutorture/configs/SRCU-N | 3 b/tools/testing/selftests/rcutorture/configs/SRCU-P | 1 b/tools/testing/selftests/rcutorture/configs/TINY01 | 1 b/tools/testing/selftests/rcutorture/configs/TINY02 | 1 b/tools/testing/selftests/rcutorture/configs/TREE01 | 1 b/tools/testing/selftests/rcutorture/configs/TREE02 | 1 b/tools/testing/selftests/rcutorture/configs/TREE03 | 1 b/tools/testing/selftests/rcutorture/configs/TREE04 | 1 b/tools/testing/selftests/rcutorture/configs/TREE05 | 1 b/tools/testing/selftests/rcutorture/configs/TREE06 | 1 b/tools/testing/selftests/rcutorture/configs/TREE07 | 1 b/tools/testing/selftests/rcutorture/configs/TREE08 | 1 b/tools/testing/selftests/rcutorture/configs/TREE08-T | 1 b/tools/testing/selftests/rcutorture/configs/TREE09 | 1 b/tools/testing/selftests/rcutorture/configs/lock/BUSTED | 6 b/tools/testing/selftests/rcutorture/configs/lock/BUSTED.boot | 1 b/tools/testing/selftests/rcutorture/configs/lock/CFLIST | 1 b/tools/testing/selftests/rcutorture/configs/lock/CFcommon | 2 b/tools/testing/selftests/rcutorture/configs/lock/LOCK01 | 6 b/tools/testing/selftests/rcutorture/configs/lock/ver_functions.sh | 43 b/tools/testing/selftests/rcutorture/configs/rcu/BUSTED | 7 b/tools/testing/selftests/rcutorture/configs/rcu/BUSTED.boot | 1 b/tools/testing/selftests/rcutorture/configs/rcu/CFLIST | 13 b/tools/testing/selftests/rcutorture/configs/rcu/CFcommon | 2 b/tools/testing/selftests/rcutorture/configs/rcu/SRCU-N | 7 b/tools/testing/selftests/rcutorture/configs/rcu/SRCU-N.boot | 1 b/tools/testing/selftests/rcutorture/configs/rcu/SRCU-P | 7 b/tools/testing/selftests/rcutorture/configs/rcu/SRCU-P.boot | 1 b/tools/testing/selftests/rcutorture/configs/rcu/TINY01 | 12 b/tools/testing/selftests/rcutorture/configs/rcu/TINY02 | 12 b/tools/testing/selftests/rcutorture/configs/rcu/TREE01 | 22 b/tools/testing/selftests/rcutorture/configs/rcu/TREE01.boot | 1 b/tools/testing/selftests/rcutorture/configs/rcu/TREE02 | 25 b/tools/testing/selftests/rcutorture/configs/rcu/TREE03 | 22 b/tools/testing/selftests/rcutorture/configs/rcu/TREE04 | 24 b/tools/testing/selftests/rcutorture/configs/rcu/TREE04.boot | 1 b/tools/testing/selftests/rcutorture/configs/rcu/TREE05 | 24 b/tools/testing/selftests/rcutorture/configs/rcu/TREE05.boot | 1 b/tools/testing/selftests/rcutorture/configs/rcu/TREE06 | 25 b/tools/testing/selftests/rcutorture/configs/rcu/TREE07 | 23 b/tools/testing/selftests/rcutorture/configs/rcu/TREE08 | 25 b/tools/testing/selftests/rcutorture/configs/rcu/TREE08-T | 25 b/tools/testing/selftests/rcutorture/configs/rcu/TREE09 | 20 b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/CFLIST | 14 b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/N1-S-T-NH-SD-SMP-HP | 18 b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/N2-2-t-nh-sd-SMP-hp | 20 b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/N3-3-T-nh-SD-SMP-hp | 22 b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/N4-A-t-NH-sd-SMP-HP | 18 b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/N5-U-T-NH-sd-SMP-hp | 22 b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/NT1-nh | 23 b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/NT3-NH | 20 b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/P1-S-T-NH-SD-SMP-HP | 19 b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/P2-2-t-nh-sd-SMP-hp | 20 b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/P3-3-T-nh-SD-SMP-hp | 20 b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/P4-A-t-NH-sd-SMP-HP | 22 b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/P5-U-T-NH-sd-SMP-hp | 28 b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/PT1-nh | 23 b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/PT2-NH | 22 b/tools/testing/selftests/rcutorture/configs/rcu/v0.0/ver_functions.sh | 33 b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/CFLIST | 17 b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N1-S-T-NH-SD-SMP-HP | 19 b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N2-2-t-nh-sd-SMP-hp | 20 b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N3-3-T-nh-SD-SMP-hp | 22 b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N4-A-t-NH-sd-SMP-HP | 18 b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N5-U-T-NH-sd-SMP-hp | 22 b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N6---t-nh-SD-smp-hp | 19 b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N7-4-T-NH-SD-SMP-HP | 26 b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/N8-2-T-NH-SD-SMP-HP | 22 b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/NT1-nh | 23 b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/NT3-NH | 20 b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P1-S-T-NH-SD-SMP-HP | 20 b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P2-2-t-nh-sd-SMP-hp | 20 b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P3-3-T-nh-SD-SMP-hp | 20 b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P4-A-t-NH-sd-SMP-HP | 22 b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P5-U-T-NH-sd-SMP-hp | 28 b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P6---t-nh-SD-smp-hp | 18 b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP | 30 b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-all | 30 b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-none | 30 b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-hp | 30 b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/PT1-nh | 23 b/tools/testing/selftests/rcutorture/configs/rcu/v3.12/PT2-NH | 22 b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/CFLIST | 14 b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/N1-S-T-NH-SD-SMP-HP | 19 b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/N2-2-t-nh-sd-SMP-hp | 20 b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/N3-3-T-nh-SD-SMP-hp | 22 b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/N4-A-t-NH-sd-SMP-HP | 18 b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/N5-U-T-NH-sd-SMP-hp | 22 b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/NT1-nh | 23 b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/NT3-NH | 20 b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/P1-S-T-NH-SD-SMP-HP | 20 b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/P2-2-t-nh-sd-SMP-hp | 20 b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/P3-3-T-nh-SD-SMP-hp | 20 b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/P4-A-t-NH-sd-SMP-HP | 22 b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/P5-U-T-NH-sd-SMP-hp | 28 b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/PT1-nh | 23 b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/PT2-NH | 22 b/tools/testing/selftests/rcutorture/configs/rcu/v3.3/ver_functions.sh | 44 b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/CFLIST | 14 b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/N1-S-T-NH-SD-SMP-HP | 19 b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/N2-2-t-nh-sd-SMP-hp | 20 b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/N3-3-T-nh-SD-SMP-hp | 22 b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/N4-A-t-NH-sd-SMP-HP | 18 b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/N5-U-T-NH-sd-SMP-hp | 22 b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/NT1-nh | 23 b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/NT3-NH | 20 b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/P1-S-T-NH-SD-SMP-HP | 20 b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/P2-2-t-nh-sd-SMP-hp | 20 b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/P3-3-T-nh-SD-SMP-hp | 20 b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/P4-A-t-NH-sd-SMP-HP | 22 b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/P5-U-T-NH-sd-SMP-hp | 28 b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/PT1-nh | 23 b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/PT2-NH | 22 b/tools/testing/selftests/rcutorture/configs/rcu/v3.5/ver_functions.sh | 57 b/tools/testing/selftests/rcutorture/configs/rcu/ver_functions.sh | 57 b/tools/testing/selftests/rcutorture/configs/v0.0/ver_functions.sh | 22 b/tools/testing/selftests/rcutorture/configs/v3.3/ver_functions.sh | 25 b/tools/testing/selftests/rcutorture/configs/v3.5/ver_functions.sh | 23 b/tools/testing/selftests/rcutorture/configs/ver_functions.sh | 21 b/tools/testing/selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 95 236 files changed, 6643 insertions(+), 5512 deletions(-)
PATCH 3/55 rcutorture: Move common boot flags to kvm-test-1-rcu.sh
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
Currently, most boot flags are calculated in kvm-test-1-rcu.sh, except that rcutorture.test_no_idle_hz and rcutorture.verbose are set up by kvm.sh. This commit promotes one-stop shopping by consolidating the determination of boot flags into kvm-test-1-rcu.sh.
--- tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh | 8 ++++---- tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh +4 -4
@@ -6,15 +6,15 @@ # Execute this in the source tree. Do not run it as a background task # because qemu does not seem to like that much. # -# Usage: sh kvm-test-1-rcu.sh config builddir resdir minutes qemu-args bootargs +# Usage: sh kvm-test-1-rcu.sh config builddir resdir minutes qemu-args boot_args # # qemu-args defaults to "" -- you will want "-nographic" if running headless. -# bootargs defaults to "root=/dev/sda noapic selinux=0 console=ttyS0" +# boot_args defaults to "root=/dev/sda noapic selinux=0 console=ttyS0" # "initcall_debug debug rcutorture.stat_interval=15" # "rcutorture.shutdown_secs=$((minutes * 60))" # "rcutorture.rcutorture_runnable=1" # -# Anything you specify for either qemu-args or bootargs is appended to +# Anything you specify for either qemu-args or boot_args is appended to # the default values. The "-smp" value is deduced from the contents of # the config fragment. #
@@ -138,7 +138,7 @@ boot_args="`rcutorture_param_onoff "$boot_args" $builddir/.config`" # Generate rcu_barrier() boot parameter boot_args="`rcutorture_param_n_barrier_cbs "$boot_args"`" # Pull in standard rcutorture boot arguments -boot_args="$boot_args rcutorture.stat_interval=15 rcutorture.shutdown_secs=$seconds rcutorture.rcutorture_runnable=1" +boot_args="$boot_args rcutorture.stat_interval=15 rcutorture.shutdown_secs=$seconds rcutorture.rcutorture_runnable=1 rcutorture.test_no_idle_hz=1 rcutorture.verbose=1" echo $QEMU $qemu_args -m 512 -kernel $builddir/arch/x86/boot/bzImage -append \"$qemu_append $boot_args\" > $resdir/qemu-cmd if test -n "$RCU_BUILDONLY"
tools/testing/selftests/rcutorture/bin/kvm.sh +1 -1
@@ -203,7 +203,7 @@ do fi mkdir "${rd}" echo Results directory: $rd - kvm-test-1-rcu.sh $CONFIGFRAG/$kversion/$CF $builddir $rd $dur "-nographic $RCU_QEMU_ARG" "rcutorture.test_no_idle_hz=1 rcutorture.verbose=1 $RCU_BOOTARGS" + kvm-test-1-rcu.sh $CONFIGFRAG/$kversion/$CF $builddir $rd $dur "-nographic $RCU_QEMU_ARG" "$RCU_BOOTARGS" done # Tracing: trace_event=rcu:rcu_grace_period,rcu:rcu_future_grace_period,rcu:rcu_grace_period_init,rcu:rcu_nocb_wake,rcu:rcu_preempt_task,rcu:rcu_unlock_preempted_task,rcu:rcu_quiescent_state_report,rcu:rcu_fqs,rcu:rcu_callback,rcu:rcu_kfree_callback,rcu:rcu_batch_start,rcu:rcu_invoke_callback,rcu:rcu_invoke_kfree_callback,rcu:rcu_batch_end,rcu:rcu_torture_read,rcu:rcu_barrier
Signature · 1 line
1.8.1.5
PATCH 2/55 rcutorture: Print script and arguments to standard output
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
Although the script name and arguments are logged in the results directory, it is more convenient to see it in the output. This commit therefore adds the output of this information.
--- tools/testing/selftests/rcutorture/bin/kvm-recheck.sh | 7 +++++++ tools/testing/selftests/rcutorture/bin/kvm.sh | 1 + 2 files changed, 8 insertions(+)
tools/testing/selftests/rcutorture/bin/kvm-recheck.sh +7 -0
@@ -27,9 +27,16 @@ PATH=`pwd`/tools/testing/selftests/rcutorture/bin:$PATH; export PATH for rd in "$@" do + firsttime=1 dirs=`find $rd -name Make.defconfig.out -print | sort | sed -e 's,/[^/]*$,,' | sort -u` for i in $dirs do + if test $firsttime + then + firsttime=0 + resdir=`echo $i | sed -e 's,/$,,' -e 's,/[^/]*$,,'` + head -1 $resdir/log + fi configfile=`echo $i | sed -e 's/^.*\///'` ngps=`grep ver: $i/console.log 2> /dev/null | tail -1 | sed -e 's/^.* ver: //' -e 's/ .*$//'` if test -z "$ngps"
tools/testing/selftests/rcutorture/bin/kvm.sh +1 -0
@@ -169,6 +169,7 @@ else fi mkdir $resdir/$ds touch $resdir/$ds/log +echo $scriptname $args echo $scriptname $args >> $resdir/$ds/log pwd > $resdir/$ds/testid.txt
Signature · 1 line
1.8.1.5
PATCH 5/55 rcutorture: Move common qemu flags to kvm-test-1.sh
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
Currently, most qemu flags are calculated in kvm-test-1-rcu.sh, except that -nographics is set up by kvm.sh. This commit promotes one-stop shopping by consolidating the determination of qemu flags into kvm-test-1-rcu.sh.
--- tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh | 1 + tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh +1 -0
@@ -126,6 +126,7 @@ echo ' ---' `date`: Starting kernel QEMU="`identify_qemu $builddir/vmlinux.o`" # Generate -smp qemu argument. +qemu_args="-nographic $qemu_args" cpu_count=`configNR_CPUS.sh $config_template` vcpus=`identify_qemu_vcpus` if test $cpu_count -gt $vcpus
tools/testing/selftests/rcutorture/bin/kvm.sh +1 -1
@@ -203,7 +203,7 @@ do fi mkdir "${rd}" echo Results directory: $rd - kvm-test-1-rcu.sh $CONFIGFRAG/$kversion/$CF $builddir $rd $dur "-nographic $RCU_QEMU_ARG" "$RCU_BOOTARGS" + kvm-test-1-rcu.sh $CONFIGFRAG/$kversion/$CF $builddir $rd $dur "$RCU_QEMU_ARG" "$RCU_BOOTARGS" done # Tracing: trace_event=rcu:rcu_grace_period,rcu:rcu_future_grace_period,rcu:rcu_grace_period_init,rcu:rcu_nocb_wake,rcu:rcu_preempt_task,rcu:rcu_unlock_preempted_task,rcu:rcu_quiescent_state_report,rcu:rcu_fqs,rcu:rcu_callback,rcu:rcu_kfree_callback,rcu:rcu_batch_start,rcu:rcu_invoke_callback,rcu:rcu_invoke_kfree_callback,rcu:rcu_batch_end,rcu:rcu_torture_read,rcu:rcu_barrier
Signature · 1 line
1.8.1.5
PATCH 9/55 rcutorture: Add dryrun capability
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
Actual rcutorture tests take considerable time and machine resources, so it is inconvenient to actually do an rcutorture run when optimizing the bin-packing algorithm. This commit therefore adds a --dryrun argument, which defaults to doing a run, but for which "sched" says to simply print the run schedule and "script" dumps the script without running it.
--- tools/testing/selftests/rcutorture/bin/kvm.sh | 39 ++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 4 deletions(-)
tools/testing/selftests/rcutorture/bin/kvm.sh +35 -4
@@ -35,6 +35,7 @@ trap 'rm -rf $T' 0 mkdir $T dur=30 +dryrun="" KVM="`pwd`/tools/testing/selftests/rcutorture"; export KVM PATH=${KVM}/bin:$PATH; export PATH builddir="${KVM}/b1"
@@ -56,6 +57,7 @@ usage () { echo " --configs \"config-file list\"" echo " --cpus N" echo " --datestamp string" + echo " --dryrun sched|script" echo " --duration minutes" echo " --interactive" echo " --kmake-arg kernel-make-arguments"
@@ -101,6 +103,11 @@ do ds=$2 shift ;; + --dryrun) + checkarg --dryrun "sched|script" $# "$2" 'sched\|script' '^--' + dryrun=$2 + shift + ;; --duration) checkarg --duration "(minutes)" $# "$2" '^[0-9]*$' '^error' dur=$2
@@ -179,9 +186,12 @@ else fi fi mkdir $resdir/$ds -echo Results directory: $resdir/$ds +if test "$dryrun" = "" +then + echo Results directory: $resdir/$ds + echo $scriptname $args +fi touch $resdir/$ds/log -echo $scriptname $args echo $scriptname $args >> $resdir/$ds/log pwd > $resdir/$ds/testid.txt
@@ -231,7 +241,7 @@ function dump(first, pastlast) print "echo ", cf[j], cpus[j] ": Starting build." print "rm -f " builddir ".*" print "touch " builddir ".wait" - print "mkdir " builddir " || :" + print "mkdir " builddir " > /dev/null 2>&1 || :" if (cfrep[cf[j]] == "") { cfr[j] = cf[j]; cfrep[cf[j]] = 1;
@@ -286,7 +296,28 @@ END { dump(first, i); }' > $T/script -sh $T/script +if test "$dryrun" = script +then + echo CONFIGFRAG="$CONFIGFRAG; export CONFIGFRAG" + echo KVM="$KVM; export KVM" + echo KVPATH="$KVPATH; export KVPATH" + echo PATH="$PATH; export PATH" + echo RCU_BUILDONLY="$RCU_BUILDONLY; export RCU_BUILDONLY" + echo RCU_INITRD="$RCU_INITRD; export RCU_INITRD" + echo RCU_KMAKE_ARG="$RCU_KMAKE_ARG; export RCU_KMAKE_ARG" + echo RCU_QEMU_CMD="$RCU_QEMU_CMD; export RCU_QEMU_CMD" + echo RCU_QEMU_INTERACTIVE="$RCU_QEMU_INTERACTIVE; export RCU_QEMU_INTERACTIVE" + echo RCU_QEMU_MAC="$RCU_QEMU_MAC; export RCU_QEMU_MAC" + cat $T/script + exit 0 +elif test "$dryrun" = sched +then + egrep 'start batch|Starting build\.' $T/script | + sed -e 's/:.*$//' -e 's/^echo //' + exit 0 +else + sh $T/script +fi # Tracing: trace_event=rcu:rcu_grace_period,rcu:rcu_future_grace_period,rcu:rcu_grace_period_init,rcu:rcu_nocb_wake,rcu:rcu_preempt_task,rcu:rcu_unlock_preempted_task,rcu:rcu_quiescent_state_report,rcu:rcu_fqs,rcu:rcu_callback,rcu:rcu_kfree_callback,rcu:rcu_batch_start,rcu:rcu_invoke_callback,rcu:rcu_invoke_kfree_callback,rcu:rcu_batch_end,rcu:rcu_torture_read,rcu:rcu_barrier
Signature · 1 line
1.8.1.5
PATCH 14/55 rcutorture: Print results directory when dumping results
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
--- tools/testing/selftests/rcutorture/bin/kvm.sh | 3 +++ 1 file changed, 3 insertions(+)
tools/testing/selftests/rcutorture/bin/kvm.sh +3 -0
@@ -386,5 +386,8 @@ fi # Tracing: trace_event=rcu:rcu_grace_period,rcu:rcu_future_grace_period,rcu:rcu_grace_period_init,rcu:rcu_nocb_wake,rcu:rcu_preempt_task,rcu:rcu_unlock_preempted_task,rcu:rcu_quiescent_state_report,rcu:rcu_fqs,rcu:rcu_callback,rcu:rcu_kfree_callback,rcu:rcu_batch_start,rcu:rcu_invoke_callback,rcu:rcu_invoke_kfree_callback,rcu:rcu_batch_end,rcu:rcu_torture_read,rcu:rcu_barrier +echo +echo echo " --- `date` Test summary:" +echo Results directory: $resdir/$ds kvm-recheck.sh $resdir/$ds
Signature · 1 line
1.8.1.5
PATCH 26/55 rcutorture: Print dates when doing parallel rcutorture runs
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
--- tools/testing/selftests/rcutorture/bin/kvm.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
tools/testing/selftests/rcutorture/bin/kvm.sh +6 -6
@@ -286,7 +286,7 @@ awk < $T/cfgcpu.pack \ # Dump out the scripting required to run one test batch. function dump(first, pastlast) { - print "echo ----start batch----" + print "echo ----Start batch: `date`" jn=1 for (j = first; j < pastlast; j++) { builddir=KVM "/b" jn
@@ -302,27 +302,27 @@ function dump(first, pastlast) ovf = "(!)"; else ovf = ""; - print "echo ", cfr[jn], cpusr[jn] ovf ": Starting build."; + print "echo ", cfr[jn], cpusr[jn] ovf ": Starting build. `date`"; print "rm -f " builddir ".*"; print "touch " builddir ".wait"; print "mkdir " builddir " > /dev/null 2>&1 || :"; print "mkdir " rd cfr[jn] " || :"; print "kvm-test-1-rcu.sh " CONFIGDIR cf[j], builddir, rd cfr[jn], dur " \"" RCU_QEMU_ARG "\" \"" RCU_BOOTARGS "\" > " builddir ".out 2>&1 &" - print "echo ", cfr[jn], cpusr[jn] ovf ": Waiting for build to complete." + print "echo ", cfr[jn], cpusr[jn] ovf ": Waiting for build to complete. `date`" print "while test -f " builddir ".wait" print "do" print "\tsleep 1" print "done" - print "echo ", cfr[jn], cpusr[jn] ovf ": Build complete." + print "echo ", cfr[jn], cpusr[jn] ovf ": Build complete. `date`" jn++; } for (j = 1; j < jn; j++) { builddir=KVM "/b" j print "rm -f " builddir ".ready" - print "echo ----", cfr[j], cpusr[j] ovf ": Starting kernel" + print "echo ----", cfr[j], cpusr[j] ovf ": Starting kernel. `date`" } print "wait" - print "echo ---- All kernel runs complete" + print "echo ---- All kernel runs complete. `date`" for (j = 1; j < jn; j++) { builddir=KVM "/b" j print "echo ----", cfr[j], cpusr[j] ovf ": Build/run results:"
Signature · 1 line
1.8.1.5
PATCH 51/55 locktorture: Add kvm-recheck.sh plug-in for locktorture
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
This commit adds the kvm-recheck-lock.sh plug-in for locktorture to print out lock-specific progress statistics.
--- .../selftests/rcutorture/bin/kvm-recheck-lock.sh | 51 ++++++++++++++++++++++ .../selftests/rcutorture/bin/kvm-recheck.sh | 5 ++- 2 files changed, 54 insertions(+), 2 deletions(-) create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-lock.sh
tools/testing/selftests/rcutorture/bin/kvm-recheck-lock.sh new file +51 -0
@@ -0,0 +1,51 @@ +#!/bin/bash +# +# Analyze a given results directory for locktorture progress. +# +# Usage: sh kvm-recheck-lock.sh resdir +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, you can access it online at +# http://www.gnu.org/licenses/gpl-2.0.html. +# +# Copyright (C) IBM Corporation, 2014 +# +# Authors: Paul E. McKenney <[email protected]> + +i="$1" +if test -d $i +then + : +else + echo Unreadable results directory: $i + exit 1 +fi + +configfile=`echo $i | sed -e 's/^.*\///'` +ncs=`grep "Writes: Total:" $i/console.log 2> /dev/null | tail -1 | sed -e 's/^.* Total: //' -e 's/ .*$//'` +if test -z "$ncs" +then + echo $configfile +else + title="$configfile ------- $ncs acquisitions/releases" + dur=`sed -e 's/^.* locktorture.shutdown_secs=//' -e 's/ .*$//' < $i/qemu-cmd 2> /dev/null` + if test -z "$dur" + then + : + else + ncsps=`awk -v ncs=$ncs -v dur=$dur ' + BEGIN { print ncs / dur }' < /dev/null` + title="$title ($ncsps per second)" + fi + echo $title +fi
tools/testing/selftests/rcutorture/bin/kvm-recheck.sh +3 -2
@@ -1,6 +1,6 @@ #!/bin/bash # -# Given the results directories for previous KVM runs of rcutorture, +# Given the results directories for previous KVM-based torture runs, # check the build and console output for errors. Given a directory # containing results directories, this recursively checks them all. #
@@ -37,7 +37,8 @@ do resdir=`echo $i | sed -e 's,/$,,' -e 's,/[^/]*$,,'` head -1 $resdir/log fi - kvm-recheck-rcu.sh $i + TORTURE_SUITE="`cat $i/../TORTURE_SUITE`" + kvm-recheck-${TORTURE_SUITE}.sh $i configcheck.sh $i/.config $i/ConfigFragment parse-build.sh $i/Make.out $configfile parse-rcutorture.sh $i/console.log $configfile
Signature · 1 line
1.8.1.5
PATCH 48/55 rcutorture: Introduce "rcu" directory level underneath configs
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
This commit uses the standard software ploy of introducing another level of indirection below the configs directory. This allows each torture-test suite to have its own set of Kconfig files, boot parameters, and version-specific scripts. Initially, we have only rcu, but lock will follow soonish.
--- .../selftests/rcutorture/bin/kvm-test-1-run.sh | 2 +- tools/testing/selftests/rcutorture/bin/kvm.sh | 17 +++++-- tools/testing/selftests/rcutorture/configs/BUSTED | 7 --- .../selftests/rcutorture/configs/BUSTED.boot | 1 - tools/testing/selftests/rcutorture/configs/CFLIST | 13 ----- .../testing/selftests/rcutorture/configs/CFcommon | 2 - tools/testing/selftests/rcutorture/configs/SRCU-N | 7 --- .../selftests/rcutorture/configs/SRCU-N.boot | 1 - tools/testing/selftests/rcutorture/configs/SRCU-P | 7 --- .../selftests/rcutorture/configs/SRCU-P.boot | 1 - tools/testing/selftests/rcutorture/configs/TINY01 | 12 ----- tools/testing/selftests/rcutorture/configs/TINY02 | 12 ----- tools/testing/selftests/rcutorture/configs/TREE01 | 22 --------- .../selftests/rcutorture/configs/TREE01.boot | 1 - tools/testing/selftests/rcutorture/configs/TREE02 | 25 ---------- tools/testing/selftests/rcutorture/configs/TREE03 | 22 --------- tools/testing/selftests/rcutorture/configs/TREE04 | 24 --------- .../selftests/rcutorture/configs/TREE04.boot | 1 - tools/testing/selftests/rcutorture/configs/TREE05 | 24 --------- .../selftests/rcutorture/configs/TREE05.boot | 1 - tools/testing/selftests/rcutorture/configs/TREE06 | 25 ---------- tools/testing/selftests/rcutorture/configs/TREE07 | 23 --------- tools/testing/selftests/rcutorture/configs/TREE08 | 25 ---------- .../testing/selftests/rcutorture/configs/TREE08-T | 25 ---------- tools/testing/selftests/rcutorture/configs/TREE09 | 20 -------- .../selftests/rcutorture/configs/rcu/BUSTED | 7 +++ .../selftests/rcutorture/configs/rcu/BUSTED.boot | 1 + .../selftests/rcutorture/configs/rcu/CFLIST | 13 +++++ .../selftests/rcutorture/configs/rcu/CFcommon | 2 + .../selftests/rcutorture/configs/rcu/SRCU-N | 7 +++ .../selftests/rcutorture/configs/rcu/SRCU-N.boot | 1 + .../selftests/rcutorture/configs/rcu/SRCU-P | 7 +++ .../selftests/rcutorture/configs/rcu/SRCU-P.boot | 1 + .../selftests/rcutorture/configs/rcu/TINY01 | 12 +++++ .../selftests/rcutorture/configs/rcu/TINY02 | 12 +++++ .../selftests/rcutorture/configs/rcu/TREE01 | 22 +++++++++ .../selftests/rcutorture/configs/rcu/TREE01.boot | 1 + .../selftests/rcutorture/configs/rcu/TREE02 | 25 ++++++++++ .../selftests/rcutorture/configs/rcu/TREE03 | 22 +++++++++ .../selftests/rcutorture/configs/rcu/TREE04 | 24 +++++++++ .../selftests/rcutorture/configs/rcu/TREE04.boot | 1 + .../selftests/rcutorture/configs/rcu/TREE05 | 24 +++++++++ .../selftests/rcutorture/configs/rcu/TREE05.boot | 1 + .../selftests/rcutorture/configs/rcu/TREE06 | 25 ++++++++++ .../selftests/rcutorture/configs/rcu/TREE07 | 23 +++++++++ .../selftests/rcutorture/configs/rcu/TREE08 | 25 ++++++++++ .../selftests/rcutorture/configs/rcu/TREE08-T | 25 ++++++++++ .../selftests/rcutorture/configs/rcu/TREE09 | 20 ++++++++ .../selftests/rcutorture/configs/rcu/v0.0/CFLIST | 14 ++++++ .../configs/rcu/v0.0/N1-S-T-NH-SD-SMP-HP | 18 +++++++ .../configs/rcu/v0.0/N2-2-t-nh-sd-SMP-hp | 20 ++++++++ .../configs/rcu/v0.0/N3-3-T-nh-SD-SMP-hp | 22 +++++++++ .../configs/rcu/v0.0/N4-A-t-NH-sd-SMP-HP | 18 +++++++ .../configs/rcu/v0.0/N5-U-T-NH-sd-SMP-hp | 22 +++++++++ .../selftests/rcutorture/configs/rcu/v0.0/NT1-nh | 23 +++++++++ .../selftests/rcutorture/configs/rcu/v0.0/NT3-NH | 20 ++++++++ .../configs/rcu/v0.0/P1-S-T-NH-SD-SMP-HP | 19 ++++++++ .../configs/rcu/v0.0/P2-2-t-nh-sd-SMP-hp | 20 ++++++++ .../configs/rcu/v0.0/P3-3-T-nh-SD-SMP-hp | 20 ++++++++ .../configs/rcu/v0.0/P4-A-t-NH-sd-SMP-HP | 22 +++++++++ .../configs/rcu/v0.0/P5-U-T-NH-sd-SMP-hp | 28 +++++++++++ .../selftests/rcutorture/configs/rcu/v0.0/PT1-nh | 23 +++++++++ .../selftests/rcutorture/configs/rcu/v0.0/PT2-NH | 22 +++++++++ .../rcutorture/configs/rcu/v0.0/ver_functions.sh | 33 +++++++++++++ .../selftests/rcutorture/configs/rcu/v3.12/CFLIST | 17 +++++++ .../configs/rcu/v3.12/N1-S-T-NH-SD-SMP-HP | 19 ++++++++ .../configs/rcu/v3.12/N2-2-t-nh-sd-SMP-hp | 20 ++++++++ .../configs/rcu/v3.12/N3-3-T-nh-SD-SMP-hp | 22 +++++++++ .../configs/rcu/v3.12/N4-A-t-NH-sd-SMP-HP | 18 +++++++ .../configs/rcu/v3.12/N5-U-T-NH-sd-SMP-hp | 22 +++++++++ .../configs/rcu/v3.12/N6---t-nh-SD-smp-hp | 19 ++++++++ .../configs/rcu/v3.12/N7-4-T-NH-SD-SMP-HP | 26 ++++++++++ .../configs/rcu/v3.12/N8-2-T-NH-SD-SMP-HP | 22 +++++++++ .../selftests/rcutorture/configs/rcu/v3.12/NT1-nh | 23 +++++++++ .../selftests/rcutorture/configs/rcu/v3.12/NT3-NH | 20 ++++++++ .../configs/rcu/v3.12/P1-S-T-NH-SD-SMP-HP | 20 ++++++++ .../configs/rcu/v3.12/P2-2-t-nh-sd-SMP-hp | 20 ++++++++ .../configs/rcu/v3.12/P3-3-T-nh-SD-SMP-hp | 20 ++++++++ .../configs/rcu/v3.12/P4-A-t-NH-sd-SMP-HP | 22 +++++++++ .../configs/rcu/v3.12/P5-U-T-NH-sd-SMP-hp | 28 +++++++++++ .../configs/rcu/v3.12/P6---t-nh-SD-smp-hp | 18 +++++++ .../configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP | 30 ++++++++++++ .../configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-all | 30 ++++++++++++ .../configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-none | 30 ++++++++++++ .../configs/rcu/v3.12/P7-4-T-NH-SD-SMP-hp | 30 ++++++++++++ .../selftests/rcutorture/configs/rcu/v3.12/PT1-nh | 23 +++++++++ .../selftests/rcutorture/configs/rcu/v3.12/PT2-NH | 22 +++++++++ .../selftests/rcutorture/configs/rcu/v3.3/CFLIST | 14 ++++++ .../configs/rcu/v3.3/N1-S-T-NH-SD-SMP-HP | 19 ++++++++ .../configs/rcu/v3.3/N2-2-t-nh-sd-SMP-hp | 20 ++++++++ .../configs/rcu/v3.3/N3-3-T-nh-SD-SMP-hp | 22 +++++++++ .../configs/rcu/v3.3/N4-A-t-NH-sd-SMP-HP | 18 +++++++ .../configs/rcu/v3.3/N5-U-T-NH-sd-SMP-hp | 22 +++++++++ .../selftests/rcutorture/configs/rcu/v3.3/NT1-nh | 23 +++++++++ .../selftests/rcutorture/configs/rcu/v3.3/NT3-NH | 20 ++++++++ .../configs/rcu/v3.3/P1-S-T-NH-SD-SMP-HP | 20 ++++++++ .../configs/rcu/v3.3/P2-2-t-nh-sd-SMP-hp | 20 ++++++++ .../configs/rcu/v3.3/P3-3-T-nh-SD-SMP-hp | 20 ++++++++ .../configs/rcu/v3.3/P4-A-t-NH-sd-SMP-HP | 22 +++++++++ .../configs/rcu/v3.3/P5-U-T-NH-sd-SMP-hp | 28 +++++++++++ .../selftests/rcutorture/configs/rcu/v3.3/PT1-nh | 23 +++++++++ .../selftests/rcutorture/configs/rcu/v3.3/PT2-NH | 22 +++++++++ .../rcutorture/configs/rcu/v3.3/ver_functions.sh | 44 +++++++++++++++++ .../selftests/rcutorture/configs/rcu/v3.5/CFLIST | 14 ++++++ .../configs/rcu/v3.5/N1-S-T-NH-SD-SMP-HP | 19 ++++++++ .../configs/rcu/v3.5/N2-2-t-nh-sd-SMP-hp | 20 ++++++++ .../configs/rcu/v3.5/N3-3-T-nh-SD-SMP-hp | 22 +++++++++ .../configs/rcu/v3.5/N4-A-t-NH-sd-SMP-HP | 18 +++++++ .../configs/rcu/v3.5/N5-U-T-NH-sd-SMP-hp | 22 +++++++++ .../selftests/rcutorture/configs/rcu/v3.5/NT1-nh | 23 +++++++++ .../selftests/rcutorture/configs/rcu/v3.5/NT3-NH | 20 ++++++++ .../configs/rcu/v3.5/P1-S-T-NH-SD-SMP-HP | 20 ++++++++ .../configs/rcu/v3.5/P2-2-t-nh-sd-SMP-hp | 20 ++++++++ .../configs/rcu/v3.5/P3-3-T-nh-SD-SMP-hp | 20 ++++++++ .../configs/rcu/v3.5/P4-A-t-NH-sd-SMP-HP | 22 +++++++++ .../configs/rcu/v3.5/P5-U-T-NH-sd-SMP-hp | 28 +++++++++++ .../selftests/rcutorture/configs/rcu/v3.5/PT1-nh | 23 +++++++++ .../selftests/rcutorture/configs/rcu/v3.5/PT2-NH | 22 +++++++++ .../rcutorture/configs/rcu/v3.5/ver_functions.sh | 57 ++++++++++++++++++++++ .../rcutorture/configs/rcu/ver_functions.sh | 57 ++++++++++++++++++++++ .../selftests/rcutorture/configs/v0.0/CFLIST | 14 ------ .../rcutorture/configs/v0.0/N1-S-T-NH-SD-SMP-HP | 18 ------- .../rcutorture/configs/v0.0/N2-2-t-nh-sd-SMP-hp | 20 -------- .../rcutorture/configs/v0.0/N3-3-T-nh-SD-SMP-hp | 22 --------- .../rcutorture/configs/v0.0/N4-A-t-NH-sd-SMP-HP | 18 ------- .../rcutorture/configs/v0.0/N5-U-T-NH-sd-SMP-hp | 22 --------- .../selftests/rcutorture/configs/v0.0/NT1-nh | 23 --------- .../selftests/rcutorture/configs/v0.0/NT3-NH | 20 -------- .../rcutorture/configs/v0.0/P1-S-T-NH-SD-SMP-HP | 19 -------- .../rcutorture/configs/v0.0/P2-2-t-nh-sd-SMP-hp | 20 -------- .../rcutorture/configs/v0.0/P3-3-T-nh-SD-SMP-hp | 20 -------- .../rcutorture/configs/v0.0/P4-A-t-NH-sd-SMP-HP | 22 --------- .../rcutorture/configs/v0.0/P5-U-T-NH-sd-SMP-hp | 28 ----------- .../selftests/rcutorture/configs/v0.0/PT1-nh | 23 --------- .../selftests/rcutorture/configs/v0.0/PT2-NH | 22 --------- .../rcutorture/configs/v0.0/ver_functions.sh | 33 ------------- .../selftests/rcutorture/configs/v3.12/CFLIST | 17 ------- .../rcutorture/configs/v3.12/N1-S-T-NH-SD-SMP-HP | 19 -------- .../rcutorture/configs/v3.12/N2-2-t-nh-sd-SMP-hp | 20 -------- .../rcutorture/configs/v3.12/N3-3-T-nh-SD-SMP-hp | 22 --------- .../rcutorture/configs/v3.12/N4-A-t-NH-sd-SMP-HP | 18 ------- .../rcutorture/configs/v3.12/N5-U-T-NH-sd-SMP-hp | 22 --------- .../rcutorture/configs/v3.12/N6---t-nh-SD-smp-hp | 19 -------- .../rcutorture/configs/v3.12/N7-4-T-NH-SD-SMP-HP | 26 ---------- .../rcutorture/configs/v3.12/N8-2-T-NH-SD-SMP-HP | 22 --------- .../selftests/rcutorture/configs/v3.12/NT1-nh | 23 --------- .../selftests/rcutorture/configs/v3.12/NT3-NH | 20 -------- .../rcutorture/configs/v3.12/P1-S-T-NH-SD-SMP-HP | 20 -------- .../rcutorture/configs/v3.12/P2-2-t-nh-sd-SMP-hp | 20 -------- .../rcutorture/configs/v3.12/P3-3-T-nh-SD-SMP-hp | 20 -------- .../rcutorture/configs/v3.12/P4-A-t-NH-sd-SMP-HP | 22 --------- .../rcutorture/configs/v3.12/P5-U-T-NH-sd-SMP-hp | 28 ----------- .../rcutorture/configs/v3.12/P6---t-nh-SD-smp-hp | 18 ------- .../rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP | 30 ------------ .../configs/v3.12/P7-4-T-NH-SD-SMP-HP-all | 30 ------------ .../configs/v3.12/P7-4-T-NH-SD-SMP-HP-none | 30 ------------ .../rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-hp | 30 ------------ .../selftests/rcutorture/configs/v3.12/PT1-nh | 23 --------- .../selftests/rcutorture/configs/v3.12/PT2-NH | 22 --------- .../selftests/rcutorture/configs/v3.3/CFLIST | 14 ------ .../rcutorture/configs/v3.3/N1-S-T-NH-SD-SMP-HP | 19 -------- .../rcutorture/configs/v3.3/N2-2-t-nh-sd-SMP-hp | 20 -------- .../rcutorture/configs/v3.3/N3-3-T-nh-SD-SMP-hp | 22 --------- .../rcutorture/configs/v3.3/N4-A-t-NH-sd-SMP-HP | 18 ------- .../rcutorture/configs/v3.3/N5-U-T-NH-sd-SMP-hp | 22 --------- .../selftests/rcutorture/configs/v3.3/NT1-nh | 23 --------- .../selftests/rcutorture/configs/v3.3/NT3-NH | 20 -------- .../rcutorture/configs/v3.3/P1-S-T-NH-SD-SMP-HP | 20 -------- .../rcutorture/configs/v3.3/P2-2-t-nh-sd-SMP-hp | 20 -------- .../rcutorture/configs/v3.3/P3-3-T-nh-SD-SMP-hp | 20 -------- .../rcutorture/configs/v3.3/P4-A-t-NH-sd-SMP-HP | 22 --------- .../rcutorture/configs/v3.3/P5-U-T-NH-sd-SMP-hp | 28 ----------- .../selftests/rcutorture/configs/v3.3/PT1-nh | 23 --------- .../selftests/rcutorture/configs/v3.3/PT2-NH | 22 --------- .../rcutorture/configs/v3.3/ver_functions.sh | 44 ----------------- .../selftests/rcutorture/configs/v3.5/CFLIST | 14 ------ .../rcutorture/configs/v3.5/N1-S-T-NH-SD-SMP-HP | 19 -------- .../rcutorture/configs/v3.5/N2-2-t-nh-sd-SMP-hp | 20 -------- .../rcutorture/configs/v3.5/N3-3-T-nh-SD-SMP-hp | 22 --------- .../rcutorture/configs/v3.5/N4-A-t-NH-sd-SMP-HP | 18 ------- .../rcutorture/configs/v3.5/N5-U-T-NH-sd-SMP-hp | 22 --------- .../selftests/rcutorture/configs/v3.5/NT1-nh | 23 --------- .../selftests/rcutorture/configs/v3.5/NT3-NH | 20 -------- .../rcutorture/configs/v3.5/P1-S-T-NH-SD-SMP-HP | 20 -------- .../rcutorture/configs/v3.5/P2-2-t-nh-sd-SMP-hp | 20 -------- .../rcutorture/configs/v3.5/P3-3-T-nh-SD-SMP-hp | 20 -------- .../rcutorture/configs/v3.5/P4-A-t-NH-sd-SMP-HP | 22 --------- .../rcutorture/configs/v3.5/P5-U-T-NH-sd-SMP-hp | 28 ----------- .../selftests/rcutorture/configs/v3.5/PT1-nh | 23 --------- .../selftests/rcutorture/configs/v3.5/PT2-NH | 22 --------- .../rcutorture/configs/v3.5/ver_functions.sh | 57 ---------------------- .../selftests/rcutorture/configs/ver_functions.sh | 57 ---------------------- 192 files changed, 1965 insertions(+), 1954 deletions(-) delete mode 100644 tools/testing/selftests/rcutorture/configs/BUSTED delete mode 100644 tools/testing/selftests/rcutorture/configs/BUSTED.boot delete mode 100644 tools/testing/selftests/rcutorture/configs/CFLIST delete mode 100644 tools/testing/selftests/rcutorture/configs/CFcommon delete mode 100644 tools/testing/selftests/rcutorture/configs/SRCU-N delete mode 100644 tools/testing/selftests/rcutorture/configs/SRCU-N.boot delete mode 100644 tools/testing/selftests/rcutorture/configs/SRCU-P delete mode 100644 tools/testing/selftests/rcutorture/configs/SRCU-P.boot delete mode 100644 tools/testing/selftests/rcutorture/configs/TINY01 delete mode 100644 tools/testing/selftests/rcutorture/configs/TINY02 delete mode 100644 tools/testing/selftests/rcutorture/configs/TREE01 delete mode 100644 tools/testing/selftests/rcutorture/configs/TREE01.boot delete mode 100644 tools/testing/selftests/rcutorture/configs/TREE02 delete mode 100644 tools/testing/selftests/rcutorture/configs/TREE03 delete mode 100644 tools/testing/selftests/rcutorture/configs/TREE04 delete mode 100644 tools/testing/selftests/rcutorture/configs/TREE04.boot delete mode 100644 tools/testing/selftests/rcutorture/configs/TREE05 delete mode 100644 tools/testing/selftests/rcutorture/configs/TREE05.boot delete mode 100644 tools/testing/selftests/rcutorture/configs/TREE06 delete mode 100644 tools/testing/selftests/rcutorture/configs/TREE07 delete mode 100644 tools/testing/selftests/rcutorture/configs/TREE08 delete mode 100644 tools/testing/selftests/rcutorture/configs/TREE08-T delete mode 100644 tools/testing/selftests/rcutorture/configs/TREE09 create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/BUSTED create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/BUSTED.boot create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/CFLIST create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/CFcommon create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-N create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-N.boot create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-P create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-P.boot create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TINY01 create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TINY02 create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE01 create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE01.boot create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE02 create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE03 create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE04 create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE04.boot create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE05 create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE05.boot create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE06 create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE07 create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE08 create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE08-T create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE09 create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/CFLIST create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/N1-S-T-NH-SD-SMP-HP create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/N2-2-t-nh-sd-SMP-hp create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/N3-3-T-nh-SD-SMP-hp create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/N4-A-t-NH-sd-SMP-HP create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/N5-U-T-NH-sd-SMP-hp create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/NT1-nh create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/NT3-NH create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/P1-S-T-NH-SD-SMP-HP create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/P2-2-t-nh-sd-SMP-hp create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/P3-3-T-nh-SD-SMP-hp create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/P4-A-t-NH-sd-SMP-HP create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/P5-U-T-NH-sd-SMP-hp create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/PT1-nh create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/PT2-NH create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/ver_functions.sh create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/CFLIST create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/N1-S-T-NH-SD-SMP-HP create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/N2-2-t-nh-sd-SMP-hp create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/N3-3-T-nh-SD-SMP-hp create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/N4-A-t-NH-sd-SMP-HP create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/N5-U-T-NH-sd-SMP-hp create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/N6---t-nh-SD-smp-hp create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/N7-4-T-NH-SD-SMP-HP create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/N8-2-T-NH-SD-SMP-HP create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/NT1-nh create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/NT3-NH create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P1-S-T-NH-SD-SMP-HP create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P2-2-t-nh-sd-SMP-hp create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P3-3-T-nh-SD-SMP-hp create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P4-A-t-NH-sd-SMP-HP create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P5-U-T-NH-sd-SMP-hp create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P6---t-nh-SD-smp-hp create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-all create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-none create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-hp create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/PT1-nh create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/PT2-NH create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/CFLIST create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/N1-S-T-NH-SD-SMP-HP create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/N2-2-t-nh-sd-SMP-hp create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/N3-3-T-nh-SD-SMP-hp create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/N4-A-t-NH-sd-SMP-HP create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/N5-U-T-NH-sd-SMP-hp create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/NT1-nh create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/NT3-NH create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/P1-S-T-NH-SD-SMP-HP create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/P2-2-t-nh-sd-SMP-hp create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/P3-3-T-nh-SD-SMP-hp create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/P4-A-t-NH-sd-SMP-HP create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/P5-U-T-NH-sd-SMP-hp create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/PT1-nh create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/PT2-NH create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/ver_functions.sh create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/CFLIST create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/N1-S-T-NH-SD-SMP-HP create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/N2-2-t-nh-sd-SMP-hp create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/N3-3-T-nh-SD-SMP-hp create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/N4-A-t-NH-sd-SMP-HP create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/N5-U-T-NH-sd-SMP-hp create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/NT1-nh create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/NT3-NH create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/P1-S-T-NH-SD-SMP-HP create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/P2-2-t-nh-sd-SMP-hp create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/P3-3-T-nh-SD-SMP-hp create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/P4-A-t-NH-sd-SMP-HP create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/P5-U-T-NH-sd-SMP-hp create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/PT1-nh create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/PT2-NH create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/ver_functions.sh create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/ver_functions.sh delete mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/CFLIST delete mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/N1-S-T-NH-SD-SMP-HP delete mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/N2-2-t-nh-sd-SMP-hp delete mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/N3-3-T-nh-SD-SMP-hp delete mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/N4-A-t-NH-sd-SMP-HP delete mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/N5-U-T-NH-sd-SMP-hp delete mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/NT1-nh delete mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/NT3-NH delete mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/P1-S-T-NH-SD-SMP-HP delete mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/P2-2-t-nh-sd-SMP-hp delete mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/P3-3-T-nh-SD-SMP-hp delete mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/P4-A-t-NH-sd-SMP-HP delete mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/P5-U-T-NH-sd-SMP-hp delete mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/PT1-nh delete mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/PT2-NH delete mode 100644 tools/testing/selftests/rcutorture/configs/v0.0/ver_functions.sh delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/CFLIST delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N1-S-T-NH-SD-SMP-HP delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N2-2-t-nh-sd-SMP-hp delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N3-3-T-nh-SD-SMP-hp delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N4-A-t-NH-sd-SMP-HP delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N5-U-T-NH-sd-SMP-hp delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N6---t-nh-SD-smp-hp delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N7-4-T-NH-SD-SMP-HP delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/N8-2-T-NH-SD-SMP-HP delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/NT1-nh delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/NT3-NH delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P1-S-T-NH-SD-SMP-HP delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P2-2-t-nh-sd-SMP-hp delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P3-3-T-nh-SD-SMP-hp delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P4-A-t-NH-sd-SMP-HP delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P5-U-T-NH-sd-SMP-hp delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P6---t-nh-SD-smp-hp delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-all delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-none delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-hp delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/PT1-nh delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.12/PT2-NH delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/CFLIST delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/N1-S-T-NH-SD-SMP-HP delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/N2-2-t-nh-sd-SMP-hp delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/N3-3-T-nh-SD-SMP-hp delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/N4-A-t-NH-sd-SMP-HP delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/N5-U-T-NH-sd-SMP-hp delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/NT1-nh delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/NT3-NH delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/P1-S-T-NH-SD-SMP-HP delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/P2-2-t-nh-sd-SMP-hp delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/P3-3-T-nh-SD-SMP-hp delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/P4-A-t-NH-sd-SMP-HP delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/P5-U-T-NH-sd-SMP-hp delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/PT1-nh delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/PT2-NH delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.3/ver_functions.sh delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/CFLIST delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/N1-S-T-NH-SD-SMP-HP delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/N2-2-t-nh-sd-SMP-hp delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/N3-3-T-nh-SD-SMP-hp delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/N4-A-t-NH-sd-SMP-HP delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/N5-U-T-NH-sd-SMP-hp delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/NT1-nh delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/NT3-NH delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/P1-S-T-NH-SD-SMP-HP delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/P2-2-t-nh-sd-SMP-hp delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/P3-3-T-nh-SD-SMP-hp delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/P4-A-t-NH-sd-SMP-HP delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/P5-U-T-NH-sd-SMP-hp delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/PT1-nh delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/PT2-NH delete mode 100644 tools/testing/selftests/rcutorture/configs/v3.5/ver_functions.sh delete mode 100644 tools/testing/selftests/rcutorture/configs/ver_functions.sh
tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh +1 -1
@@ -199,5 +199,5 @@ then fi cp $builddir/console.log $resdir -parse-rcutorture.sh $resdir/console.log $title +parse-${TORTURE_SUITE}torture.sh $resdir/console.log $title parse-console.sh $resdir/console.log $title
tools/testing/selftests/rcutorture/bin/kvm.sh +14 -3
@@ -41,6 +41,7 @@ PATH=${KVM}/bin:$PATH; export PATH builddir="${KVM}/b1" RCU_INITRD="$KVM/initrd"; export RCU_INITRD RCU_KMAKE_ARG=""; export RCU_KMAKE_ARG +TORTURE_SUITE=rcu resdir="" configs="" cpus=0
@@ -66,8 +67,9 @@ usage () { echo " --no-initrd" echo " --qemu-args qemu-system-..." echo " --qemu-cmd qemu-system-..." - echo " --results absolute-pathname" echo " --relbuilddir relative-pathname" + echo " --results absolute-pathname" + echo " --torture rcu" exit 1 }
@@ -156,6 +158,11 @@ do resdir=$2 shift ;; + --torture) + checkarg --torture "(suite name)" "$#" "$2" '^rcu$' '^--' + TORTURE_SUITE=$2 + shift + ;; *) echo Unknown argument $1 usage
@@ -164,7 +171,7 @@ do shift done -CONFIGFRAG=${KVM}/configs; export CONFIGFRAG +CONFIGFRAG=${KVM}/configs/${TORTURE_SUITE}; export CONFIGFRAG KVPATH=${CONFIGFRAG}/$kversion; export KVPATH if test -z "$configs"
@@ -191,6 +198,7 @@ then touch $resdir/$ds/log echo $scriptname $args >> $resdir/$ds/log + echo ${TORTURE_SUITE} > $resdir/$ds/TORTURE_SUITE pwd > $resdir/$ds/testid.txt if test -d .git
@@ -265,6 +273,9 @@ END { }' # Generate a script to execute the tests in appropriate batches. +cat << ___EOF___ > $T/script +TORTURE_SUITE="$TORTURE_SUITE"; export TORTURE_SUITE +___EOF___ awk < $T/cfgcpu.pack \ -v CONFIGDIR="$CONFIGFRAG/$kversion/" \ -v KVM="$KVM" \
@@ -353,7 +364,7 @@ END { # Dump the last batch. if (ncpus != 0) dump(first, i); -}' > $T/script +}' >> $T/script if test "$dryrun" = script then
tools/testing/selftests/rcutorture/configs/BUSTED deleted +0 -7
@@ -1,7 +0,0 @@ -CONFIG_RCU_TRACE=n -CONFIG_SMP=y -CONFIG_NR_CPUS=4 -CONFIG_HOTPLUG_CPU=y -CONFIG_PREEMPT_NONE=n -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=y
tools/testing/selftests/rcutorture/configs/BUSTED.boot deleted +0 -1
@@ -1 +0,0 @@ -rcutorture.torture_type=rcu_busted
tools/testing/selftests/rcutorture/configs/CFLIST deleted +0 -13
@@ -1,13 +0,0 @@ -TREE01 -TREE02 -TREE03 -TREE04 -TREE05 -TREE06 -TREE07 -TREE08 -TREE09 -SRCU-N -SRCU-P -TINY01 -TINY02
tools/testing/selftests/rcutorture/configs/CFcommon deleted +0 -2
@@ -1,2 +0,0 @@ -CONFIG_RCU_TORTURE_TEST=y -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/SRCU-N deleted +0 -7
@@ -1,7 +0,0 @@ -CONFIG_RCU_TRACE=n -CONFIG_SMP=y -CONFIG_NR_CPUS=4 -CONFIG_HOTPLUG_CPU=y -CONFIG_PREEMPT_NONE=y -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=n
tools/testing/selftests/rcutorture/configs/SRCU-N.boot deleted +0 -1
@@ -1 +0,0 @@ -rcutorture.torture_type=srcu
tools/testing/selftests/rcutorture/configs/SRCU-P deleted +0 -7
@@ -1,7 +0,0 @@ -CONFIG_RCU_TRACE=n -CONFIG_SMP=y -CONFIG_NR_CPUS=8 -CONFIG_HOTPLUG_CPU=y -CONFIG_PREEMPT_NONE=n -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=y
tools/testing/selftests/rcutorture/configs/SRCU-P.boot deleted +0 -1
@@ -1 +0,0 @@ -rcutorture.torture_type=srcu
tools/testing/selftests/rcutorture/configs/TINY01 deleted +0 -12
@@ -1,12 +0,0 @@ -CONFIG_SMP=n -CONFIG_PREEMPT_NONE=y -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=n -#CHECK#CONFIG_TINY_RCU=y -CONFIG_HZ_PERIODIC=n -CONFIG_NO_HZ_IDLE=y -CONFIG_NO_HZ_FULL=n -CONFIG_RCU_TRACE=n -CONFIG_DEBUG_LOCK_ALLOC=n -CONFIG_DEBUG_OBJECTS_RCU_HEAD=n -CONFIG_PREEMPT_COUNT=n
tools/testing/selftests/rcutorture/configs/TINY02 deleted +0 -12
@@ -1,12 +0,0 @@ -CONFIG_SMP=n -CONFIG_PREEMPT_NONE=y -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=n -#CHECK#CONFIG_TINY_RCU=y -CONFIG_HZ_PERIODIC=y -CONFIG_NO_HZ_IDLE=n -CONFIG_NO_HZ_FULL=n -CONFIG_RCU_TRACE=y -CONFIG_DEBUG_LOCK_ALLOC=y -CONFIG_DEBUG_OBJECTS_RCU_HEAD=n -CONFIG_PREEMPT_COUNT=y
tools/testing/selftests/rcutorture/configs/TREE01 deleted +0 -22
@@ -1,22 +0,0 @@ -CONFIG_SMP=y -CONFIG_NR_CPUS=8 -CONFIG_PREEMPT_NONE=n -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=y -#CHECK#CONFIG_TREE_PREEMPT_RCU=y -CONFIG_HZ_PERIODIC=n -CONFIG_NO_HZ_IDLE=y -CONFIG_NO_HZ_FULL=n -CONFIG_RCU_FAST_NO_HZ=y -CONFIG_RCU_TRACE=y -CONFIG_HOTPLUG_CPU=y -CONFIG_RCU_FANOUT=8 -CONFIG_RCU_FANOUT_EXACT=n -CONFIG_RCU_NOCB_CPU=y -CONFIG_RCU_NOCB_CPU_ZERO=y -CONFIG_DEBUG_LOCK_ALLOC=n -CONFIG_PROVE_RCU_DELAY=n -CONFIG_RCU_CPU_STALL_INFO=n -CONFIG_RCU_CPU_STALL_VERBOSE=n -CONFIG_RCU_BOOST=n -CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
tools/testing/selftests/rcutorture/configs/TREE01.boot deleted +0 -1
@@ -1 +0,0 @@ -rcutorture.torture_type=rcu_bh
tools/testing/selftests/rcutorture/configs/TREE02 deleted +0 -25
@@ -1,25 +0,0 @@ -CONFIG_SMP=y -CONFIG_NR_CPUS=8 -CONFIG_PREEMPT_NONE=n -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=y -#CHECK#CONFIG_TREE_PREEMPT_RCU=y -CONFIG_HZ_PERIODIC=n -CONFIG_NO_HZ_IDLE=y -CONFIG_NO_HZ_FULL=n -CONFIG_RCU_FAST_NO_HZ=n -CONFIG_RCU_TRACE=n -CONFIG_HOTPLUG_CPU=n -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -CONFIG_RCU_FANOUT=3 -CONFIG_RCU_FANOUT_LEAF=3 -CONFIG_RCU_FANOUT_EXACT=n -CONFIG_RCU_NOCB_CPU=n -CONFIG_DEBUG_LOCK_ALLOC=y -CONFIG_PROVE_LOCKING=n -CONFIG_PROVE_RCU_DELAY=n -CONFIG_RCU_CPU_STALL_INFO=n -CONFIG_RCU_CPU_STALL_VERBOSE=y -CONFIG_RCU_BOOST=n -CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
tools/testing/selftests/rcutorture/configs/TREE03 deleted +0 -22
@@ -1,22 +0,0 @@ -CONFIG_SMP=y -CONFIG_NR_CPUS=8 -CONFIG_PREEMPT_NONE=n -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=y -#CHECK#CONFIG_TREE_PREEMPT_RCU=y -CONFIG_HZ_PERIODIC=y -CONFIG_NO_HZ_IDLE=n -CONFIG_NO_HZ_FULL=n -CONFIG_RCU_TRACE=y -CONFIG_HOTPLUG_CPU=y -CONFIG_RCU_FANOUT=4 -CONFIG_RCU_FANOUT_LEAF=4 -CONFIG_RCU_FANOUT_EXACT=n -CONFIG_RCU_NOCB_CPU=n -CONFIG_DEBUG_LOCK_ALLOC=n -CONFIG_PROVE_RCU_DELAY=n -CONFIG_RCU_CPU_STALL_INFO=n -CONFIG_RCU_CPU_STALL_VERBOSE=n -CONFIG_RCU_BOOST=y -CONFIG_RCU_BOOST_PRIO=2 -CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
tools/testing/selftests/rcutorture/configs/TREE04 deleted +0 -24
@@ -1,24 +0,0 @@ -CONFIG_SMP=y -CONFIG_NR_CPUS=8 -CONFIG_PREEMPT_NONE=y -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=n -#CHECK#CONFIG_TREE_RCU=y -CONFIG_HZ_PERIODIC=n -CONFIG_NO_HZ_IDLE=n -CONFIG_NO_HZ_FULL=y -CONFIG_NO_HZ_FULL_ALL=y -CONFIG_RCU_FAST_NO_HZ=y -CONFIG_RCU_TRACE=y -CONFIG_HOTPLUG_CPU=n -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -CONFIG_RCU_FANOUT=2 -CONFIG_RCU_FANOUT_LEAF=2 -CONFIG_RCU_FANOUT_EXACT=n -CONFIG_RCU_NOCB_CPU=n -CONFIG_DEBUG_LOCK_ALLOC=n -CONFIG_PROVE_RCU_DELAY=n -CONFIG_RCU_CPU_STALL_INFO=y -CONFIG_RCU_CPU_STALL_VERBOSE=y -CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
tools/testing/selftests/rcutorture/configs/TREE04.boot deleted +0 -1
@@ -1 +0,0 @@ -rcutorture.torture_type=rcu_bh
tools/testing/selftests/rcutorture/configs/TREE05 deleted +0 -24
@@ -1,24 +0,0 @@ -CONFIG_SMP=y -CONFIG_NR_CPUS=8 -CONFIG_PREEMPT_NONE=y -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=n -#CHECK#CONFIG_TREE_RCU=y -CONFIG_HZ_PERIODIC=n -CONFIG_NO_HZ_IDLE=y -CONFIG_NO_HZ_FULL=n -CONFIG_RCU_FAST_NO_HZ=n -CONFIG_RCU_TRACE=n -CONFIG_HOTPLUG_CPU=y -CONFIG_RCU_FANOUT=6 -CONFIG_RCU_FANOUT_LEAF=6 -CONFIG_RCU_FANOUT_EXACT=n -CONFIG_RCU_NOCB_CPU=y -CONFIG_RCU_NOCB_CPU_NONE=y -CONFIG_DEBUG_LOCK_ALLOC=y -CONFIG_PROVE_LOCKING=y -CONFIG_PROVE_RCU=y -CONFIG_PROVE_RCU_DELAY=y -CONFIG_RCU_CPU_STALL_INFO=n -CONFIG_RCU_CPU_STALL_VERBOSE=n -CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
tools/testing/selftests/rcutorture/configs/TREE05.boot deleted +0 -1
@@ -1 +0,0 @@ -rcutorture.torture_type=sched
tools/testing/selftests/rcutorture/configs/TREE06 deleted +0 -25
@@ -1,25 +0,0 @@ -CONFIG_SMP=y -CONFIG_NR_CPUS=8 -CONFIG_PREEMPT_NONE=y -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=n -#CHECK#CONFIG_TREE_RCU=y -CONFIG_HZ_PERIODIC=n -CONFIG_NO_HZ_IDLE=y -CONFIG_NO_HZ_FULL=n -CONFIG_RCU_FAST_NO_HZ=n -CONFIG_RCU_TRACE=n -CONFIG_HOTPLUG_CPU=n -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -CONFIG_RCU_FANOUT=6 -CONFIG_RCU_FANOUT_LEAF=6 -CONFIG_RCU_FANOUT_EXACT=y -CONFIG_RCU_NOCB_CPU=n -CONFIG_DEBUG_LOCK_ALLOC=y -CONFIG_PROVE_LOCKING=y -CONFIG_PROVE_RCU=y -CONFIG_PROVE_RCU_DELAY=n -CONFIG_RCU_CPU_STALL_INFO=n -CONFIG_RCU_CPU_STALL_VERBOSE=n -CONFIG_DEBUG_OBJECTS_RCU_HEAD=y
tools/testing/selftests/rcutorture/configs/TREE07 deleted +0 -23
@@ -1,23 +0,0 @@ -CONFIG_SMP=y -CONFIG_NR_CPUS=16 -CONFIG_PREEMPT_NONE=y -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=n -#CHECK#CONFIG_TREE_RCU=y -CONFIG_HZ_PERIODIC=n -CONFIG_NO_HZ_IDLE=n -CONFIG_NO_HZ_FULL=y -CONFIG_NO_HZ_FULL_ALL=y -CONFIG_NO_HZ_FULL_SYSIDLE=y -CONFIG_RCU_FAST_NO_HZ=n -CONFIG_RCU_TRACE=y -CONFIG_HOTPLUG_CPU=y -CONFIG_RCU_FANOUT=2 -CONFIG_RCU_FANOUT_LEAF=2 -CONFIG_RCU_FANOUT_EXACT=n -CONFIG_RCU_NOCB_CPU=n -CONFIG_DEBUG_LOCK_ALLOC=n -CONFIG_PROVE_RCU_DELAY=n -CONFIG_RCU_CPU_STALL_INFO=y -CONFIG_RCU_CPU_STALL_VERBOSE=n -CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
tools/testing/selftests/rcutorture/configs/TREE08 deleted +0 -25
@@ -1,25 +0,0 @@ -CONFIG_SMP=y -CONFIG_NR_CPUS=16 -CONFIG_PREEMPT_NONE=n -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=y -#CHECK#CONFIG_TREE_PREEMPT_RCU=y -CONFIG_HZ_PERIODIC=n -CONFIG_NO_HZ_IDLE=y -CONFIG_NO_HZ_FULL=n -CONFIG_RCU_FAST_NO_HZ=n -CONFIG_RCU_TRACE=n -CONFIG_HOTPLUG_CPU=n -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -CONFIG_RCU_FANOUT=3 -CONFIG_RCU_FANOUT_EXACT=y -CONFIG_RCU_FANOUT_LEAF=2 -CONFIG_RCU_NOCB_CPU=y -CONFIG_RCU_NOCB_CPU_ALL=y -CONFIG_DEBUG_LOCK_ALLOC=n -CONFIG_PROVE_RCU_DELAY=n -CONFIG_RCU_CPU_STALL_INFO=n -CONFIG_RCU_CPU_STALL_VERBOSE=n -CONFIG_RCU_BOOST=n -CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
tools/testing/selftests/rcutorture/configs/TREE08-T deleted +0 -25
@@ -1,25 +0,0 @@ -CONFIG_SMP=y -CONFIG_NR_CPUS=16 -CONFIG_PREEMPT_NONE=n -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=y -#CHECK#CONFIG_TREE_PREEMPT_RCU=y -CONFIG_HZ_PERIODIC=n -CONFIG_NO_HZ_IDLE=y -CONFIG_NO_HZ_FULL=n -CONFIG_RCU_FAST_NO_HZ=n -CONFIG_RCU_TRACE=y -CONFIG_HOTPLUG_CPU=n -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -CONFIG_RCU_FANOUT=3 -CONFIG_RCU_FANOUT_EXACT=y -CONFIG_RCU_FANOUT_LEAF=2 -CONFIG_RCU_NOCB_CPU=y -CONFIG_RCU_NOCB_CPU_ALL=y -CONFIG_DEBUG_LOCK_ALLOC=n -CONFIG_PROVE_RCU_DELAY=n -CONFIG_RCU_CPU_STALL_INFO=n -CONFIG_RCU_CPU_STALL_VERBOSE=n -CONFIG_RCU_BOOST=n -CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
tools/testing/selftests/rcutorture/configs/TREE09 deleted +0 -20
@@ -1,20 +0,0 @@ -CONFIG_SMP=n -CONFIG_NR_CPUS=1 -CONFIG_PREEMPT_NONE=n -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=y -#CHECK#CONFIG_TREE_PREEMPT_RCU=y -CONFIG_HZ_PERIODIC=n -CONFIG_NO_HZ_IDLE=y -CONFIG_NO_HZ_FULL=n -CONFIG_RCU_TRACE=n -CONFIG_HOTPLUG_CPU=n -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -CONFIG_RCU_NOCB_CPU=n -CONFIG_DEBUG_LOCK_ALLOC=n -CONFIG_PROVE_RCU_DELAY=n -CONFIG_RCU_CPU_STALL_INFO=n -CONFIG_RCU_CPU_STALL_VERBOSE=n -CONFIG_RCU_BOOST=n -CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
tools/testing/selftests/rcutorture/configs/rcu/BUSTED new file +7 -0
@@ -0,0 +1,7 @@ +CONFIG_RCU_TRACE=n +CONFIG_SMP=y +CONFIG_NR_CPUS=4 +CONFIG_HOTPLUG_CPU=y +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y
tools/testing/selftests/rcutorture/configs/rcu/BUSTED.boot new file +1 -0
@@ -0,0 +1 @@ +rcutorture.torture_type=rcu_busted
tools/testing/selftests/rcutorture/configs/rcu/CFLIST new file +13 -0
@@ -0,0 +1,13 @@ +TREE01 +TREE02 +TREE03 +TREE04 +TREE05 +TREE06 +TREE07 +TREE08 +TREE09 +SRCU-N +SRCU-P +TINY01 +TINY02
tools/testing/selftests/rcutorture/configs/rcu/CFcommon new file +2 -0
@@ -0,0 +1,2 @@ +CONFIG_RCU_TORTURE_TEST=y +CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/rcu/SRCU-N new file +7 -0
@@ -0,0 +1,7 @@ +CONFIG_RCU_TRACE=n +CONFIG_SMP=y +CONFIG_NR_CPUS=4 +CONFIG_HOTPLUG_CPU=y +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n
tools/testing/selftests/rcutorture/configs/rcu/SRCU-N.boot new file +1 -0
@@ -0,0 +1 @@ +rcutorture.torture_type=srcu
tools/testing/selftests/rcutorture/configs/rcu/SRCU-P new file +7 -0
@@ -0,0 +1,7 @@ +CONFIG_RCU_TRACE=n +CONFIG_SMP=y +CONFIG_NR_CPUS=8 +CONFIG_HOTPLUG_CPU=y +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y
tools/testing/selftests/rcutorture/configs/rcu/SRCU-P.boot new file +1 -0
@@ -0,0 +1 @@ +rcutorture.torture_type=srcu
tools/testing/selftests/rcutorture/configs/rcu/TINY01 new file +12 -0
@@ -0,0 +1,12 @@ +CONFIG_SMP=n +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TINY_RCU=y +CONFIG_HZ_PERIODIC=n +CONFIG_NO_HZ_IDLE=y +CONFIG_NO_HZ_FULL=n +CONFIG_RCU_TRACE=n +CONFIG_DEBUG_LOCK_ALLOC=n +CONFIG_DEBUG_OBJECTS_RCU_HEAD=n +CONFIG_PREEMPT_COUNT=n
tools/testing/selftests/rcutorture/configs/rcu/TINY02 new file +12 -0
@@ -0,0 +1,12 @@ +CONFIG_SMP=n +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TINY_RCU=y +CONFIG_HZ_PERIODIC=y +CONFIG_NO_HZ_IDLE=n +CONFIG_NO_HZ_FULL=n +CONFIG_RCU_TRACE=y +CONFIG_DEBUG_LOCK_ALLOC=y +CONFIG_DEBUG_OBJECTS_RCU_HEAD=n +CONFIG_PREEMPT_COUNT=y
tools/testing/selftests/rcutorture/configs/rcu/TREE01 new file +22 -0
@@ -0,0 +1,22 @@ +CONFIG_SMP=y +CONFIG_NR_CPUS=8 +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_HZ_PERIODIC=n +CONFIG_NO_HZ_IDLE=y +CONFIG_NO_HZ_FULL=n +CONFIG_RCU_FAST_NO_HZ=y +CONFIG_RCU_TRACE=y +CONFIG_HOTPLUG_CPU=y +CONFIG_RCU_FANOUT=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_RCU_NOCB_CPU=y +CONFIG_RCU_NOCB_CPU_ZERO=y +CONFIG_DEBUG_LOCK_ALLOC=n +CONFIG_PROVE_RCU_DELAY=n +CONFIG_RCU_CPU_STALL_INFO=n +CONFIG_RCU_CPU_STALL_VERBOSE=n +CONFIG_RCU_BOOST=n +CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
tools/testing/selftests/rcutorture/configs/rcu/TREE01.boot new file +1 -0
@@ -0,0 +1 @@ +rcutorture.torture_type=rcu_bh
tools/testing/selftests/rcutorture/configs/rcu/TREE02 new file +25 -0
@@ -0,0 +1,25 @@ +CONFIG_SMP=y +CONFIG_NR_CPUS=8 +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_HZ_PERIODIC=n +CONFIG_NO_HZ_IDLE=y +CONFIG_NO_HZ_FULL=n +CONFIG_RCU_FAST_NO_HZ=n +CONFIG_RCU_TRACE=n +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_RCU_FANOUT=3 +CONFIG_RCU_FANOUT_LEAF=3 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_RCU_NOCB_CPU=n +CONFIG_DEBUG_LOCK_ALLOC=y +CONFIG_PROVE_LOCKING=n +CONFIG_PROVE_RCU_DELAY=n +CONFIG_RCU_CPU_STALL_INFO=n +CONFIG_RCU_CPU_STALL_VERBOSE=y +CONFIG_RCU_BOOST=n +CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
tools/testing/selftests/rcutorture/configs/rcu/TREE03 new file +22 -0
@@ -0,0 +1,22 @@ +CONFIG_SMP=y +CONFIG_NR_CPUS=8 +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_HZ_PERIODIC=y +CONFIG_NO_HZ_IDLE=n +CONFIG_NO_HZ_FULL=n +CONFIG_RCU_TRACE=y +CONFIG_HOTPLUG_CPU=y +CONFIG_RCU_FANOUT=4 +CONFIG_RCU_FANOUT_LEAF=4 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_RCU_NOCB_CPU=n +CONFIG_DEBUG_LOCK_ALLOC=n +CONFIG_PROVE_RCU_DELAY=n +CONFIG_RCU_CPU_STALL_INFO=n +CONFIG_RCU_CPU_STALL_VERBOSE=n +CONFIG_RCU_BOOST=y +CONFIG_RCU_BOOST_PRIO=2 +CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
tools/testing/selftests/rcutorture/configs/rcu/TREE04 new file +24 -0
@@ -0,0 +1,24 @@ +CONFIG_SMP=y +CONFIG_NR_CPUS=8 +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TREE_RCU=y +CONFIG_HZ_PERIODIC=n +CONFIG_NO_HZ_IDLE=n +CONFIG_NO_HZ_FULL=y +CONFIG_NO_HZ_FULL_ALL=y +CONFIG_RCU_FAST_NO_HZ=y +CONFIG_RCU_TRACE=y +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_RCU_FANOUT=2 +CONFIG_RCU_FANOUT_LEAF=2 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_RCU_NOCB_CPU=n +CONFIG_DEBUG_LOCK_ALLOC=n +CONFIG_PROVE_RCU_DELAY=n +CONFIG_RCU_CPU_STALL_INFO=y +CONFIG_RCU_CPU_STALL_VERBOSE=y +CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
tools/testing/selftests/rcutorture/configs/rcu/TREE04.boot new file +1 -0
@@ -0,0 +1 @@ +rcutorture.torture_type=rcu_bh
tools/testing/selftests/rcutorture/configs/rcu/TREE05 new file +24 -0
@@ -0,0 +1,24 @@ +CONFIG_SMP=y +CONFIG_NR_CPUS=8 +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TREE_RCU=y +CONFIG_HZ_PERIODIC=n +CONFIG_NO_HZ_IDLE=y +CONFIG_NO_HZ_FULL=n +CONFIG_RCU_FAST_NO_HZ=n +CONFIG_RCU_TRACE=n +CONFIG_HOTPLUG_CPU=y +CONFIG_RCU_FANOUT=6 +CONFIG_RCU_FANOUT_LEAF=6 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_RCU_NOCB_CPU=y +CONFIG_RCU_NOCB_CPU_NONE=y +CONFIG_DEBUG_LOCK_ALLOC=y +CONFIG_PROVE_LOCKING=y +CONFIG_PROVE_RCU=y +CONFIG_PROVE_RCU_DELAY=y +CONFIG_RCU_CPU_STALL_INFO=n +CONFIG_RCU_CPU_STALL_VERBOSE=n +CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
tools/testing/selftests/rcutorture/configs/rcu/TREE05.boot new file +1 -0
@@ -0,0 +1 @@ +rcutorture.torture_type=sched
tools/testing/selftests/rcutorture/configs/rcu/TREE06 new file +25 -0
@@ -0,0 +1,25 @@ +CONFIG_SMP=y +CONFIG_NR_CPUS=8 +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TREE_RCU=y +CONFIG_HZ_PERIODIC=n +CONFIG_NO_HZ_IDLE=y +CONFIG_NO_HZ_FULL=n +CONFIG_RCU_FAST_NO_HZ=n +CONFIG_RCU_TRACE=n +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_RCU_FANOUT=6 +CONFIG_RCU_FANOUT_LEAF=6 +CONFIG_RCU_FANOUT_EXACT=y +CONFIG_RCU_NOCB_CPU=n +CONFIG_DEBUG_LOCK_ALLOC=y +CONFIG_PROVE_LOCKING=y +CONFIG_PROVE_RCU=y +CONFIG_PROVE_RCU_DELAY=n +CONFIG_RCU_CPU_STALL_INFO=n +CONFIG_RCU_CPU_STALL_VERBOSE=n +CONFIG_DEBUG_OBJECTS_RCU_HEAD=y
tools/testing/selftests/rcutorture/configs/rcu/TREE07 new file +23 -0
@@ -0,0 +1,23 @@ +CONFIG_SMP=y +CONFIG_NR_CPUS=16 +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TREE_RCU=y +CONFIG_HZ_PERIODIC=n +CONFIG_NO_HZ_IDLE=n +CONFIG_NO_HZ_FULL=y +CONFIG_NO_HZ_FULL_ALL=y +CONFIG_NO_HZ_FULL_SYSIDLE=y +CONFIG_RCU_FAST_NO_HZ=n +CONFIG_RCU_TRACE=y +CONFIG_HOTPLUG_CPU=y +CONFIG_RCU_FANOUT=2 +CONFIG_RCU_FANOUT_LEAF=2 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_RCU_NOCB_CPU=n +CONFIG_DEBUG_LOCK_ALLOC=n +CONFIG_PROVE_RCU_DELAY=n +CONFIG_RCU_CPU_STALL_INFO=y +CONFIG_RCU_CPU_STALL_VERBOSE=n +CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
tools/testing/selftests/rcutorture/configs/rcu/TREE08 new file +25 -0
@@ -0,0 +1,25 @@ +CONFIG_SMP=y +CONFIG_NR_CPUS=16 +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_HZ_PERIODIC=n +CONFIG_NO_HZ_IDLE=y +CONFIG_NO_HZ_FULL=n +CONFIG_RCU_FAST_NO_HZ=n +CONFIG_RCU_TRACE=n +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_RCU_FANOUT=3 +CONFIG_RCU_FANOUT_EXACT=y +CONFIG_RCU_FANOUT_LEAF=2 +CONFIG_RCU_NOCB_CPU=y +CONFIG_RCU_NOCB_CPU_ALL=y +CONFIG_DEBUG_LOCK_ALLOC=n +CONFIG_PROVE_RCU_DELAY=n +CONFIG_RCU_CPU_STALL_INFO=n +CONFIG_RCU_CPU_STALL_VERBOSE=n +CONFIG_RCU_BOOST=n +CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
tools/testing/selftests/rcutorture/configs/rcu/TREE08-T new file +25 -0
@@ -0,0 +1,25 @@ +CONFIG_SMP=y +CONFIG_NR_CPUS=16 +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_HZ_PERIODIC=n +CONFIG_NO_HZ_IDLE=y +CONFIG_NO_HZ_FULL=n +CONFIG_RCU_FAST_NO_HZ=n +CONFIG_RCU_TRACE=y +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_RCU_FANOUT=3 +CONFIG_RCU_FANOUT_EXACT=y +CONFIG_RCU_FANOUT_LEAF=2 +CONFIG_RCU_NOCB_CPU=y +CONFIG_RCU_NOCB_CPU_ALL=y +CONFIG_DEBUG_LOCK_ALLOC=n +CONFIG_PROVE_RCU_DELAY=n +CONFIG_RCU_CPU_STALL_INFO=n +CONFIG_RCU_CPU_STALL_VERBOSE=n +CONFIG_RCU_BOOST=n +CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
tools/testing/selftests/rcutorture/configs/rcu/TREE09 new file +20 -0
@@ -0,0 +1,20 @@ +CONFIG_SMP=n +CONFIG_NR_CPUS=1 +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_HZ_PERIODIC=n +CONFIG_NO_HZ_IDLE=y +CONFIG_NO_HZ_FULL=n +CONFIG_RCU_TRACE=n +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_RCU_NOCB_CPU=n +CONFIG_DEBUG_LOCK_ALLOC=n +CONFIG_PROVE_RCU_DELAY=n +CONFIG_RCU_CPU_STALL_INFO=n +CONFIG_RCU_CPU_STALL_VERBOSE=n +CONFIG_RCU_BOOST=n +CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
tools/testing/selftests/rcutorture/configs/rcu/v0.0/CFLIST new file +14 -0
@@ -0,0 +1,14 @@ +P1-S-T-NH-SD-SMP-HP +P2-2-t-nh-sd-SMP-hp +P3-3-T-nh-SD-SMP-hp +P4-A-t-NH-sd-SMP-HP +P5-U-T-NH-sd-SMP-hp +N1-S-T-NH-SD-SMP-HP +N2-2-t-nh-sd-SMP-hp +N3-3-T-nh-SD-SMP-hp +N4-A-t-NH-sd-SMP-HP +N5-U-T-NH-sd-SMP-hp +PT1-nh +PT2-NH +NT1-nh +NT3-NH
tools/testing/selftests/rcutorture/configs/rcu/v0.0/N1-S-T-NH-SD-SMP-HP new file +18 -0
@@ -0,0 +1,18 @@ +CONFIG_RCU_TRACE=y +CONFIG_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=8 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=y +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TREE_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v0.0/N2-2-t-nh-sd-SMP-hp new file +20 -0
@@ -0,0 +1,20 @@ +CONFIG_RCU_TRACE=n +CONFIG_NO_HZ=n +CONFIG_SMP=y +CONFIG_RCU_FANOUT=4 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TREE_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v0.0/N3-3-T-nh-SD-SMP-hp new file +22 -0
@@ -0,0 +1,22 @@ +CONFIG_RCU_TRACE=y +CONFIG_NO_HZ=n +CONFIG_SMP=y +CONFIG_RCU_FANOUT=2 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TREE_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_PROVE_LOCKING=y +CONFIG_PROVE_RCU=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v0.0/N4-A-t-NH-sd-SMP-HP new file +18 -0
@@ -0,0 +1,18 @@ +CONFIG_RCU_TRACE=n +CONFIG_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=6 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=y +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TREE_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v0.0/N5-U-T-NH-sd-SMP-hp new file +22 -0
@@ -0,0 +1,22 @@ +CONFIG_RCU_TRACE=y +CONFIG_DEBUG_KERNEL=y +CONFIG_RCU_CPU_STALL_INFO=y +CONFIG_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=6 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=y +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TREE_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v0.0/NT1-nh new file +23 -0
@@ -0,0 +1,23 @@ +#CHECK#CONFIG_TINY_RCU=y +CONFIG_RCU_TRACE=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +# +CONFIG_SMP=n +# +CONFIG_HOTPLUG_CPU=n +# +CONFIG_NO_HZ=n +# +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +CONFIG_PROVE_LOCKING=y +CONFIG_PROVE_RCU=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v0.0/NT3-NH new file +20 -0
@@ -0,0 +1,20 @@ +#CHECK#CONFIG_TINY_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +# +CONFIG_SMP=n +# +CONFIG_HOTPLUG_CPU=n +# +CONFIG_NO_HZ=y +# +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v0.0/P1-S-T-NH-SD-SMP-HP new file +19 -0
@@ -0,0 +1,19 @@ +CONFIG_RCU_TRACE=y +CONFIG_RCU_CPU_STALL_INFO=y +CONFIG_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=8 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=y +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v0.0/P2-2-t-nh-sd-SMP-hp new file +20 -0
@@ -0,0 +1,20 @@ +CONFIG_RCU_TRACE=n +CONFIG_NO_HZ=n +CONFIG_SMP=y +CONFIG_RCU_FANOUT=4 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v0.0/P3-3-T-nh-SD-SMP-hp new file +20 -0
@@ -0,0 +1,20 @@ +CONFIG_RCU_TRACE=y +CONFIG_NO_HZ=n +CONFIG_SMP=y +CONFIG_RCU_FANOUT=2 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v0.0/P4-A-t-NH-sd-SMP-HP new file +22 -0
@@ -0,0 +1,22 @@ +CONFIG_RCU_TRACE=n +CONFIG_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=6 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=y +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_RT_MUTEXES=y +CONFIG_RCU_BOOST=y +CONFIG_RCU_BOOST_PRIO=2 +CONFIG_PROVE_LOCKING=y +CONFIG_PROVE_RCU=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v0.0/P5-U-T-NH-sd-SMP-hp new file +28 -0
@@ -0,0 +1,28 @@ +CONFIG_RCU_TRACE=y +CONFIG_RCU_CPU_STALL_INFO=y +CONFIG_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=6 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=y +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_DEBUG_KERNEL=y +CONFIG_PROVE_RCU_DELAY=y +CONFIG_DEBUG_OBJECTS=y +CONFIG_DEBUG_OBJECTS_RCU_HEAD=y +CONFIG_RT_MUTEXES=y +CONFIG_RCU_BOOST=y +CONFIG_RCU_BOOST_PRIO=2 +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v0.0/PT1-nh new file +23 -0
@@ -0,0 +1,23 @@ +CONFIG_TINY_PREEMPT_RCU=y +CONFIG_RCU_BOOST=y +CONFIG_RCU_BOOST_PRIO=2 +CONFIG_RCU_TRACE=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +# +CONFIG_SMP=n +# +CONFIG_HOTPLUG_CPU=n +# +CONFIG_NO_HZ=n +# +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v0.0/PT2-NH new file +22 -0
@@ -0,0 +1,22 @@ +CONFIG_TINY_PREEMPT_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +# +CONFIG_SMP=n +# +CONFIG_HOTPLUG_CPU=n +# +CONFIG_NO_HZ=y +# +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +CONFIG_PROVE_LOCKING=y +CONFIG_PROVE_RCU=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v0.0/ver_functions.sh new file +33 -0
@@ -0,0 +1,33 @@ +#!/bin/bash +# +# Kernel-version-dependent shell functions for the rest of the scripts. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, you can access it online at +# http://www.gnu.org/licenses/gpl-2.0.html. +# +# Copyright (C) IBM Corporation, 2013 +# +# Authors: Paul E. McKenney <[email protected]> + +# per_version_boot_params bootparam-string config-file seconds +# +# Adds per-version torture-module parameters to kernels supporting them. +# Which old kernels do not. +per_version_boot_params () { + echo rcutorture.stat_interval=15 \ + rcutorture.shutdown_secs=$3 \ + rcutorture.rcutorture_runnable=1 \ + rcutorture.test_no_idle_hz=1 \ + rcutorture.verbose=1 +}
tools/testing/selftests/rcutorture/configs/rcu/v3.12/CFLIST new file +17 -0
@@ -0,0 +1,17 @@ +sysidleY.2013.06.19a +sysidleN.2013.06.19a +P1-S-T-NH-SD-SMP-HP +P2-2-t-nh-sd-SMP-hp +P3-3-T-nh-SD-SMP-hp +P4-A-t-NH-sd-SMP-HP +P5-U-T-NH-sd-SMP-hp +P6---t-nh-SD-smp-hp +N1-S-T-NH-SD-SMP-HP +N2-2-t-nh-sd-SMP-hp +N3-3-T-nh-SD-SMP-hp +N4-A-t-NH-sd-SMP-HP +N5-U-T-NH-sd-SMP-hp +PT1-nh +PT2-NH +NT1-nh +NT3-NH
tools/testing/selftests/rcutorture/configs/rcu/v3.12/N1-S-T-NH-SD-SMP-HP new file +19 -0
@@ -0,0 +1,19 @@ +CONFIG_RCU_TRACE=y +CONFIG_RCU_FAST_NO_HZ=y +CONFIG_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=8 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=y +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TREE_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.12/N2-2-t-nh-sd-SMP-hp new file +20 -0
@@ -0,0 +1,20 @@ +CONFIG_RCU_TRACE=n +CONFIG_NO_HZ=n +CONFIG_SMP=y +CONFIG_RCU_FANOUT=4 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TREE_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.12/N3-3-T-nh-SD-SMP-hp new file +22 -0
@@ -0,0 +1,22 @@ +CONFIG_RCU_TRACE=y +CONFIG_NO_HZ=n +CONFIG_SMP=y +CONFIG_RCU_FANOUT=2 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TREE_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_PROVE_LOCKING=y +CONFIG_PROVE_RCU=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.12/N4-A-t-NH-sd-SMP-HP new file +18 -0
@@ -0,0 +1,18 @@ +CONFIG_RCU_TRACE=n +CONFIG_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=6 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=y +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TREE_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.12/N5-U-T-NH-sd-SMP-hp new file +22 -0
@@ -0,0 +1,22 @@ +CONFIG_RCU_TRACE=y +CONFIG_DEBUG_KERNEL=y +CONFIG_RCU_CPU_STALL_INFO=y +CONFIG_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=6 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=y +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TREE_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.12/N6---t-nh-SD-smp-hp new file +19 -0
@@ -0,0 +1,19 @@ +CONFIG_RCU_TRACE=n +CONFIG_NO_HZ=n +CONFIG_SMP=y +CONFIG_NR_CPUS=1 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TREE_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.12/N7-4-T-NH-SD-SMP-HP new file +26 -0
@@ -0,0 +1,26 @@ +CONFIG_RCU_TRACE=y +CONFIG_DEBUG_KERNEL=y +CONFIG_RCU_CPU_STALL_INFO=y +CONFIG_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=2 +CONFIG_NR_CPUS=16 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=y +CONFIG_RCU_NOCB_CPU=y +CONFIG_RCU_NOCB_CPU_NONE=y +CONFIG_RCU_NOCB_CPU_ZERO=n +CONFIG_RCU_NOCB_CPU_ALL=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TREE_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.12/N8-2-T-NH-SD-SMP-HP new file +22 -0
@@ -0,0 +1,22 @@ +CONFIG_RCU_TRACE=y +CONFIG_DEBUG_KERNEL=y +CONFIG_RCU_CPU_STALL_INFO=y +CONFIG_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=14 +CONFIG_NR_CPUS=16 +CONFIG_RCU_FANOUT_EXACT=y +CONFIG_HOTPLUG_CPU=y +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TREE_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.12/NT1-nh new file +23 -0
@@ -0,0 +1,23 @@ +#CHECK#CONFIG_TINY_RCU=y +CONFIG_RCU_TRACE=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +# +CONFIG_SMP=n +# +CONFIG_HOTPLUG_CPU=n +# +CONFIG_NO_HZ=n +# +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +CONFIG_PROVE_LOCKING=y +CONFIG_PROVE_RCU=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.12/NT3-NH new file +20 -0
@@ -0,0 +1,20 @@ +#CHECK#CONFIG_TINY_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +# +CONFIG_SMP=n +# +CONFIG_HOTPLUG_CPU=n +# +CONFIG_NO_HZ=y +# +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.12/P1-S-T-NH-SD-SMP-HP new file +20 -0
@@ -0,0 +1,20 @@ +CONFIG_RCU_TRACE=y +CONFIG_RCU_CPU_STALL_INFO=y +CONFIG_NO_HZ=y +CONFIG_RCU_FAST_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=8 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=y +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.12/P2-2-t-nh-sd-SMP-hp new file +20 -0
@@ -0,0 +1,20 @@ +CONFIG_RCU_TRACE=n +CONFIG_NO_HZ=n +CONFIG_SMP=y +CONFIG_RCU_FANOUT=4 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.12/P3-3-T-nh-SD-SMP-hp new file +20 -0
@@ -0,0 +1,20 @@ +CONFIG_RCU_TRACE=y +CONFIG_NO_HZ=n +CONFIG_SMP=y +CONFIG_RCU_FANOUT=2 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.12/P4-A-t-NH-sd-SMP-HP new file +22 -0
@@ -0,0 +1,22 @@ +CONFIG_RCU_TRACE=n +CONFIG_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=6 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=y +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_RT_MUTEXES=y +CONFIG_RCU_BOOST=y +CONFIG_RCU_BOOST_PRIO=2 +CONFIG_PROVE_LOCKING=y +CONFIG_PROVE_RCU=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.12/P5-U-T-NH-sd-SMP-hp new file +28 -0
@@ -0,0 +1,28 @@ +CONFIG_RCU_TRACE=y +CONFIG_RCU_CPU_STALL_INFO=y +CONFIG_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=6 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=y +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_DEBUG_KERNEL=y +CONFIG_PROVE_RCU_DELAY=y +CONFIG_DEBUG_OBJECTS=y +CONFIG_DEBUG_OBJECTS_RCU_HEAD=y +CONFIG_RT_MUTEXES=y +CONFIG_RCU_BOOST=y +CONFIG_RCU_BOOST_PRIO=2 +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.12/P6---t-nh-SD-smp-hp new file +18 -0
@@ -0,0 +1,18 @@ +CONFIG_RCU_TRACE=n +CONFIG_NO_HZ=n +CONFIG_SMP=n +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +CONFIG_TREE_PREEMPT_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP new file +30 -0
@@ -0,0 +1,30 @@ +CONFIG_RCU_TRACE=y +CONFIG_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=2 +CONFIG_NR_CPUS=16 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=y +CONFIG_RCU_NOCB_CPU=y +CONFIG_RCU_NOCB_CPU_NONE=n +CONFIG_RCU_NOCB_CPU_ZERO=n +CONFIG_RCU_NOCB_CPU_ALL=y +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_PROVE_LOCKING=y +CONFIG_PROVE_RCU=y +CONFIG_DEBUG_KERNEL=y +CONFIG_DEBUG_OBJECTS=y +CONFIG_DEBUG_OBJECTS_RCU_HEAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_SLUB=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-all new file +30 -0
@@ -0,0 +1,30 @@ +CONFIG_RCU_TRACE=y +CONFIG_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=2 +CONFIG_NR_CPUS=16 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=y +CONFIG_RCU_NOCB_CPU=y +CONFIG_RCU_NOCB_CPU_NONE=y +CONFIG_RCU_NOCB_CPU_ZERO=n +CONFIG_RCU_NOCB_CPU_ALL=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_PROVE_LOCKING=y +CONFIG_PROVE_RCU=y +CONFIG_DEBUG_KERNEL=y +CONFIG_DEBUG_OBJECTS=y +CONFIG_DEBUG_OBJECTS_RCU_HEAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_SLUB=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-none new file +30 -0
@@ -0,0 +1,30 @@ +CONFIG_RCU_TRACE=y +CONFIG_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=2 +CONFIG_NR_CPUS=16 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=y +CONFIG_RCU_NOCB_CPU=y +CONFIG_RCU_NOCB_CPU_NONE=y +CONFIG_RCU_NOCB_CPU_ZERO=n +CONFIG_RCU_NOCB_CPU_ALL=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_PROVE_LOCKING=y +CONFIG_PROVE_RCU=y +CONFIG_DEBUG_KERNEL=y +CONFIG_DEBUG_OBJECTS=y +CONFIG_DEBUG_OBJECTS_RCU_HEAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_SLUB=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-hp new file +30 -0
@@ -0,0 +1,30 @@ +CONFIG_RCU_TRACE=y +CONFIG_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=2 +CONFIG_NR_CPUS=16 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=n +CONFIG_RCU_NOCB_CPU=y +CONFIG_RCU_NOCB_CPU_NONE=n +CONFIG_RCU_NOCB_CPU_ZERO=y +CONFIG_RCU_NOCB_CPU_ALL=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_PROVE_LOCKING=y +CONFIG_PROVE_RCU=y +CONFIG_DEBUG_KERNEL=y +CONFIG_DEBUG_OBJECTS=y +CONFIG_DEBUG_OBJECTS_RCU_HEAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_SLUB=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.12/PT1-nh new file +23 -0
@@ -0,0 +1,23 @@ +CONFIG_TINY_PREEMPT_RCU=y +CONFIG_RCU_BOOST=y +CONFIG_RCU_BOOST_PRIO=2 +CONFIG_RCU_TRACE=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +# +CONFIG_SMP=n +# +CONFIG_HOTPLUG_CPU=n +# +CONFIG_NO_HZ=n +# +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.12/PT2-NH new file +22 -0
@@ -0,0 +1,22 @@ +CONFIG_TINY_PREEMPT_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +# +CONFIG_SMP=n +# +CONFIG_HOTPLUG_CPU=n +# +CONFIG_NO_HZ=y +# +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +CONFIG_PROVE_LOCKING=y +CONFIG_PROVE_RCU=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.3/CFLIST new file +14 -0
@@ -0,0 +1,14 @@ +P1-S-T-NH-SD-SMP-HP +P2-2-t-nh-sd-SMP-hp +P3-3-T-nh-SD-SMP-hp +P4-A-t-NH-sd-SMP-HP +P5-U-T-NH-sd-SMP-hp +N1-S-T-NH-SD-SMP-HP +N2-2-t-nh-sd-SMP-hp +N3-3-T-nh-SD-SMP-hp +N4-A-t-NH-sd-SMP-HP +N5-U-T-NH-sd-SMP-hp +PT1-nh +PT2-NH +NT1-nh +NT3-NH
tools/testing/selftests/rcutorture/configs/rcu/v3.3/N1-S-T-NH-SD-SMP-HP new file +19 -0
@@ -0,0 +1,19 @@ +CONFIG_RCU_TRACE=y +CONFIG_RCU_FAST_NO_HZ=y +CONFIG_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=8 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=y +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TREE_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.3/N2-2-t-nh-sd-SMP-hp new file +20 -0
@@ -0,0 +1,20 @@ +CONFIG_RCU_TRACE=n +CONFIG_NO_HZ=n +CONFIG_SMP=y +CONFIG_RCU_FANOUT=4 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TREE_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.3/N3-3-T-nh-SD-SMP-hp new file +22 -0
@@ -0,0 +1,22 @@ +CONFIG_RCU_TRACE=y +CONFIG_NO_HZ=n +CONFIG_SMP=y +CONFIG_RCU_FANOUT=2 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TREE_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_PROVE_LOCKING=y +CONFIG_PROVE_RCU=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.3/N4-A-t-NH-sd-SMP-HP new file +18 -0
@@ -0,0 +1,18 @@ +CONFIG_RCU_TRACE=n +CONFIG_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=6 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=y +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TREE_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.3/N5-U-T-NH-sd-SMP-hp new file +22 -0
@@ -0,0 +1,22 @@ +CONFIG_RCU_TRACE=y +CONFIG_DEBUG_KERNEL=y +CONFIG_RCU_CPU_STALL_INFO=y +CONFIG_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=6 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=y +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TREE_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.3/NT1-nh new file +23 -0
@@ -0,0 +1,23 @@ +#CHECK#CONFIG_TINY_RCU=y +CONFIG_RCU_TRACE=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +# +CONFIG_SMP=n +# +CONFIG_HOTPLUG_CPU=n +# +CONFIG_NO_HZ=n +# +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +CONFIG_PROVE_LOCKING=y +CONFIG_PROVE_RCU=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.3/NT3-NH new file +20 -0
@@ -0,0 +1,20 @@ +#CHECK#CONFIG_TINY_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +# +CONFIG_SMP=n +# +CONFIG_HOTPLUG_CPU=n +# +CONFIG_NO_HZ=y +# +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.3/P1-S-T-NH-SD-SMP-HP new file +20 -0
@@ -0,0 +1,20 @@ +CONFIG_RCU_TRACE=y +CONFIG_RCU_CPU_STALL_INFO=y +CONFIG_NO_HZ=y +CONFIG_RCU_FAST_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=8 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=y +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.3/P2-2-t-nh-sd-SMP-hp new file +20 -0
@@ -0,0 +1,20 @@ +CONFIG_RCU_TRACE=n +CONFIG_NO_HZ=n +CONFIG_SMP=y +CONFIG_RCU_FANOUT=4 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.3/P3-3-T-nh-SD-SMP-hp new file +20 -0
@@ -0,0 +1,20 @@ +CONFIG_RCU_TRACE=y +CONFIG_NO_HZ=n +CONFIG_SMP=y +CONFIG_RCU_FANOUT=2 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.3/P4-A-t-NH-sd-SMP-HP new file +22 -0
@@ -0,0 +1,22 @@ +CONFIG_RCU_TRACE=n +CONFIG_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=6 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=y +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_RT_MUTEXES=y +CONFIG_RCU_BOOST=y +CONFIG_RCU_BOOST_PRIO=2 +CONFIG_PROVE_LOCKING=y +CONFIG_PROVE_RCU=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.3/P5-U-T-NH-sd-SMP-hp new file +28 -0
@@ -0,0 +1,28 @@ +CONFIG_RCU_TRACE=y +CONFIG_RCU_CPU_STALL_INFO=y +CONFIG_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=6 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=y +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_DEBUG_KERNEL=y +CONFIG_PROVE_RCU_DELAY=y +CONFIG_DEBUG_OBJECTS=y +CONFIG_DEBUG_OBJECTS_RCU_HEAD=y +CONFIG_RT_MUTEXES=y +CONFIG_RCU_BOOST=y +CONFIG_RCU_BOOST_PRIO=2 +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.3/PT1-nh new file +23 -0
@@ -0,0 +1,23 @@ +CONFIG_TINY_PREEMPT_RCU=y +CONFIG_RCU_BOOST=y +CONFIG_RCU_BOOST_PRIO=2 +CONFIG_RCU_TRACE=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +# +CONFIG_SMP=n +# +CONFIG_HOTPLUG_CPU=n +# +CONFIG_NO_HZ=n +# +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.3/PT2-NH new file +22 -0
@@ -0,0 +1,22 @@ +CONFIG_TINY_PREEMPT_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +# +CONFIG_SMP=n +# +CONFIG_HOTPLUG_CPU=n +# +CONFIG_NO_HZ=y +# +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +CONFIG_PROVE_LOCKING=y +CONFIG_PROVE_RCU=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.3/ver_functions.sh new file +44 -0
44 lines not on this page · raw message
tools/testing/selftests/rcutorture/configs/rcu/v3.5/CFLIST new file +14 -0
@@ -0,0 +1,14 @@ +P1-S-T-NH-SD-SMP-HP +P2-2-t-nh-sd-SMP-hp +P3-3-T-nh-SD-SMP-hp +P4-A-t-NH-sd-SMP-HP +P5-U-T-NH-sd-SMP-hp +N1-S-T-NH-SD-SMP-HP +N2-2-t-nh-sd-SMP-hp +N3-3-T-nh-SD-SMP-hp +N4-A-t-NH-sd-SMP-HP +N5-U-T-NH-sd-SMP-hp +PT1-nh +PT2-NH +NT1-nh +NT3-NH
tools/testing/selftests/rcutorture/configs/rcu/v3.5/N1-S-T-NH-SD-SMP-HP new file +19 -0
@@ -0,0 +1,19 @@ +CONFIG_RCU_TRACE=y +CONFIG_RCU_FAST_NO_HZ=y +CONFIG_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=8 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=y +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TREE_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.5/N2-2-t-nh-sd-SMP-hp new file +20 -0
@@ -0,0 +1,20 @@ +CONFIG_RCU_TRACE=n +CONFIG_NO_HZ=n +CONFIG_SMP=y +CONFIG_RCU_FANOUT=4 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TREE_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.5/N3-3-T-nh-SD-SMP-hp new file +22 -0
@@ -0,0 +1,22 @@ +CONFIG_RCU_TRACE=y +CONFIG_NO_HZ=n +CONFIG_SMP=y +CONFIG_RCU_FANOUT=2 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TREE_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_PROVE_LOCKING=y +CONFIG_PROVE_RCU=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.5/N4-A-t-NH-sd-SMP-HP new file +18 -0
@@ -0,0 +1,18 @@ +CONFIG_RCU_TRACE=n +CONFIG_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=6 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=y +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TREE_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.5/N5-U-T-NH-sd-SMP-hp new file +22 -0
@@ -0,0 +1,22 @@ +CONFIG_RCU_TRACE=y +CONFIG_DEBUG_KERNEL=y +CONFIG_RCU_CPU_STALL_INFO=y +CONFIG_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=6 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=y +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +#CHECK#CONFIG_TREE_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.5/NT1-nh new file +23 -0
@@ -0,0 +1,23 @@ +#CHECK#CONFIG_TINY_RCU=y +CONFIG_RCU_TRACE=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +# +CONFIG_SMP=n +# +CONFIG_HOTPLUG_CPU=n +# +CONFIG_NO_HZ=n +# +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +CONFIG_PROVE_LOCKING=y +CONFIG_PROVE_RCU=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.5/NT3-NH new file +20 -0
@@ -0,0 +1,20 @@ +#CHECK#CONFIG_TINY_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +# +CONFIG_SMP=n +# +CONFIG_HOTPLUG_CPU=n +# +CONFIG_NO_HZ=y +# +CONFIG_PREEMPT_NONE=y +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=n +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.5/P1-S-T-NH-SD-SMP-HP new file +20 -0
@@ -0,0 +1,20 @@ +CONFIG_RCU_TRACE=y +CONFIG_RCU_CPU_STALL_INFO=y +CONFIG_NO_HZ=y +CONFIG_RCU_FAST_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=8 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=y +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.5/P2-2-t-nh-sd-SMP-hp new file +20 -0
@@ -0,0 +1,20 @@ +CONFIG_RCU_TRACE=n +CONFIG_NO_HZ=n +CONFIG_SMP=y +CONFIG_RCU_FANOUT=4 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.5/P3-3-T-nh-SD-SMP-hp new file +20 -0
@@ -0,0 +1,20 @@ +CONFIG_RCU_TRACE=y +CONFIG_NO_HZ=n +CONFIG_SMP=y +CONFIG_RCU_FANOUT=2 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.5/P4-A-t-NH-sd-SMP-HP new file +22 -0
@@ -0,0 +1,22 @@ +CONFIG_RCU_TRACE=n +CONFIG_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=6 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=n +CONFIG_HOTPLUG_CPU=y +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_RT_MUTEXES=y +CONFIG_RCU_BOOST=y +CONFIG_RCU_BOOST_PRIO=2 +CONFIG_PROVE_LOCKING=y +CONFIG_PROVE_RCU=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.5/P5-U-T-NH-sd-SMP-hp new file +28 -0
@@ -0,0 +1,28 @@ +CONFIG_RCU_TRACE=y +CONFIG_RCU_CPU_STALL_INFO=y +CONFIG_NO_HZ=y +CONFIG_SMP=y +CONFIG_RCU_FANOUT=6 +CONFIG_NR_CPUS=8 +CONFIG_RCU_FANOUT_EXACT=y +CONFIG_HOTPLUG_CPU=n +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +#CHECK#CONFIG_TREE_PREEMPT_RCU=y +CONFIG_DEBUG_KERNEL=y +CONFIG_PROVE_RCU_DELAY=y +CONFIG_DEBUG_OBJECTS=y +CONFIG_DEBUG_OBJECTS_RCU_HEAD=y +CONFIG_RT_MUTEXES=y +CONFIG_RCU_BOOST=y +CONFIG_RCU_BOOST_PRIO=2 +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.5/PT1-nh new file +23 -0
@@ -0,0 +1,23 @@ +CONFIG_TINY_PREEMPT_RCU=y +CONFIG_RCU_BOOST=y +CONFIG_RCU_BOOST_PRIO=2 +CONFIG_RCU_TRACE=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +# +CONFIG_SMP=n +# +CONFIG_HOTPLUG_CPU=n +# +CONFIG_NO_HZ=n +# +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.5/PT2-NH new file +22 -0
@@ -0,0 +1,22 @@ +CONFIG_TINY_PREEMPT_RCU=y +CONFIG_RCU_TORTURE_TEST=m +CONFIG_MODULE_UNLOAD=y +CONFIG_SUSPEND=n +CONFIG_HIBERNATION=n +# +CONFIG_SMP=n +# +CONFIG_HOTPLUG_CPU=n +# +CONFIG_NO_HZ=y +# +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +CONFIG_PROVE_LOCKING=y +CONFIG_PROVE_RCU=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_PRINTK_TIME=y +
tools/testing/selftests/rcutorture/configs/rcu/v3.5/ver_functions.sh new file +57 -0
57 lines not on this page · raw message
tools/testing/selftests/rcutorture/configs/rcu/ver_functions.sh new file +57 -0
57 lines not on this page · raw message
tools/testing/selftests/rcutorture/configs/v0.0/CFLIST deleted +0 -14
@@ -1,14 +0,0 @@ -P1-S-T-NH-SD-SMP-HP -P2-2-t-nh-sd-SMP-hp -P3-3-T-nh-SD-SMP-hp -P4-A-t-NH-sd-SMP-HP -P5-U-T-NH-sd-SMP-hp -N1-S-T-NH-SD-SMP-HP -N2-2-t-nh-sd-SMP-hp -N3-3-T-nh-SD-SMP-hp -N4-A-t-NH-sd-SMP-HP -N5-U-T-NH-sd-SMP-hp -PT1-nh -PT2-NH -NT1-nh -NT3-NH
tools/testing/selftests/rcutorture/configs/v0.0/N1-S-T-NH-SD-SMP-HP deleted +0 -18
@@ -1,18 +0,0 @@ -CONFIG_RCU_TRACE=y -CONFIG_NO_HZ=y -CONFIG_SMP=y -CONFIG_RCU_FANOUT=8 -CONFIG_NR_CPUS=8 -CONFIG_RCU_FANOUT_EXACT=n -CONFIG_HOTPLUG_CPU=y -CONFIG_PREEMPT_NONE=y -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=n -#CHECK#CONFIG_TREE_RCU=y -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v0.0/N2-2-t-nh-sd-SMP-hp deleted +0 -20
@@ -1,20 +0,0 @@ -CONFIG_RCU_TRACE=n -CONFIG_NO_HZ=n -CONFIG_SMP=y -CONFIG_RCU_FANOUT=4 -CONFIG_NR_CPUS=8 -CONFIG_RCU_FANOUT_EXACT=n -CONFIG_HOTPLUG_CPU=n -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -CONFIG_PREEMPT_NONE=y -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=n -#CHECK#CONFIG_TREE_RCU=y -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v0.0/N3-3-T-nh-SD-SMP-hp deleted +0 -22
@@ -1,22 +0,0 @@ -CONFIG_RCU_TRACE=y -CONFIG_NO_HZ=n -CONFIG_SMP=y -CONFIG_RCU_FANOUT=2 -CONFIG_NR_CPUS=8 -CONFIG_RCU_FANOUT_EXACT=n -CONFIG_HOTPLUG_CPU=n -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -CONFIG_PREEMPT_NONE=y -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=n -#CHECK#CONFIG_TREE_RCU=y -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_PROVE_LOCKING=y -CONFIG_PROVE_RCU=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v0.0/N4-A-t-NH-sd-SMP-HP deleted +0 -18
@@ -1,18 +0,0 @@ -CONFIG_RCU_TRACE=n -CONFIG_NO_HZ=y -CONFIG_SMP=y -CONFIG_RCU_FANOUT=6 -CONFIG_NR_CPUS=8 -CONFIG_RCU_FANOUT_EXACT=n -CONFIG_HOTPLUG_CPU=y -CONFIG_PREEMPT_NONE=y -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=n -#CHECK#CONFIG_TREE_RCU=y -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v0.0/N5-U-T-NH-sd-SMP-hp deleted +0 -22
@@ -1,22 +0,0 @@ -CONFIG_RCU_TRACE=y -CONFIG_DEBUG_KERNEL=y -CONFIG_RCU_CPU_STALL_INFO=y -CONFIG_NO_HZ=y -CONFIG_SMP=y -CONFIG_RCU_FANOUT=6 -CONFIG_NR_CPUS=8 -CONFIG_RCU_FANOUT_EXACT=y -CONFIG_HOTPLUG_CPU=n -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -CONFIG_PREEMPT_NONE=y -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=n -#CHECK#CONFIG_TREE_RCU=y -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v0.0/NT1-nh deleted +0 -23
@@ -1,23 +0,0 @@ -#CHECK#CONFIG_TINY_RCU=y -CONFIG_RCU_TRACE=y -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -# -CONFIG_SMP=n -# -CONFIG_HOTPLUG_CPU=n -# -CONFIG_NO_HZ=n -# -CONFIG_PREEMPT_NONE=y -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=n -CONFIG_PROVE_LOCKING=y -CONFIG_PROVE_RCU=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v0.0/NT3-NH deleted +0 -20
@@ -1,20 +0,0 @@ -#CHECK#CONFIG_TINY_RCU=y -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -# -CONFIG_SMP=n -# -CONFIG_HOTPLUG_CPU=n -# -CONFIG_NO_HZ=y -# -CONFIG_PREEMPT_NONE=y -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=n -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v0.0/P1-S-T-NH-SD-SMP-HP deleted +0 -19
@@ -1,19 +0,0 @@ -CONFIG_RCU_TRACE=y -CONFIG_RCU_CPU_STALL_INFO=y -CONFIG_NO_HZ=y -CONFIG_SMP=y -CONFIG_RCU_FANOUT=8 -CONFIG_NR_CPUS=8 -CONFIG_RCU_FANOUT_EXACT=n -CONFIG_HOTPLUG_CPU=y -CONFIG_PREEMPT_NONE=n -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=y -#CHECK#CONFIG_TREE_PREEMPT_RCU=y -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v0.0/P2-2-t-nh-sd-SMP-hp deleted +0 -20
@@ -1,20 +0,0 @@ -CONFIG_RCU_TRACE=n -CONFIG_NO_HZ=n -CONFIG_SMP=y -CONFIG_RCU_FANOUT=4 -CONFIG_NR_CPUS=8 -CONFIG_RCU_FANOUT_EXACT=n -CONFIG_HOTPLUG_CPU=n -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -CONFIG_PREEMPT_NONE=n -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=y -#CHECK#CONFIG_TREE_PREEMPT_RCU=y -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v0.0/P3-3-T-nh-SD-SMP-hp deleted +0 -20
@@ -1,20 +0,0 @@ -CONFIG_RCU_TRACE=y -CONFIG_NO_HZ=n -CONFIG_SMP=y -CONFIG_RCU_FANOUT=2 -CONFIG_NR_CPUS=8 -CONFIG_RCU_FANOUT_EXACT=n -CONFIG_HOTPLUG_CPU=n -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -CONFIG_PREEMPT_NONE=n -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=y -#CHECK#CONFIG_TREE_PREEMPT_RCU=y -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v0.0/P4-A-t-NH-sd-SMP-HP deleted +0 -22
@@ -1,22 +0,0 @@ -CONFIG_RCU_TRACE=n -CONFIG_NO_HZ=y -CONFIG_SMP=y -CONFIG_RCU_FANOUT=6 -CONFIG_NR_CPUS=8 -CONFIG_RCU_FANOUT_EXACT=n -CONFIG_HOTPLUG_CPU=y -CONFIG_PREEMPT_NONE=n -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=y -#CHECK#CONFIG_TREE_PREEMPT_RCU=y -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_RT_MUTEXES=y -CONFIG_RCU_BOOST=y -CONFIG_RCU_BOOST_PRIO=2 -CONFIG_PROVE_LOCKING=y -CONFIG_PROVE_RCU=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v0.0/P5-U-T-NH-sd-SMP-hp deleted +0 -28
@@ -1,28 +0,0 @@ -CONFIG_RCU_TRACE=y -CONFIG_RCU_CPU_STALL_INFO=y -CONFIG_NO_HZ=y -CONFIG_SMP=y -CONFIG_RCU_FANOUT=6 -CONFIG_NR_CPUS=8 -CONFIG_RCU_FANOUT_EXACT=y -CONFIG_HOTPLUG_CPU=n -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -CONFIG_PREEMPT_NONE=n -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=y -#CHECK#CONFIG_TREE_PREEMPT_RCU=y -CONFIG_DEBUG_KERNEL=y -CONFIG_PROVE_RCU_DELAY=y -CONFIG_DEBUG_OBJECTS=y -CONFIG_DEBUG_OBJECTS_RCU_HEAD=y -CONFIG_RT_MUTEXES=y -CONFIG_RCU_BOOST=y -CONFIG_RCU_BOOST_PRIO=2 -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v0.0/PT1-nh deleted +0 -23
@@ -1,23 +0,0 @@ -CONFIG_TINY_PREEMPT_RCU=y -CONFIG_RCU_BOOST=y -CONFIG_RCU_BOOST_PRIO=2 -CONFIG_RCU_TRACE=y -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -# -CONFIG_SMP=n -# -CONFIG_HOTPLUG_CPU=n -# -CONFIG_NO_HZ=n -# -CONFIG_PREEMPT_NONE=n -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v0.0/PT2-NH deleted +0 -22
@@ -1,22 +0,0 @@ -CONFIG_TINY_PREEMPT_RCU=y -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -# -CONFIG_SMP=n -# -CONFIG_HOTPLUG_CPU=n -# -CONFIG_NO_HZ=y -# -CONFIG_PREEMPT_NONE=n -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=y -CONFIG_PROVE_LOCKING=y -CONFIG_PROVE_RCU=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v0.0/ver_functions.sh deleted +0 -33
@@ -1,33 +0,0 @@ -#!/bin/bash -# -# Kernel-version-dependent shell functions for the rest of the scripts. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, you can access it online at -# http://www.gnu.org/licenses/gpl-2.0.html. -# -# Copyright (C) IBM Corporation, 2013 -# -# Authors: Paul E. McKenney <[email protected]> - -# per_version_boot_params bootparam-string config-file seconds -# -# Adds per-version torture-module parameters to kernels supporting them. -# Which old kernels do not. -per_version_boot_params () { - echo rcutorture.stat_interval=15 \ - rcutorture.shutdown_secs=$3 \ - rcutorture.rcutorture_runnable=1 \ - rcutorture.test_no_idle_hz=1 \ - rcutorture.verbose=1 -}
tools/testing/selftests/rcutorture/configs/v3.12/CFLIST deleted +0 -17
@@ -1,17 +0,0 @@ -sysidleY.2013.06.19a -sysidleN.2013.06.19a -P1-S-T-NH-SD-SMP-HP -P2-2-t-nh-sd-SMP-hp -P3-3-T-nh-SD-SMP-hp -P4-A-t-NH-sd-SMP-HP -P5-U-T-NH-sd-SMP-hp -P6---t-nh-SD-smp-hp -N1-S-T-NH-SD-SMP-HP -N2-2-t-nh-sd-SMP-hp -N3-3-T-nh-SD-SMP-hp -N4-A-t-NH-sd-SMP-HP -N5-U-T-NH-sd-SMP-hp -PT1-nh -PT2-NH -NT1-nh -NT3-NH
tools/testing/selftests/rcutorture/configs/v3.12/N1-S-T-NH-SD-SMP-HP deleted +0 -19
@@ -1,19 +0,0 @@ -CONFIG_RCU_TRACE=y -CONFIG_RCU_FAST_NO_HZ=y -CONFIG_NO_HZ=y -CONFIG_SMP=y -CONFIG_RCU_FANOUT=8 -CONFIG_NR_CPUS=8 -CONFIG_RCU_FANOUT_EXACT=n -CONFIG_HOTPLUG_CPU=y -CONFIG_PREEMPT_NONE=y -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=n -#CHECK#CONFIG_TREE_RCU=y -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v3.12/N2-2-t-nh-sd-SMP-hp deleted +0 -20
@@ -1,20 +0,0 @@ -CONFIG_RCU_TRACE=n -CONFIG_NO_HZ=n -CONFIG_SMP=y -CONFIG_RCU_FANOUT=4 -CONFIG_NR_CPUS=8 -CONFIG_RCU_FANOUT_EXACT=n -CONFIG_HOTPLUG_CPU=n -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -CONFIG_PREEMPT_NONE=y -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=n -#CHECK#CONFIG_TREE_RCU=y -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v3.12/N3-3-T-nh-SD-SMP-hp deleted +0 -22
@@ -1,22 +0,0 @@ -CONFIG_RCU_TRACE=y -CONFIG_NO_HZ=n -CONFIG_SMP=y -CONFIG_RCU_FANOUT=2 -CONFIG_NR_CPUS=8 -CONFIG_RCU_FANOUT_EXACT=n -CONFIG_HOTPLUG_CPU=n -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -CONFIG_PREEMPT_NONE=y -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=n -#CHECK#CONFIG_TREE_RCU=y -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_PROVE_LOCKING=y -CONFIG_PROVE_RCU=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v3.12/N4-A-t-NH-sd-SMP-HP deleted +0 -18
@@ -1,18 +0,0 @@ -CONFIG_RCU_TRACE=n -CONFIG_NO_HZ=y -CONFIG_SMP=y -CONFIG_RCU_FANOUT=6 -CONFIG_NR_CPUS=8 -CONFIG_RCU_FANOUT_EXACT=n -CONFIG_HOTPLUG_CPU=y -CONFIG_PREEMPT_NONE=y -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=n -#CHECK#CONFIG_TREE_RCU=y -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v3.12/N5-U-T-NH-sd-SMP-hp deleted +0 -22
@@ -1,22 +0,0 @@ -CONFIG_RCU_TRACE=y -CONFIG_DEBUG_KERNEL=y -CONFIG_RCU_CPU_STALL_INFO=y -CONFIG_NO_HZ=y -CONFIG_SMP=y -CONFIG_RCU_FANOUT=6 -CONFIG_NR_CPUS=8 -CONFIG_RCU_FANOUT_EXACT=y -CONFIG_HOTPLUG_CPU=n -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -CONFIG_PREEMPT_NONE=y -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=n -#CHECK#CONFIG_TREE_RCU=y -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v3.12/N6---t-nh-SD-smp-hp deleted +0 -19
@@ -1,19 +0,0 @@ -CONFIG_RCU_TRACE=n -CONFIG_NO_HZ=n -CONFIG_SMP=y -CONFIG_NR_CPUS=1 -CONFIG_RCU_FANOUT_EXACT=n -CONFIG_HOTPLUG_CPU=n -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -CONFIG_PREEMPT_NONE=y -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=n -#CHECK#CONFIG_TREE_RCU=y -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v3.12/N7-4-T-NH-SD-SMP-HP deleted +0 -26
@@ -1,26 +0,0 @@ -CONFIG_RCU_TRACE=y -CONFIG_DEBUG_KERNEL=y -CONFIG_RCU_CPU_STALL_INFO=y -CONFIG_NO_HZ=y -CONFIG_SMP=y -CONFIG_RCU_FANOUT=2 -CONFIG_NR_CPUS=16 -CONFIG_RCU_FANOUT_EXACT=n -CONFIG_HOTPLUG_CPU=y -CONFIG_RCU_NOCB_CPU=y -CONFIG_RCU_NOCB_CPU_NONE=y -CONFIG_RCU_NOCB_CPU_ZERO=n -CONFIG_RCU_NOCB_CPU_ALL=n -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -CONFIG_PREEMPT_NONE=y -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=n -#CHECK#CONFIG_TREE_RCU=y -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v3.12/N8-2-T-NH-SD-SMP-HP deleted +0 -22
@@ -1,22 +0,0 @@ -CONFIG_RCU_TRACE=y -CONFIG_DEBUG_KERNEL=y -CONFIG_RCU_CPU_STALL_INFO=y -CONFIG_NO_HZ=y -CONFIG_SMP=y -CONFIG_RCU_FANOUT=14 -CONFIG_NR_CPUS=16 -CONFIG_RCU_FANOUT_EXACT=y -CONFIG_HOTPLUG_CPU=y -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -CONFIG_PREEMPT_NONE=y -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=n -#CHECK#CONFIG_TREE_RCU=y -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v3.12/NT1-nh deleted +0 -23
@@ -1,23 +0,0 @@ -#CHECK#CONFIG_TINY_RCU=y -CONFIG_RCU_TRACE=y -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -# -CONFIG_SMP=n -# -CONFIG_HOTPLUG_CPU=n -# -CONFIG_NO_HZ=n -# -CONFIG_PREEMPT_NONE=y -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=n -CONFIG_PROVE_LOCKING=y -CONFIG_PROVE_RCU=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v3.12/NT3-NH deleted +0 -20
@@ -1,20 +0,0 @@ -#CHECK#CONFIG_TINY_RCU=y -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -# -CONFIG_SMP=n -# -CONFIG_HOTPLUG_CPU=n -# -CONFIG_NO_HZ=y -# -CONFIG_PREEMPT_NONE=y -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=n -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v3.12/P1-S-T-NH-SD-SMP-HP deleted +0 -20
@@ -1,20 +0,0 @@ -CONFIG_RCU_TRACE=y -CONFIG_RCU_CPU_STALL_INFO=y -CONFIG_NO_HZ=y -CONFIG_RCU_FAST_NO_HZ=y -CONFIG_SMP=y -CONFIG_RCU_FANOUT=8 -CONFIG_NR_CPUS=8 -CONFIG_RCU_FANOUT_EXACT=n -CONFIG_HOTPLUG_CPU=y -CONFIG_PREEMPT_NONE=n -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=y -#CHECK#CONFIG_TREE_PREEMPT_RCU=y -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v3.12/P2-2-t-nh-sd-SMP-hp deleted +0 -20
@@ -1,20 +0,0 @@ -CONFIG_RCU_TRACE=n -CONFIG_NO_HZ=n -CONFIG_SMP=y -CONFIG_RCU_FANOUT=4 -CONFIG_NR_CPUS=8 -CONFIG_RCU_FANOUT_EXACT=n -CONFIG_HOTPLUG_CPU=n -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -CONFIG_PREEMPT_NONE=n -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=y -#CHECK#CONFIG_TREE_PREEMPT_RCU=y -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v3.12/P3-3-T-nh-SD-SMP-hp deleted +0 -20
@@ -1,20 +0,0 @@ -CONFIG_RCU_TRACE=y -CONFIG_NO_HZ=n -CONFIG_SMP=y -CONFIG_RCU_FANOUT=2 -CONFIG_NR_CPUS=8 -CONFIG_RCU_FANOUT_EXACT=n -CONFIG_HOTPLUG_CPU=n -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -CONFIG_PREEMPT_NONE=n -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=y -#CHECK#CONFIG_TREE_PREEMPT_RCU=y -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v3.12/P4-A-t-NH-sd-SMP-HP deleted +0 -22
@@ -1,22 +0,0 @@ -CONFIG_RCU_TRACE=n -CONFIG_NO_HZ=y -CONFIG_SMP=y -CONFIG_RCU_FANOUT=6 -CONFIG_NR_CPUS=8 -CONFIG_RCU_FANOUT_EXACT=n -CONFIG_HOTPLUG_CPU=y -CONFIG_PREEMPT_NONE=n -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=y -#CHECK#CONFIG_TREE_PREEMPT_RCU=y -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_RT_MUTEXES=y -CONFIG_RCU_BOOST=y -CONFIG_RCU_BOOST_PRIO=2 -CONFIG_PROVE_LOCKING=y -CONFIG_PROVE_RCU=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v3.12/P5-U-T-NH-sd-SMP-hp deleted +0 -28
@@ -1,28 +0,0 @@ -CONFIG_RCU_TRACE=y -CONFIG_RCU_CPU_STALL_INFO=y -CONFIG_NO_HZ=y -CONFIG_SMP=y -CONFIG_RCU_FANOUT=6 -CONFIG_NR_CPUS=8 -CONFIG_RCU_FANOUT_EXACT=y -CONFIG_HOTPLUG_CPU=n -CONFIG_SUSPEND=n -CONFIG_HIBERNATION=n -CONFIG_PREEMPT_NONE=n -CONFIG_PREEMPT_VOLUNTARY=n -CONFIG_PREEMPT=y -#CHECK#CONFIG_TREE_PREEMPT_RCU=y -CONFIG_DEBUG_KERNEL=y -CONFIG_PROVE_RCU_DELAY=y -CONFIG_DEBUG_OBJECTS=y -CONFIG_DEBUG_OBJECTS_RCU_HEAD=y -CONFIG_RT_MUTEXES=y -CONFIG_RCU_BOOST=y -CONFIG_RCU_BOOST_PRIO=2 -CONFIG_RCU_TORTURE_TEST=m -CONFIG_MODULE_UNLOAD=y -CONFIG_SYSFS_DEPRECATED_V2=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y -CONFIG_PRINTK_TIME=y -
tools/testing/selftests/rcutorture/configs/v3.12/P6---t-nh-SD-smp-hp deleted +0 -18
@@ -1,18 +0,0 @@ -CONFIG_RCU_TRACE=n
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP deleted +0 -30
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-all deleted +0 -30
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-HP-none deleted +0 -30
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.12/P7-4-T-NH-SD-SMP-hp deleted +0 -30
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.12/PT1-nh deleted +0 -23
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.12/PT2-NH deleted +0 -22
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.3/CFLIST deleted +0 -14
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.3/N1-S-T-NH-SD-SMP-HP deleted +0 -19
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.3/N2-2-t-nh-sd-SMP-hp deleted +0 -20
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.3/N3-3-T-nh-SD-SMP-hp deleted +0 -22
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.3/N4-A-t-NH-sd-SMP-HP deleted +0 -18
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.3/N5-U-T-NH-sd-SMP-hp deleted +0 -22
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.3/NT1-nh deleted +0 -23
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.3/NT3-NH deleted +0 -20
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.3/P1-S-T-NH-SD-SMP-HP deleted +0 -20
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.3/P2-2-t-nh-sd-SMP-hp deleted +0 -20
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.3/P3-3-T-nh-SD-SMP-hp deleted +0 -20
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.3/P4-A-t-NH-sd-SMP-HP deleted +0 -22
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.3/P5-U-T-NH-sd-SMP-hp deleted +0 -28
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.3/PT1-nh deleted +0 -23
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.3/PT2-NH deleted +0 -22
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.3/ver_functions.sh deleted +0 -44
44 lines not on this page · raw message
tools/testing/selftests/rcutorture/configs/v3.5/CFLIST deleted +0 -14
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.5/N1-S-T-NH-SD-SMP-HP deleted +0 -19
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.5/N2-2-t-nh-sd-SMP-hp deleted +0 -20
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.5/N3-3-T-nh-SD-SMP-hp deleted +0 -22
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.5/N4-A-t-NH-sd-SMP-HP deleted +0 -18
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.5/N5-U-T-NH-sd-SMP-hp deleted +0 -22
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.5/NT1-nh deleted +0 -23
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.5/NT3-NH deleted +0 -20
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.5/P1-S-T-NH-SD-SMP-HP deleted +0 -20
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.5/P2-2-t-nh-sd-SMP-hp deleted +0 -20
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.5/P3-3-T-nh-SD-SMP-hp deleted +0 -20
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.5/P4-A-t-NH-sd-SMP-HP deleted +0 -22
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.5/P5-U-T-NH-sd-SMP-hp deleted +0 -28
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.5/PT1-nh deleted +0 -23
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.5/PT2-NH deleted +0 -22
Lines of this file are not shown. View the raw message.
tools/testing/selftests/rcutorture/configs/v3.5/ver_functions.sh deleted +0 -57
57 lines not on this page · raw message
tools/testing/selftests/rcutorture/configs/ver_functions.sh deleted +0 -57
57 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.8.1.5
Part of the diff is not shown here. View the raw message.
PATCH 50/55 rcutorture: Gracefully handle NULL cleanup hooks
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
Although most torture tests will have some cleanup hook, it is possible that one might not. This commit therefore enables graceful handling of a NULL cleanup hook during torture-test shutdown.
--- kernel/torture.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
kernel/torture.c +4 -1
@@ -454,7 +454,10 @@ static int torture_shutdown(void *arg)VERBOSE_TOROUT_STRING ("torture_shutdown task shutting down system" ); shutdown_task =NULL ;/* Avoid self-kill deadlock. */ -torture_shutdown_hook ();/* Shut down the enclosing torture test. */ +if (torture_shutdown_hook) +torture_shutdown_hook (); +else +VERBOSE_TOROUT_STRING ("No torture_shutdown_hook(), skipping." );kernel_power_off ();/* Shut down the system. */ return 0 ; }
Signature · 1 line
1.8.1.5
PATCH 44/55 rcutorture: Create config files for scripted test-the-test testing
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
This commit adds a pair of files in the configs directory to allow test-the-test runs of rcutorture via a "--configs BUSTED" argument to the kvm.sh script.
--- tools/testing/selftests/rcutorture/configs/BUSTED | 8 ++++++++ tools/testing/selftests/rcutorture/configs/BUSTED.boot | 1 + 2 files changed, 9 insertions(+) create mode 100644 tools/testing/selftests/rcutorture/configs/BUSTED create mode 100644 tools/testing/selftests/rcutorture/configs/BUSTED.boot
tools/testing/selftests/rcutorture/configs/BUSTED new file +8 -0
@@ -0,0 +1,8 @@ +CONFIG_RCU_TRACE=n +CONFIG_SMP=y +CONFIG_NR_CPUS=4 +CONFIG_HOTPLUG_CPU=y +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y +CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/BUSTED.boot new file +1 -0
@@ -0,0 +1 @@ +rcutorture.torture_type=rcu_busted
Signature · 1 line
1.8.1.5
PATCH 41/55 rcutorture: Abstract kvm-recheck.sh
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
This commit creates a plug-in to allow kvm-recheck.sh to process non-rcutorture console output.
--- .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 51 ++++++++++++++++++++++ .../selftests/rcutorture/bin/kvm-recheck.sh | 20 +-------- 2 files changed, 52 insertions(+), 19 deletions(-) create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh
tools/testing/selftests/rcutorture/bin/kvm-recheck-rcu.sh new file +51 -0
@@ -0,0 +1,51 @@ +#!/bin/bash +# +# Analyze a given results directory for rcutorture progress. +# +# Usage: sh kvm-recheck-rcu.sh resdir +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, you can access it online at +# http://www.gnu.org/licenses/gpl-2.0.html. +# +# Copyright (C) IBM Corporation, 2014 +# +# Authors: Paul E. McKenney <[email protected]> + +i="$1" +if test -d $i +then + : +else + echo Unreadable results directory: $i + exit 1 +fi + +configfile=`echo $i | sed -e 's/^.*\///'` +ngps=`grep ver: $i/console.log 2> /dev/null | tail -1 | sed -e 's/^.* ver: //' -e 's/ .*$//'` +if test -z "$ngps" +then + echo $configfile +else + title="$configfile ------- $ngps grace periods" + dur=`sed -e 's/^.* rcutorture.shutdown_secs=//' -e 's/ .*$//' < $i/qemu-cmd 2> /dev/null` + if test -z "$dur" + then + : + else + ngpsps=`awk -v ngps=$ngps -v dur=$dur ' + BEGIN { print ngps / dur }' < /dev/null` + title="$title ($ngpsps per second)" + fi + echo $title +fi
tools/testing/selftests/rcutorture/bin/kvm-recheck.sh +1 -19
@@ -37,25 +37,7 @@ do resdir=`echo $i | sed -e 's,/$,,' -e 's,/[^/]*$,,'` head -1 $resdir/log fi - configfile=`echo $i | sed -e 's/^.*\///'` - ngps=`grep ver: $i/console.log 2> /dev/null | tail -1 | sed -e 's/^.* ver: //' -e 's/ .*$//'` - if test -z "$ngps" - then - echo $configfile - else - title="$configfile ------- $ngps grace periods" - dur=`sed -e 's/^.* rcutorture.shutdown_secs=//' -e 's/ .*$//' < $i/qemu-cmd 2> /dev/null` - if test -z "$dur" - then - : - else - ngpsps=$((ngps / dur)) - ngpsps=`awk -v ngps=$ngps -v dur=$dur ' - BEGIN { print ngps / dur }' < /dev/null` - title="$title ($ngpsps per second)" - fi - echo $title - fi + kvm-recheck-rcu.sh $i configcheck.sh $i/.config $i/ConfigFragment parse-build.sh $i/Make.out $configfile parse-rcutorture.sh $i/console.log $configfile
Signature · 1 line
1.8.1.5
PATCH 42/55 locktorture: Add a lock-torture kernel module
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
This commit adds the locking counterpart to rcutorture.
[ paulmck: Make n_lock_torture_errors and torture_spinlock static
as suggested by Fengguang Wu. ]
--- kernel/locking/Makefile | 1 + kernel/locking/locktorture.c | 421 +++++++++++++++++++++++++++++++++++++++++++ lib/Kconfig.debug | 15 ++ 3 files changed, 437 insertions(+) create mode 100644 kernel/locking/locktorture.c
kernel/locking/Makefile +1 -0
@@ -23,3 +23,4 @@ obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o obj-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o obj-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem-xadd.o obj-$(CONFIG_PERCPU_RWSEM) += percpu-rwsem.o +obj-$(CONFIG_LOCK_TORTURE_TEST) += locktorture.o
kernel/locking/locktorture.c new file +421 -0
421 lines not on this page · raw message
lib/Kconfig.debug +15 -0
@@ -980,6 +980,21 @@ config DEBUG_LOCKING_API_SELFTESTS The following locking APIs are covered: spinlocks, rwlocks, mutexes and rwsems. +config LOCK_TORTURE_TEST + tristate "torture tests for locking" + depends on DEBUG_KERNEL + select TORTURE_TEST + default n + help + This option provides a kernel module that runs torture tests + on kernel locking primitives. The kernel module may be built + after the fact on the running kernel to be tested, if desired. + + Say Y here if you want kernel locking-primitive torture tests + to be built into the kernel. + Say M if you want these torture tests to build as a module. + Say N if you are unsure. + endmenu # lock debugging config TRACE_IRQFLAGS
Signature · 1 line
1.8.1.5
PATCH 53/55 rcutorture: Place kvm-test-1-run.sh output into res directory
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
The output of each kvm-test-1-run.sh script is placed into a file whose name parallels that of the build directory. This means that the kvm-test-1-run.sh output is overwritten by later run. This commit therefore places the kvm-test-1-run.sh output into the per-test-case directory in the "res" hierarchy.
--- tools/testing/selftests/rcutorture/bin/kvm.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/rcutorture/bin/kvm.sh +2 -2
@@ -318,7 +318,7 @@ function dump(first, pastlast) print "touch " builddir ".wait"; print "mkdir " builddir " > /dev/null 2>&1 || :"; print "mkdir " rd cfr[jn] " || :"; - print "kvm-test-1-run.sh " CONFIGDIR cf[j], builddir, rd cfr[jn], dur " \"" RCU_QEMU_ARG "\" \"" RCU_BOOTARGS "\" > " builddir ".out 2>&1 &" + print "kvm-test-1-run.sh " CONFIGDIR cf[j], builddir, rd cfr[jn], dur " \"" RCU_QEMU_ARG "\" \"" RCU_BOOTARGS "\" > " rd cfr[jn] "/kvm-test-1-run.sh.out 2>&1 &" print "echo ", cfr[jn], cpusr[jn] ovf ": Waiting for build to complete. `date`" print "while test -f " builddir ".wait" print "do"
@@ -337,7 +337,7 @@ function dump(first, pastlast) for (j = 1; j < jn; j++) { builddir=KVM "/b" j print "echo ----", cfr[j], cpusr[j] ovf ": Build/run results:" - print "cat " builddir ".out" + print "cat " rd cfr[j] "/kvm-test-1-run.sh.out" } }
Signature · 1 line
1.8.1.5
PATCH 32/55 rcutorture: Abstract torture_shutdown()
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
Because auto-shutdown of torture testing is not specific to RCU, this commit moves the auto-shutdown function to kernel/torture.c.
--- include/linux/torture.h | 4 ++- kernel/rcu/rcutorture.c | 63 +++---------------------------------- kernel/torture.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 59 deletions(-)
include/linux/torture.h +3 -1
@@ -72,8 +72,10 @@ unsigned long torture_random(struct torture_random_state *trsp);void torture_shuffle_task_register (struct task_struct *tp);int torture_shuffle_init (long shuffint); -/* Shutdown task absorption, for when the tasks cannot safely be killed. */ +/* Test auto-shutdown handling. */ void torture_shutdown_absorb (const char *title); +int torture_shutdown_init (int ssecs,void (*cleanup)(void )); +void torture_shutdown_cleanup (void );/* Task stuttering, which forces load/no-load transitions. */ void stutter_wait (const char *title);
kernel/rcu/rcutorture.c +5 -58
99 lines not on this page · raw message
kernel/torture.c +84 -0
96 lines not on this page · raw message
Signature · 1 line
1.8.1.5
PATCH 40/55 rcutorture: Remove redundant module-alias directives
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
Because rcutorture.c has its old name back, there is no longer any need for the MODULE_ALIAS() and MODULE_PARAM_PREFIX definitions. This commit therefore removes them.
--- kernel/rcu/rcutorture.c | 6 ------ 1 file changed, 6 deletions(-)
kernel/rcu/rcutorture.c +0 -6
@@ -53,12 +53,6 @@MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Paul E. McKenney <[email protected]> and Josh Triplett <[email protected]>" ); -MODULE_ALIAS ("rcutorture" ); -#ifdef MODULE_PARAM_PREFIX -#undef MODULE_PARAM_PREFIX -#endif -#define MODULE_PARAM_PREFIX "rcutorture." -torture_parm (int, fqs_duration,0 ,"Duration of fqs bursts (us), 0 to disable" );torture_parm (int, fqs_holdoff,0 ,"Holdoff time within fqs bursts (us)" );torture_parm (int, fqs_stutter,3 ,"Wait time between fqs bursts (s)" );
Signature · 1 line
1.8.1.5
PATCH 47/55 rcutorture: Rename kvm-test-1-rcu.sh
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
The kvm-test-1-rcu.sh is not specific to RCU, so this commit renames it to kvm-test-1-run.sh.
--- .../selftests/rcutorture/bin/kvm-test-1-rcu.sh | 203 --------------------- .../selftests/rcutorture/bin/kvm-test-1-run.sh | 203 +++++++++++++++++++++ tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +- 3 files changed, 204 insertions(+), 204 deletions(-) delete mode 100755 tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh
tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh deleted +0 -203
@@ -1,203 +0,0 @@ -#!/bin/bash -# -# Run a kvm-based test of the specified tree on the specified configs. -# Fully automated run and error checking, no graphics console. -# -# Execute this in the source tree. Do not run it as a background task -# because qemu does not seem to like that much. -# -# Usage: sh kvm-test-1-rcu.sh config builddir resdir minutes qemu-args boot_args -# -# qemu-args defaults to "" -- you will want "-nographic" if running headless. -# boot_args defaults to "root=/dev/sda noapic selinux=0 console=ttyS0" -# "initcall_debug debug rcutorture.stat_interval=15" -# "rcutorture.shutdown_secs=$((minutes * 60))" -# "rcutorture.rcutorture_runnable=1" -# -# Anything you specify for either qemu-args or boot_args is appended to -# the default values. The "-smp" value is deduced from the contents of -# the config fragment. -# -# More sophisticated argument parsing is clearly needed. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, you can access it online at -# http://www.gnu.org/licenses/gpl-2.0.html. -# -# Copyright (C) IBM Corporation, 2011 -# -# Authors: Paul E. McKenney <[email protected]> - -grace=120 - -T=/tmp/kvm-test-1-rcu.sh.$$ -trap 'rm -rf $T' 0 - -. $KVM/bin/functions.sh -. $KVPATH/ver_functions.sh - -config_template=${1} -config_dir=`echo $config_template | sed -e 's,/[^/]*$,,'` -title=`echo $config_template | sed -e 's/^.*\///'` -builddir=${2} -if test -z "$builddir" -o ! -d "$builddir" -o ! -w "$builddir" -then - echo "kvm-test-1-rcu.sh :$builddir: Not a writable directory, cannot build into it" - exit 1 -fi -resdir=${3} -if test -z "$resdir" -o ! -d "$resdir" -o ! -w "$resdir" -then - echo "kvm-test-1-rcu.sh :$resdir: Not a writable directory, cannot store results into it" - exit 1 -fi -cp $config_template $resdir/ConfigFragment -echo ' ---' `date`: Starting build -echo ' ---' Kconfig fragment at: $config_template >> $resdir/log -if test -r "$config_dir/CFcommon" -then - cat < $config_dir/CFcommon >> $T -fi -# Optimizations below this point -# CONFIG_USB=n -# CONFIG_SECURITY=n -# CONFIG_NFS_FS=n -# CONFIG_SOUND=n -# CONFIG_INPUT_JOYSTICK=n -# CONFIG_INPUT_TABLET=n -# CONFIG_INPUT_TOUCHSCREEN=n -# CONFIG_INPUT_MISC=n -# CONFIG_INPUT_MOUSE=n -# # CONFIG_NET=n # disables console access, so accept the slower build. -# CONFIG_SCSI=n -# CONFIG_ATA=n -# CONFIG_FAT_FS=n -# CONFIG_MSDOS_FS=n -# CONFIG_VFAT_FS=n -# CONFIG_ISO9660_FS=n -# CONFIG_QUOTA=n -# CONFIG_HID=n -# CONFIG_CRYPTO=n -# CONFIG_PCCARD=n -# CONFIG_PCMCIA=n -# CONFIG_CARDBUS=n -# CONFIG_YENTA=n -if kvm-build.sh $config_template $builddir $T -then - cp $builddir/Make*.out $resdir - cp $builddir/.config $resdir - cp $builddir/arch/x86/boot/bzImage $resdir - parse-build.sh $resdir/Make.out $title - if test -f $builddir.wait - then - mv $builddir.wait $builddir.ready - fi -else - cp $builddir/Make*.out $resdir - echo Build failed, not running KVM, see $resdir. - if test -f $builddir.wait - then - mv $builddir.wait $builddir.ready - fi - exit 1 -fi -while test -f $builddir.ready -do - sleep 1 -done -minutes=$4 -seconds=$(($minutes * 60)) -qemu_args=$5 -boot_args=$6 - -cd $KVM -kstarttime=`awk 'BEGIN { print systime() }' < /dev/null` -echo ' ---' `date`: Starting kernel - -# Determine the appropriate flavor of qemu command. -QEMU="`identify_qemu $builddir/vmlinux`" - -# Generate -smp qemu argument. -qemu_args="-nographic $qemu_args" -cpu_count=`configNR_CPUS.sh $config_template` -vcpus=`identify_qemu_vcpus` -if test $cpu_count -gt $vcpus -then - echo CPU count limited from $cpu_count to $vcpus - touch $resdir/Warnings - echo CPU count limited from $cpu_count to $vcpus >> $resdir/Warnings - cpu_count=$vcpus -fi -qemu_args="`specify_qemu_cpus "$QEMU" "$qemu_args" "$cpu_count"`" - -# Generate architecture-specific and interaction-specific qemu arguments -qemu_args="$qemu_args `identify_qemu_args "$QEMU" "$builddir/console.log"`" - -# Generate qemu -append arguments -qemu_append="`identify_qemu_append "$QEMU"`" - -# Pull in Kconfig-fragment boot parameters -boot_args="`configfrag_boot_params "$boot_args" "$config_template"`" -# Generate kernel-version-specific boot parameters -boot_args="`per_version_boot_params "$boot_args" $builddir/.config $seconds`" - -echo $QEMU $qemu_args -m 512 -kernel $builddir/arch/x86/boot/bzImage -append \"$qemu_append $boot_args\" > $resdir/qemu-cmd -if test -n "$RCU_BUILDONLY" -then - echo Build-only run specified, boot/test omitted. - exit 0 -fi -$QEMU $qemu_args -m 512 -kernel $builddir/arch/x86/boot/bzImage -append "$qemu_append $boot_args" & -qemu_pid=$! -commandcompleted=0 -echo Monitoring qemu job at pid $qemu_pid -for ((i=0;i<$seconds;i++)) -do - if kill -0 $qemu_pid > /dev/null 2>&1 - then - sleep 1 - else - commandcompleted=1 - kruntime=`awk 'BEGIN { print systime() - '"$kstarttime"' }' < /dev/null` - if test $kruntime -lt $seconds - then - echo Completed in $kruntime vs. $seconds >> $resdir/Warnings 2>&1 - else - echo ' ---' `date`: Kernel done - fi - break - fi -done -if test $commandcompleted -eq 0 -then - echo Grace period for qemu job at pid $qemu_pid - for ((i=0;i<=$grace;i++)) - do - if kill -0 $qemu_pid > /dev/null 2>&1 - then - sleep 1 - else - break - fi - if test $i -eq $grace - then - kruntime=`awk 'BEGIN { print systime() - '"$kstarttime"' }'` - echo "!!! Hang at $kruntime vs. $seconds seconds" >> $resdir/Warnings 2>&1 - kill -KILL $qemu_pid - fi - done -fi - -cp $builddir/console.log $resdir -parse-rcutorture.sh $resdir/console.log $title -parse-console.sh $resdir/console.log $title
tools/testing/selftests/rcutorture/bin/kvm-test-1-run.sh new file +203 -0
203 lines not on this page · raw message
tools/testing/selftests/rcutorture/bin/kvm.sh +1 -1
@@ -307,7 +307,7 @@ function dump(first, pastlast) print "touch " builddir ".wait"; print "mkdir " builddir " > /dev/null 2>&1 || :"; print "mkdir " rd cfr[jn] " || :"; - print "kvm-test-1-rcu.sh " CONFIGDIR cf[j], builddir, rd cfr[jn], dur " \"" RCU_QEMU_ARG "\" \"" RCU_BOOTARGS "\" > " builddir ".out 2>&1 &" + print "kvm-test-1-run.sh " CONFIGDIR cf[j], builddir, rd cfr[jn], dur " \"" RCU_QEMU_ARG "\" \"" RCU_BOOTARGS "\" > " builddir ".out 2>&1 &" print "echo ", cfr[jn], cpusr[jn] ovf ": Waiting for build to complete. `date`" print "while test -f " builddir ".wait" print "do"
Signature · 1 line
1.8.1.5
PATCH 52/55 rcutorture: Rename TREE_RCU-Kconfig.txt
In reply to Paul E. McKenneyFrom: Paul Bolle <[email protected]>
It used to be that:
git ls-files "*Kconfig*"
would find all Kconfig files and would only find Kconfig files. This commit renames TREE_RCU-Kconfig.txt to TREE_RCU-kconfig.txt so that this is once again true.
--- .../selftests/rcutorture/doc/TREE_RCU-Kconfig.txt | 95 ---------------------- .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 95 ++++++++++++++++++++++ 2 files changed, 95 insertions(+), 95 deletions(-) delete mode 100644 tools/testing/selftests/rcutorture/doc/TREE_RCU-Kconfig.txt create mode 100644 tools/testing/selftests/rcutorture/doc/TREE_RCU-kconfig.txt
tools/testing/selftests/rcutorture/doc/TREE_RCU-Kconfig.txt deleted +0 -95
@@ -1,95 +0,0 @@ -This document gives a brief rationale for the TREE_RCU-related test -cases, a group that includes TREE_PREEMPT_RCU. - - -Kconfig Parameters: - -CONFIG_DEBUG_LOCK_ALLOC -- Do three, covering CONFIG_PROVE_LOCKING & not. -CONFIG_DEBUG_OBJECTS_RCU_HEAD -- Do one. -CONFIG_HOTPLUG_CPU -- Do half. (Every second.) -CONFIG_HZ_PERIODIC -- Do one. -CONFIG_NO_HZ_IDLE -- Do those not otherwise specified. (Groups of two.) -CONFIG_NO_HZ_FULL -- Do two, one with CONFIG_NO_HZ_FULL_SYSIDLE. -CONFIG_NO_HZ_FULL_SYSIDLE -- Do one. -CONFIG_PREEMPT -- Do half. (First three and #8.) -CONFIG_PROVE_LOCKING -- Do all but two, covering CONFIG_PROVE_RCU and not. -CONFIG_PROVE_RCU -- Do all but one under CONFIG_PROVE_LOCKING. -CONFIG_PROVE_RCU_DELAY -- Do one. -CONFIG_RCU_BOOST -- one of TREE_PREEMPT_RCU. -CONFIG_RCU_BOOST_PRIO -- set to 2 for _BOOST testing. -CONFIG_RCU_CPU_STALL_INFO -- do one with and without _VERBOSE. -CONFIG_RCU_CPU_STALL_VERBOSE -- do one with and without _INFO. -CONFIG_RCU_FANOUT -- Cover hierarchy as currently, but overlap with others. -CONFIG_RCU_FANOUT_EXACT -- Do one. -CONFIG_RCU_FANOUT_LEAF -- Do one non-default. -CONFIG_RCU_FAST_NO_HZ -- Do one, but not with CONFIG_RCU_NOCB_CPU_ALL. -CONFIG_RCU_NOCB_CPU -- Do three, see below. -CONFIG_RCU_NOCB_CPU_ALL -- Do one. -CONFIG_RCU_NOCB_CPU_NONE -- Do one. -CONFIG_RCU_NOCB_CPU_ZERO -- Do one. -CONFIG_RCU_TRACE -- Do half. -CONFIG_SMP -- Need one !SMP for TREE_PREEMPT_RCU. -RCU-bh: Do one with PREEMPT and one with !PREEMPT. -RCU-sched: Do one with PREEMPT but not BOOST. - - -Hierarchy: - -TREE01. CONFIG_NR_CPUS=8, CONFIG_RCU_FANOUT=8, CONFIG_RCU_FANOUT_EXACT=n. -TREE02. CONFIG_NR_CPUS=8, CONFIG_RCU_FANOUT=3, CONFIG_RCU_FANOUT_EXACT=n, - CONFIG_RCU_FANOUT_LEAF=3. -TREE03. CONFIG_NR_CPUS=8, CONFIG_RCU_FANOUT=4, CONFIG_RCU_FANOUT_EXACT=n, - CONFIG_RCU_FANOUT_LEAF=4. -TREE04. CONFIG_NR_CPUS=8, CONFIG_RCU_FANOUT=2, CONFIG_RCU_FANOUT_EXACT=n, - CONFIG_RCU_FANOUT_LEAF=2. -TREE05. CONFIG_NR_CPUS=8, CONFIG_RCU_FANOUT=6, CONFIG_RCU_FANOUT_EXACT=n - CONFIG_RCU_FANOUT_LEAF=6. -TREE06. CONFIG_NR_CPUS=8, CONFIG_RCU_FANOUT=6, CONFIG_RCU_FANOUT_EXACT=y - CONFIG_RCU_FANOUT_LEAF=6. -TREE07. CONFIG_NR_CPUS=16, CONFIG_RCU_FANOUT=2, CONFIG_RCU_FANOUT_EXACT=n, - CONFIG_RCU_FANOUT_LEAF=2. -TREE08. CONFIG_NR_CPUS=16, CONFIG_RCU_FANOUT=3, CONFIG_RCU_FANOUT_EXACT=y, - CONFIG_RCU_FANOUT_LEAF=2. -TREE09. CONFIG_NR_CPUS=1. - - -Kconfig Parameters Ignored: - -CONFIG_64BIT - - Used only to check CONFIG_RCU_FANOUT value, inspection suffices. - -CONFIG_NO_HZ_FULL_SYSIDLE_SMALL - - Defer until Frederic uses this. - -CONFIG_PREEMPT_COUNT -CONFIG_PREEMPT_RCU - - Redundant with CONFIG_PREEMPT, ignore. - -CONFIG_RCU_BOOST_DELAY - - Inspection suffices, ignore. - -CONFIG_RCU_CPU_STALL_TIMEOUT - - Inspection suffices, ignore. - -CONFIG_RCU_STALL_COMMON - - Implied by TREE_RCU and TREE_PREEMPT_RCU. - -CONFIG_RCU_TORTURE_TEST -CONFIG_RCU_TORTURE_TEST_RUNNABLE - - Always used in KVM testing. - -CONFIG_RCU_USER_QS - - Redundant with CONFIG_NO_HZ_FULL. - -CONFIG_TREE_PREEMPT_RCU -CONFIG_TREE_RCU - - These are controlled by CONFIG_PREEMPT.
tools/testing/selftests/rcutorture/doc/TREE_RCU-kconfig.txt new file +95 -0
95 lines not on this page · raw message
Signature · 1 line
1.8.1.5
PATCH 45/55 rcutorture: Create CFcommon file for common Kconfig parameters
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
Currently, CONFIG_RCU_TORTURE_TEST=y is hardcoded into the kvm-test-1-rcu.sh script and CONFIG_PRINTK_TIME=y is mentioned in each and every configs file. This commit creates a CFcommon file for these two Kconfig parameters, and modifies kvm-test-1-rcu.sh to copy this new file into the .config file during the build. This change will allow these scripts to operate on torture types other than just rcutorture.
--- tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh | 8 +++++--- tools/testing/selftests/rcutorture/configs/BUSTED | 1 - tools/testing/selftests/rcutorture/configs/CFcommon | 2 ++ tools/testing/selftests/rcutorture/configs/SRCU-N | 1 - tools/testing/selftests/rcutorture/configs/SRCU-P | 1 - tools/testing/selftests/rcutorture/configs/TINY01 | 1 - tools/testing/selftests/rcutorture/configs/TINY02 | 1 - tools/testing/selftests/rcutorture/configs/TREE01 | 1 - tools/testing/selftests/rcutorture/configs/TREE02 | 1 - tools/testing/selftests/rcutorture/configs/TREE03 | 1 - tools/testing/selftests/rcutorture/configs/TREE04 | 1 - tools/testing/selftests/rcutorture/configs/TREE05 | 1 - tools/testing/selftests/rcutorture/configs/TREE06 | 1 - tools/testing/selftests/rcutorture/configs/TREE07 | 1 - tools/testing/selftests/rcutorture/configs/TREE08 | 1 - tools/testing/selftests/rcutorture/configs/TREE08-T | 1 - tools/testing/selftests/rcutorture/configs/TREE09 | 1 - 17 files changed, 7 insertions(+), 18 deletions(-) create mode 100644 tools/testing/selftests/rcutorture/configs/CFcommon
tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh +5 -3
@@ -47,6 +47,7 @@ trap 'rm -rf $T' 0 . $KVPATH/ver_functions.sh config_template=${1} +config_dir=`echo $config_template | sed -e 's,/[^/]*$,,'` title=`echo $config_template | sed -e 's/^.*\///'` builddir=${2} if test -z "$builddir" -o ! -d "$builddir" -o ! -w "$builddir"
@@ -63,9 +64,10 @@ fi cp $config_template $resdir/ConfigFragment echo ' ---' `date`: Starting build echo ' ---' Kconfig fragment at: $config_template >> $resdir/log -cat << '___EOF___' >> $T -CONFIG_RCU_TORTURE_TEST=y -___EOF___ +if test -r "$config_dir/CFcommon" +then + cat < $config_dir/CFcommon >> $T +fi # Optimizations below this point # CONFIG_USB=n # CONFIG_SECURITY=n
tools/testing/selftests/rcutorture/configs/BUSTED +0 -1
@@ -5,4 +5,3 @@ CONFIG_HOTPLUG_CPU=y CONFIG_PREEMPT_NONE=n CONFIG_PREEMPT_VOLUNTARY=n CONFIG_PREEMPT=y -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/CFcommon new file +2 -0
@@ -0,0 +1,2 @@ +CONFIG_RCU_TORTURE_TEST=y +CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/SRCU-N +0 -1
@@ -5,4 +5,3 @@ CONFIG_HOTPLUG_CPU=y CONFIG_PREEMPT_NONE=y CONFIG_PREEMPT_VOLUNTARY=n CONFIG_PREEMPT=n -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/SRCU-P +0 -1
@@ -5,4 +5,3 @@ CONFIG_HOTPLUG_CPU=y CONFIG_PREEMPT_NONE=n CONFIG_PREEMPT_VOLUNTARY=n CONFIG_PREEMPT=y -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/TINY01 +0 -1
@@ -10,4 +10,3 @@ CONFIG_RCU_TRACE=n CONFIG_DEBUG_LOCK_ALLOC=n CONFIG_DEBUG_OBJECTS_RCU_HEAD=n CONFIG_PREEMPT_COUNT=n -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/TINY02 +0 -1
@@ -10,4 +10,3 @@ CONFIG_RCU_TRACE=y CONFIG_DEBUG_LOCK_ALLOC=y CONFIG_DEBUG_OBJECTS_RCU_HEAD=n CONFIG_PREEMPT_COUNT=y -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/TREE01 +0 -1
@@ -20,4 +20,3 @@ CONFIG_RCU_CPU_STALL_INFO=n CONFIG_RCU_CPU_STALL_VERBOSE=n CONFIG_RCU_BOOST=n CONFIG_DEBUG_OBJECTS_RCU_HEAD=n -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/TREE02 +0 -1
@@ -23,4 +23,3 @@ CONFIG_RCU_CPU_STALL_INFO=n CONFIG_RCU_CPU_STALL_VERBOSE=y CONFIG_RCU_BOOST=n CONFIG_DEBUG_OBJECTS_RCU_HEAD=n -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/TREE03 +0 -1
@@ -20,4 +20,3 @@ CONFIG_RCU_CPU_STALL_VERBOSE=n CONFIG_RCU_BOOST=y CONFIG_RCU_BOOST_PRIO=2 CONFIG_DEBUG_OBJECTS_RCU_HEAD=n -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/TREE04 +0 -1
@@ -22,4 +22,3 @@ CONFIG_PROVE_RCU_DELAY=n CONFIG_RCU_CPU_STALL_INFO=y CONFIG_RCU_CPU_STALL_VERBOSE=y CONFIG_DEBUG_OBJECTS_RCU_HEAD=n -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/TREE05 +0 -1
@@ -22,4 +22,3 @@ CONFIG_PROVE_RCU_DELAY=y CONFIG_RCU_CPU_STALL_INFO=n CONFIG_RCU_CPU_STALL_VERBOSE=n CONFIG_DEBUG_OBJECTS_RCU_HEAD=n -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/TREE06 +0 -1
@@ -23,4 +23,3 @@ CONFIG_PROVE_RCU_DELAY=n CONFIG_RCU_CPU_STALL_INFO=n CONFIG_RCU_CPU_STALL_VERBOSE=n CONFIG_DEBUG_OBJECTS_RCU_HEAD=y -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/TREE07 +0 -1
@@ -21,4 +21,3 @@ CONFIG_PROVE_RCU_DELAY=n CONFIG_RCU_CPU_STALL_INFO=y CONFIG_RCU_CPU_STALL_VERBOSE=n CONFIG_DEBUG_OBJECTS_RCU_HEAD=n -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/TREE08 +0 -1
@@ -23,4 +23,3 @@ CONFIG_RCU_CPU_STALL_INFO=n CONFIG_RCU_CPU_STALL_VERBOSE=n CONFIG_RCU_BOOST=n CONFIG_DEBUG_OBJECTS_RCU_HEAD=n -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/TREE08-T +0 -1
@@ -23,4 +23,3 @@ CONFIG_RCU_CPU_STALL_INFO=n CONFIG_RCU_CPU_STALL_VERBOSE=n CONFIG_RCU_BOOST=n CONFIG_DEBUG_OBJECTS_RCU_HEAD=n -CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/TREE09 +0 -1
@@ -18,4 +18,3 @@ CONFIG_RCU_CPU_STALL_INFO=n CONFIG_RCU_CPU_STALL_VERBOSE=n CONFIG_RCU_BOOST=n CONFIG_DEBUG_OBJECTS_RCU_HEAD=n -CONFIG_PRINTK_TIME=y
Signature · 1 line
1.8.1.5
PATCH 54/55 rcutorture: Add a lock_busted to test the test
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
This commit adds a maximally broken locking primitive in which lock acquisition and release are both no-ops.
--- kernel/locking/locktorture.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-)
kernel/locking/locktorture.c +32 -1
@@ -112,6 +112,37 @@ static struct lock_torture_ops *cur_ops;* Definitions for lock torture testing. */ +static int torture_lock_busted_write_lock (void ) +{ +return 0 ;/* BUGGY, do not use in real life!!! */ +} + +static void torture_lock_busted_write_delay (struct torture_random_state *trsp) +{ +const unsigned long longdelay_us =100 ; + +/* We want a long delay occasionally to force massive contention. */ +if (!(torture_random (trsp) % + (nrealwriters_stress *2000 * longdelay_us))) +mdelay (longdelay_us); +#ifdef CONFIG_PREEMPT +if (!(torture_random (trsp) % (nrealwriters_stress *20000 ))) +preempt_schedule ();/* Allow test to be preempted. */ +#endif +} + +static void torture_lock_busted_write_unlock (void ) +{ +/* BUGGY, do not use in real life!!! */ +} + +static struct lock_torture_ops lock_busted_ops = { + .writelock = torture_lock_busted_write_lock, + .write_delay = torture_lock_busted_write_delay, + .writeunlock = torture_lock_busted_write_unlock, + .name ="lock_busted" +}; +static DEFINE_SPINLOCK (torture_spinlock); static int torture_spin_lock_write_lock(void) __acquires(torture_spinlock)
@@ -320,7 +351,7 @@ static int __init lock_torture_init(void)int i;int firsterr =0 ;static struct lock_torture_ops *torture_ops[] = { - &spin_lock_ops, &spin_lock_irq_ops, + &lock_busted_ops, &spin_lock_ops, &spin_lock_irq_ops, };torture_init_begin (torture_type, verbose, &locktorture_runnable);
Signature · 1 line
1.8.1.5
PATCH 55/55 rcutorture: Save kvm.sh output to log
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
This commit logs the progress text that kvm.sh outputs, improving after-the-fact troubleshooting.
--- tools/testing/selftests/rcutorture/bin/kvm.sh | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)
tools/testing/selftests/rcutorture/bin/kvm.sh +15 -7
@@ -297,7 +297,8 @@ awk < $T/cfgcpu.pack \ # Dump out the scripting required to run one test batch. function dump(first, pastlast) { - print "echo ----Start batch: `date`" + print "echo ----Start batch: `date`"; + print "echo ----Start batch: `date` >> " rd "/log"; jn=1 for (j = first; j < pastlast; j++) { builddir=KVM "/b" jn
@@ -314,30 +315,37 @@ function dump(first, pastlast) else ovf = ""; print "echo ", cfr[jn], cpusr[jn] ovf ": Starting build. `date`"; + print "echo ", cfr[jn], cpusr[jn] ovf ": Starting build. `date` >> " rd "/log"; print "rm -f " builddir ".*"; print "touch " builddir ".wait"; print "mkdir " builddir " > /dev/null 2>&1 || :"; print "mkdir " rd cfr[jn] " || :"; print "kvm-test-1-run.sh " CONFIGDIR cf[j], builddir, rd cfr[jn], dur " \"" RCU_QEMU_ARG "\" \"" RCU_BOOTARGS "\" > " rd cfr[jn] "/kvm-test-1-run.sh.out 2>&1 &" - print "echo ", cfr[jn], cpusr[jn] ovf ": Waiting for build to complete. `date`" + print "echo ", cfr[jn], cpusr[jn] ovf ": Waiting for build to complete. `date`"; + print "echo ", cfr[jn], cpusr[jn] ovf ": Waiting for build to complete. `date` >> " rd "/log"; print "while test -f " builddir ".wait" print "do" print "\tsleep 1" print "done" - print "echo ", cfr[jn], cpusr[jn] ovf ": Build complete. `date`" + print "echo ", cfr[jn], cpusr[jn] ovf ": Build complete. `date`"; + print "echo ", cfr[jn], cpusr[jn] ovf ": Build complete. `date` >> " rd "/log"; jn++; } for (j = 1; j < jn; j++) { builddir=KVM "/b" j print "rm -f " builddir ".ready" - print "echo ----", cfr[j], cpusr[j] ovf ": Starting kernel. `date`" + print "echo ----", cfr[j], cpusr[j] ovf ": Starting kernel. `date`"; + print "echo ----", cfr[j], cpusr[j] ovf ": Starting kernel. `date` >> " rd "/log"; } print "wait" - print "echo ---- All kernel runs complete. `date`" + print "echo ---- All kernel runs complete. `date`"; + print "echo ---- All kernel runs complete. `date` >> " rd "/log"; for (j = 1; j < jn; j++) { builddir=KVM "/b" j - print "echo ----", cfr[j], cpusr[j] ovf ": Build/run results:" - print "cat " rd cfr[j] "/kvm-test-1-run.sh.out" + print "echo ----", cfr[j], cpusr[j] ovf ": Build/run results:"; + print "echo ----", cfr[j], cpusr[j] ovf ": Build/run results: >> " rd "/log"; + print "cat " rd cfr[j] "/kvm-test-1-run.sh.out"; + print "cat " rd cfr[j] "/kvm-test-1-run.sh.out >> " rd "/log"; } }
Signature · 1 line
1.8.1.5
PATCH 37/55 rcutorture: Abstract torture_create_kthread()
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
Creation of kthreads is not RCU-specific, so this commit abstracts out torture_create_kthread(), saving a few tens of lines of code in the process.
--- include/linux/torture.h | 8 +++- kernel/rcu/rcutorture.c | 98 ++++++++++--------------------------------------- kernel/torture.c | 80 +++++++++++++++++----------------------- 3 files changed, 60 insertions(+), 126 deletions(-)
include/linux/torture.h +7 -1
@@ -47,7 +47,7 @@#define VERBOSE_TOROUT_STRING (s) \ do { if (verbose) pr_alert("%s" TORTURE_FLAG " %s\n", torture_type, s); } while (0)#define VERBOSE_TOROUT_ERRSTRING (s) \ - do { if (verbose) pr_alert("%s" TORTURE_FLAG "!!! " s "\n", torture_type); } while (0) + do { if (verbose) pr_alert("%s" TORTURE_FLAG "!!! %s\n", torture_type, s); } while (0)/* Definitions for a non-string torture-test module parameter. */ #define torture_parm (type, name, init, msg) \
@@ -89,5 +89,11 @@ bool torture_cleanup(void);bool torture_must_stop (void );bool torture_must_stop_irq (void );void torture_kthread_stopping (char *title); +int _torture_create_kthread (int (*fn)(void *arg),void *arg,char *s,char *m, +char *f,struct task_struct **tp); + +#define torture_create_kthread (n, arg, tp) \ + _torture_create_kthread(n, (arg), #n, "Creating " #n " task", \ + "Failed to create " #n, &(tp))#endif /* __LINUX_TORTURE_H */
kernel/rcu/rcutorture.c +20 -78
145 lines not on this page · raw message
kernel/torture.c +33 -47
125 lines not on this page · raw message
Signature · 1 line
1.8.1.5
PATCH 22/55 rcutorture: Abstract torture_shuffle()
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
The torture_shuffle() function forces each CPU in turn to go idle periodically in order to check for problems interacting with per-CPU variables and with dyntick-idle mode. Because this sort of debugging is not specific to RCU, this commit abstracts that functionality. This in turn requires abstracting some additional infrastructure.
--- include/linux/torture.h | 5 ++ kernel/rcu/rcutorture.c | 124 +++++---------------------------------- kernel/torture.c | 151 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 171 insertions(+), 109 deletions(-)
include/linux/torture.h +5 -0
@@ -69,6 +69,11 @@ struct torture_random_state {#define DEFINE_TORTURE_RANDOM (name) struct torture_random_state name = { 0, 0 }unsigned long torture_random (struct torture_random_state *trsp); +/* Task shuffler, which causes CPUs to occasionally go idle. */ +void torture_shuffle_task_register (struct task_struct *tp); +int torture_shuffle_init (long shuffint); +void torture_shuffle_cleanup (void ); +/* Shutdown task absorption, for when the tasks cannot safely be killed. */ void torture_shutdown_absorb (const char *title);
kernel/rcu/rcutorture.c +15 -109
223 lines not on this page · raw message
kernel/torture.c +151 -0
157 lines not on this page · raw message
Signature · 1 line
1.8.1.5
PATCH 29/55 rcutorture: Add diagnostic for unscheduled system shutdown
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
Currently, rcutorture can terminate via rmmod, via self-shutdown, via something else shutting the system down, or of course the usual catastrophic termination. The first two get flagged, so this commit adds a message for the third. For the fourth, your warranty is void as always.
--- kernel/torture.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
kernel/torture.c +4 -2
@@ -438,10 +438,12 @@ static int torture_shutdown_notify(struct notifier_block *unused1, unsigned long unused2, void *unused3) { mutex_lock(&fullstop_mutex); -if (fullstop ==FULLSTOP_DONTSTOP ) +if (fullstop ==FULLSTOP_DONTSTOP ) { +VERBOSE_TOROUT_STRING ("Unscheduled system shutdown detected" ); fullstop =FULLSTOP_SHUTDOWN ; -else + }else {pr_warn ("Concurrent rmmod and shutdown illegal!\n" ); + }mutex_unlock (&fullstop_mutex);return NOTIFY_DONE ; }
Signature · 1 line
1.8.1.5
PATCH 43/55 rcutorture: Add an rcu_busted to test the test
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
This commit adds a deliberately buggy RCU implementation into rcutorture to allow easy checking that rcutorture correctly flags buggy RCU implementations.
--- kernel/rcu/rcutorture.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-)
kernel/rcu/rcutorture.c +43 -1
@@ -370,6 +370,48 @@ static struct rcu_torture_ops rcu_bh_ops = { };/* +* Don't even think about trying any of these in real life!!! +* The names includes "busted", and they really means it! +* The only purpose of these functions is to provide a buggy RCU +* implementation to make sure that rcutorture correctly emits +* buggy-RCU error messages. +*/ +static void rcu_busted_torture_deferred_free (struct rcu_torture *p) +{ +/* This is a deliberate bug for testing purposes only! */ +rcu_torture_cb (&p->rtort_rcu); +} + +static void synchronize_rcu_busted (void ) +{ +/* This is a deliberate bug for testing purposes only! */ +} + +static void +call_rcu_busted (struct rcu_head *head,void (*func)(struct rcu_head *rcu)) +{ +/* This is a deliberate bug for testing purposes only! */ +func (head); +} + +static struct rcu_torture_ops rcu_busted_ops = { + .init = rcu_sync_torture_init, + .readlock = rcu_torture_read_lock, + .read_delay = rcu_read_delay,/* just reuse rcu's version. */ + .readunlock = rcu_torture_read_unlock, + .completed = rcu_no_completed, + .deferred_free = rcu_busted_torture_deferred_free, + .sync = synchronize_rcu_busted, + .exp_sync = synchronize_rcu_busted, + .call = call_rcu_busted, + .cb_barrier =NULL , + .fqs =NULL , + .stats =NULL , + .irq_capable =1 , + .name ="rcu_busted" +}; + +/* * Definitions for srcu torture testing. */
@@ -1369,7 +1411,7 @@ rcu_torture_init(void)int cpu;int firsterr =0 ;static struct rcu_torture_ops *torture_ops[] = { - &rcu_ops, &rcu_bh_ops, &srcu_ops, &sched_ops, + &rcu_ops, &rcu_bh_ops, &rcu_busted_ops, &srcu_ops, &sched_ops, };torture_init_begin (torture_type, verbose, &rcutorture_runnable);
Signature · 1 line
1.8.1.5
PATCH 27/55 rcutorture: Abstract torture_shutdown_notify()
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
Because handling the race between rmmod and system shutdown is not specific to RCU, this commit abstracts torture_shutdown_notify(), placing this code into kernel/torture.c. This change also allows fullstop_mutex to be private to kernel/torture.c.
--- include/linux/torture.h | 2 -- kernel/rcu/rcutorture.c | 23 ----------------------- kernel/torture.c | 29 ++++++++++++++++++++++++----- 3 files changed, 24 insertions(+), 30 deletions(-)
include/linux/torture.h +0 -2
@@ -46,8 +46,6 @@#define FULLSTOP_SHUTDOWN 1/* System shutdown with rcutorture running. */ #define FULLSTOP_RMMOD 2/* Normal rmmod of rcutorture. */ extern int fullstop; -/* Protect fullstop transitions and spawning of kthreads. */ -extern struct mutex fullstop_mutex;#define TORTURE_FLAG "-torture:"#define TOROUT_STRING (s) \
kernel/rcu/rcutorture.c +0 -23
@@ -189,23 +189,6 @@ static DECLARE_WAIT_QUEUE_HEAD(barrier_wq);static void rcu_torture_cleanup (void );/* -* Detect and respond to a system shutdown. -*/ -static int -rcutorture_shutdown_notify (struct notifier_block *unused1, -unsigned long unused2,void *unused3) -{ -mutex_lock (&fullstop_mutex); -if (fullstop ==FULLSTOP_DONTSTOP ) - fullstop =FULLSTOP_SHUTDOWN ; -else -pr_warn (/* but going down anyway, so... */ -"Concurrent 'rmmod rcutorture' and shutdown illegal!\n" ); -mutex_unlock (&fullstop_mutex); -return NOTIFY_DONE ; -} - -/* * Allocate an element from the rcu_tortures pool. */ static struct rcu_torture *
@@ -1097,10 +1080,6 @@ rcu_torture_print_module_parms(struct rcu_torture_ops *cur_ops, const char *tag) onoff_interval, onoff_holdoff); } -static struct notifier_block rcutorture_shutdown_nb = { - .notifier_call = rcutorture_shutdown_notify, -}; -static void rcutorture_booster_cleanup (int cpu) {struct task_struct *t;
@@ -1427,7 +1406,6 @@ rcu_torture_cleanup(void) cur_ops->cb_barrier ();return ; } -unregister_reboot_notifier (&rcutorture_shutdown_nb);rcu_torture_barrier_cleanup ();rcu_torture_stall_cleanup ();
@@ -1773,7 +1751,6 @@ rcu_torture_init(void) firsterr = i; goto unwind; } -register_reboot_notifier (&rcutorture_shutdown_nb); i =rcu_torture_stall_init ();if (i !=0 ) { firsterr = i;
kernel/torture.c +24 -5
@@ -54,8 +54,7 @@ static bool verbose;int fullstop =FULLSTOP_RMMOD ;EXPORT_SYMBOL_GPL (fullstop); -DEFINE_MUTEX (fullstop_mutex); -EXPORT_SYMBOL_GPL (fullstop_mutex); +static DEFINE_MUTEX (fullstop_mutex);#ifdef CONFIG_HOTPLUG_CPU
@@ -422,15 +421,33 @@ EXPORT_SYMBOL_GPL(torture_shuffle_cleanup);void torture_shutdown_absorb (const char *title) {while (ACCESS_ONCE (fullstop) ==FULLSTOP_SHUTDOWN ) { -pr_notice ( -"torture thread %s parking due to system shutdown\n" , - title); +pr_notice ("torture thread %s parking due to system shutdown\n" , + title);schedule_timeout_uninterruptible (MAX_SCHEDULE_TIMEOUT ); } }EXPORT_SYMBOL_GPL (torture_shutdown_absorb);/* +* Detect and respond to a system shutdown. +*/ +static int torture_shutdown_notify (struct notifier_block *unused1, +unsigned long unused2,void *unused3) +{ +mutex_lock (&fullstop_mutex); +if (fullstop ==FULLSTOP_DONTSTOP ) + fullstop =FULLSTOP_SHUTDOWN ; +else +pr_warn ("Concurrent rmmod and shutdown illegal!\n" ); +mutex_unlock (&fullstop_mutex); +return NOTIFY_DONE ; +} + +static struct notifier_block torture_shutdown_nb = { + .notifier_call = torture_shutdown_notify, +}; + +/* * Initialize torture module. Please note that this is -not- invoked via * the usual module_init() mechanism, but rather by an explicit call from * the client torture module. This call must be paired with a later
@@ -451,6 +468,7 @@ EXPORT_SYMBOL_GPL(torture_init_begin);void __init torture_init_end (void ) {mutex_unlock (&fullstop_mutex); +register_reboot_notifier (&torture_shutdown_nb); }EXPORT_SYMBOL_GPL (torture_init_end);
@@ -474,6 +492,7 @@ bool torture_cleanup(void) } fullstop =FULLSTOP_RMMOD ;mutex_unlock (&fullstop_mutex); +unregister_reboot_notifier (&torture_shutdown_nb);torture_shuffle_cleanup ();torture_onoff_cleanup ();return false;
Signature · 1 line
1.8.1.5
PATCH 39/55 rcutorture: Stop generic kthreads in torture_cleanup()
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
The specific torture modules (like rcutorture) need to call torture_cleanup() in any case, so this commit makes torture_cleanup() deal with torture_shutdown_cleanup() and torture_stutter_cleanup() so that the specific modules don't have to deal with these details.
--- include/linux/torture.h | 2 -- kernel/rcu/rcutorture.c | 2 -- kernel/torture.c | 37 +++++++++++++++++++------------------ 3 files changed, 19 insertions(+), 22 deletions(-)
include/linux/torture.h +0 -2
@@ -75,12 +75,10 @@ int torture_shuffle_init(long shuffint);/* Test auto-shutdown handling. */ void torture_shutdown_absorb (const char *title);int torture_shutdown_init (int ssecs,void (*cleanup)(void )); -void torture_shutdown_cleanup (void );/* Task stuttering, which forces load/no-load transitions. */ void stutter_wait (const char *title);int torture_stutter_init (int s); -void torture_stutter_cleanup (void );/* Initialization and cleanup. */ void torture_init_begin (char *ttype,bool v,int *runnable);
kernel/rcu/rcutorture.c +0 -2
@@ -1268,7 +1268,6 @@ rcu_torture_cleanup(void)rcu_torture_barrier_cleanup ();torture_stop_kthread (rcu_torture_stall, stall_task); -torture_stutter_cleanup ();torture_stop_kthread (rcu_torture_writer, writer_task);if (reader_tasks) {
@@ -1296,7 +1295,6 @@ rcu_torture_cleanup(void)for_each_possible_cpu (i)rcutorture_booster_cleanup (i); } -torture_shutdown_cleanup ();/* Wait for all RCU callbacks to fire. */
kernel/torture.c +19 -18
@@ -478,20 +478,6 @@ int torture_shutdown_init(int ssecs, void (*cleanup)(void))EXPORT_SYMBOL_GPL (torture_shutdown_init);/* -* Shut down the shutdown task. Say what??? Heh! This can happen if -* the torture module gets an rmmod before the shutdown time arrives. ;-) -*/ -void torture_shutdown_cleanup (void ) -{ -if (shutdown_task !=NULL ) { -VERBOSE_TOROUT_STRING ("Stopping torture_shutdown task" ); -kthread_stop (shutdown_task); - } - shutdown_task =NULL ; -} -EXPORT_SYMBOL_GPL (torture_shutdown_cleanup); - -/* * Detect and respond to a system shutdown. */ static int torture_shutdown_notify(struct notifier_block *unused1,
@@ -513,6 +499,20 @@ static struct notifier_block torture_shutdown_nb = { };/* +* Shut down the shutdown task. Say what??? Heh! This can happen if +* the torture module gets an rmmod before the shutdown time arrives. ;-) +*/ +static void torture_shutdown_cleanup (void ) +{ +unregister_reboot_notifier (&torture_shutdown_nb); +if (shutdown_task !=NULL ) { +VERBOSE_TOROUT_STRING ("Stopping torture_shutdown task" ); +kthread_stop (shutdown_task); + } + shutdown_task =NULL ; +} + +/* * Variables for stuttering, which means to periodically pause and * restart testing in order to catch bugs that appear when load is * suddenly applied to or removed from the system.
@@ -575,7 +575,7 @@ EXPORT_SYMBOL_GPL(torture_stutter_init);/* * Cleanup after the torture_stutter kthread. */ -void torture_stutter_cleanup (void ) +static void torture_stutter_cleanup (void ) {if (!stutter_task)return ;
@@ -583,7 +583,6 @@ void torture_stutter_cleanup(void)kthread_stop (stutter_task); stutter_task =NULL ; } -EXPORT_SYMBOL_GPL (torture_stutter_cleanup);/* * Initialize torture module. Please note that this is -not- invoked via
@@ -619,7 +618,8 @@ EXPORT_SYMBOL_GPL(torture_init_end);* Clean up torture module. Please note that this is -not- invoked via * the usual module_exit() mechanism, but rather by an explicit call from * the client torture module. Returns true if a race with system shutdown -* is detected. +* is detected, otherwise, all kthreads started by functions in this file +* will be shut down. * * This must be called before the caller starts shutting down its own * kthreads.
@@ -635,8 +635,9 @@ bool torture_cleanup(void) }ACCESS_ONCE (fullstop) =FULLSTOP_RMMOD ;mutex_unlock (&fullstop_mutex); -unregister_reboot_notifier (&torture_shutdown_nb); +torture_shutdown_cleanup ();torture_shuffle_cleanup (); +torture_stutter_cleanup ();torture_onoff_cleanup ();return false; }
Signature · 1 line
1.8.1.5
PATCH 38/55 rcutorture: Abstract torture_stop_kthread()
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
Stopping of kthreads is not RCU-specific, so this commit abstracts out torture_stop_kthread(), saving a few lines of code in the process.
--- include/linux/torture.h | 3 +++ kernel/rcu/rcutorture.c | 72 ++++++++++--------------------------------------- kernel/torture.c | 13 +++++++++ 3 files changed, 30 insertions(+), 58 deletions(-)
include/linux/torture.h +3 -0
@@ -91,9 +91,12 @@ bool torture_must_stop_irq(void);void torture_kthread_stopping (char *title);int _torture_create_kthread (int (*fn)(void *arg),void *arg,char *s,char *m,char *f,struct task_struct **tp); +void _torture_stop_kthread (char *m,struct task_struct **tp);#define torture_create_kthread (n, arg, tp) \ _torture_create_kthread(n, (arg), #n, "Creating " #n " task", \ "Failed to create " #n, &(tp)) +#define torture_stop_kthread (n, tp) \ + _torture_stop_kthread("Stopping " #n " task", &(tp))#endif /* __LINUX_TORTURE_H */
kernel/rcu/rcutorture.c +14 -58
116 lines not on this page · raw message
kernel/torture.c +13 -0
@@ -700,3 +700,16 @@ int _torture_create_kthread(int (*fn)(void *arg), void *arg, char *s, char *m,return ret; }EXPORT_SYMBOL_GPL (_torture_create_kthread); + +/* +* Stop a generic kthread, emitting a message. +*/ +void _torture_stop_kthread (char *m,struct task_struct **tp) +{ +if (*tp ==NULL ) +return ; +VERBOSE_TOROUT_STRING (m); +kthread_stop (*tp); + *tp =NULL ; +} +EXPORT_SYMBOL_GPL (_torture_stop_kthread);
Signature · 1 line
1.8.1.5
PATCH 33/55 rcutorture: Clean up rcu_torture_init() error checking
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
This commit applies some simple cleanups to rcu_torture_init() error checking.
--- kernel/rcu/rcutorture.c | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-)
kernel/rcu/rcutorture.c +10 -21
@@ -1459,7 +1459,6 @@ rcu_torture_init(void)int i;int cpu;int firsterr =0 ; -int retval;static struct rcu_torture_ops *torture_ops[] = { &rcu_ops, &rcu_bh_ops, &srcu_ops, &sched_ops, };
@@ -1628,33 +1627,23 @@ rcu_torture_init(void)for_each_possible_cpu (i) {if (cpu_is_offline (i))continue ;/* Heuristic: CPU can go offline. */ - retval =rcutorture_booster_init (i); -if (retval <0 ) { - firsterr = retval; + firsterr =rcutorture_booster_init (i); +if (firsterr) goto unwind; - } } } - i =torture_shutdown_init (shutdown_secs, rcu_torture_cleanup); -if (i !=0 ) { - firsterr = i; + firsterr =torture_shutdown_init (shutdown_secs, rcu_torture_cleanup); +if (firsterr) goto unwind; - } - i =torture_onoff_init (onoff_holdoff *HZ , onoff_interval *HZ ); -if (i !=0 ) { - firsterr = i; + firsterr =torture_onoff_init (onoff_holdoff *HZ , onoff_interval *HZ ); +if (firsterr) goto unwind; - } - i =rcu_torture_stall_init (); -if (i !=0 ) { - firsterr = i; + firsterr =rcu_torture_stall_init (); +if (firsterr) goto unwind; - } - retval =rcu_torture_barrier_init (); -if (retval !=0 ) { - firsterr = retval; + firsterr =rcu_torture_barrier_init (); +if (firsterr) goto unwind; - }if (object_debug)rcu_test_debug_objects ();rcutorture_record_test_transition ();
Signature · 1 line
1.8.1.5
PATCH 35/55 rcutorture: Fix rcutorture shutdown races
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
Not all of the rcutorture kthreads waited for kthread_should_stop() before returning from their top-level functions, and none of them used torture_shutdown_absorb() properly. These problems can result in segfaults and hangs at shutdown time, and some recent changes perturbed timing sufficiently to make them much more probable. This commit therefore creates a torture_kthread_stopping() function that does the proper kthread shutdown dance in one centralized location.
--- include/linux/torture.h | 3 ++- kernel/rcu/rcutorture.c | 39 +++++++++++---------------------------- kernel/torture.c | 26 ++++++++++++++++++++++---- 3 files changed, 35 insertions(+), 33 deletions(-)
include/linux/torture.h +2 -1
@@ -45,7 +45,7 @@#define TOROUT_STRING (s) \ pr_alert("%s" TORTURE_FLAG s "\n", torture_type)#define VERBOSE_TOROUT_STRING (s) \ - do { if (verbose) pr_alert("%s" TORTURE_FLAG s "\n", torture_type); } while (0) + do { if (verbose) pr_alert("%s" TORTURE_FLAG " %s\n", torture_type, s); } while (0)#define VERBOSE_TOROUT_ERRSTRING (s) \ do { if (verbose) pr_alert("%s" TORTURE_FLAG "!!! " s "\n", torture_type); } while (0)
@@ -88,5 +88,6 @@ void torture_init_end(void);bool torture_cleanup (void );bool torture_must_stop (void );bool torture_must_stop_irq (void ); +void torture_kthread_stopping (char *title);#endif /* __LINUX_TORTURE_H */
kernel/rcu/rcutorture.c +11 -28
@@ -601,12 +601,13 @@ checkwait: stutter_wait("rcu_torture_boost"); }while (!torture_must_stop ());/* Clean up and exit. */ -VERBOSE_TOROUT_STRING ("rcu_torture_boost task stopping" ); -torture_shutdown_absorb ("rcu_torture_boost" ); -while (!kthread_should_stop () || rbi.inflight) +while (!kthread_should_stop () || rbi.inflight) { +torture_shutdown_absorb ("rcu_torture_boost" );schedule_timeout_uninterruptible (1 ); + }smp_mb ();/* order accesses to ->inflight before stack-frame death. */ destroy_rcu_head_on_stack (&rbi.rcu); +torture_kthread_stopping ("rcu_torture_boost" );return 0 ; }
@@ -637,10 +638,7 @@ rcu_torture_fqs(void *arg) }stutter_wait ("rcu_torture_fqs" ); }while (!torture_must_stop ()); -VERBOSE_TOROUT_STRING ("rcu_torture_fqs task stopping" ); -torture_shutdown_absorb ("rcu_torture_fqs" ); -while (!kthread_should_stop ()) -schedule_timeout_uninterruptible (1 ); +torture_kthread_stopping ("rcu_torture_fqs" );return 0 ; }
@@ -709,10 +707,7 @@ rcu_torture_writer(void *arg)rcutorture_record_progress (++rcu_torture_current_version);stutter_wait ("rcu_torture_writer" ); }while (!torture_must_stop ()); -VERBOSE_TOROUT_STRING ("rcu_torture_writer task stopping" ); -torture_shutdown_absorb ("rcu_torture_writer" ); -while (!kthread_should_stop ()) -schedule_timeout_uninterruptible (1 ); +torture_kthread_stopping ("rcu_torture_writer" );return 0 ; }
@@ -747,10 +742,7 @@ rcu_torture_fakewriter(void *arg)stutter_wait ("rcu_torture_fakewriter" ); }while (!torture_must_stop ()); -VERBOSE_TOROUT_STRING ("rcu_torture_fakewriter task stopping" ); -torture_shutdown_absorb ("rcu_torture_fakewriter" ); -while (!kthread_should_stop ()) -schedule_timeout_uninterruptible (1 ); +torture_kthread_stopping ("rcu_torture_fakewriter" );return 0 ; }
@@ -891,12 +883,9 @@ rcu_torture_reader(void *arg)schedule ();stutter_wait ("rcu_torture_reader" ); }while (!torture_must_stop ()); -VERBOSE_TOROUT_STRING ("rcu_torture_reader task stopping" ); -torture_shutdown_absorb ("rcu_torture_reader" );if (irqreader && cur_ops->irq_capable)del_timer_sync (&t); -while (!kthread_should_stop ()) -schedule_timeout_uninterruptible (1 ); +torture_kthread_stopping ("rcu_torture_reader" );return 0 ; }
@@ -1009,7 +998,7 @@ rcu_torture_stats(void *arg)rcu_torture_stats_print ();torture_shutdown_absorb ("rcu_torture_stats" ); }while (!torture_must_stop ()); -VERBOSE_TOROUT_STRING ("rcu_torture_stats task stopping" ); +torture_kthread_stopping ("rcu_torture_stats" );return 0 ; }
@@ -1170,12 +1159,9 @@ static int rcu_torture_barrier_cbs(void *arg)if (atomic_dec_and_test (&barrier_cbs_count))wake_up (&barrier_wq); }while (!torture_must_stop ()); -VERBOSE_TOROUT_STRING ("rcu_torture_barrier_cbs task stopping" ); -torture_shutdown_absorb ("rcu_torture_barrier_cbs" ); -while (!kthread_should_stop ()) -schedule_timeout_interruptible (1 ); cur_ops->cb_barrier ();destroy_rcu_head_on_stack (&rcu); +torture_kthread_stopping ("rcu_torture_barrier_cbs" );return 0 ; }
@@ -1206,10 +1192,7 @@ static int rcu_torture_barrier(void *arg) n_barrier_successes++;schedule_timeout_interruptible (HZ /10 ); }while (!torture_must_stop ()); -VERBOSE_TOROUT_STRING ("rcu_torture_barrier task stopping" ); -torture_shutdown_absorb ("rcu_torture_barrier" ); -while (!kthread_should_stop ()) -schedule_timeout_interruptible (1 ); +torture_kthread_stopping ("rcu_torture_barrier" );return 0 ; }
kernel/torture.c +22 -4
@@ -169,7 +169,7 @@ torture_onoff(void *arg) }schedule_timeout_interruptible (onoff_interval); } -VERBOSE_TOROUT_STRING ("torture_onoff task stopping" ); +torture_kthread_stopping ("torture_onoff" );return 0 ; }
@@ -370,7 +370,7 @@ static int torture_shuffle(void *arg)torture_shuffle_tasks ();torture_shutdown_absorb ("torture_shuffle" ); }while (!torture_must_stop ()); -VERBOSE_TOROUT_STRING ("torture_shuffle task stopping" ); +torture_kthread_stopping ("torture_shuffle" );return 0 ; }
@@ -465,7 +465,7 @@ static int torture_shutdown(void *arg) jiffies_snap = jiffies; }if (torture_must_stop ()) { -VERBOSE_TOROUT_STRING ("torture_shutdown task stopping" ); +torture_kthread_stopping ("torture_shutdown" );return 0 ; }
@@ -583,7 +583,7 @@ static int torture_stutter(void *arg)ACCESS_ONCE (stutter_pause_test) =0 ;torture_shutdown_absorb ("torture_stutter" ); }while (!torture_must_stop ()); -VERBOSE_TOROUT_STRING ("torture_stutter task stopping" ); +torture_kthread_stopping ("torture_stutter" );return 0 ; }
@@ -696,3 +696,21 @@ bool torture_must_stop_irq(void)return ACCESS_ONCE (fullstop) !=FULLSTOP_DONTSTOP ; }EXPORT_SYMBOL_GPL (torture_must_stop_irq); + +/* +* Each kthread must wait for kthread_should_stop() before returning from +* its top-level function, otherwise segfaults ensue. This function +* prints a "stopping" message and waits for kthread_should_stop(), and +* should be called from all torture kthreads immediately prior to +* returning. +*/ +void torture_kthread_stopping (char *title) +{ +if (verbose) +pr_alert ("%s" TORTURE_FLAG " %s\n" , torture_type, title); +while (!kthread_should_stop ()) { +torture_shutdown_absorb (title); +schedule_timeout_uninterruptible (1 ); + } +} +EXPORT_SYMBOL_GPL (torture_kthread_stopping);
Signature · 1 line
1.8.1.5
PATCH 36/55 rcutorture: Fix missing-return bug in rcu_torture_barrier_init()
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
This commit adds a missing error return to the code path that creates the rcu_torture_barrier() kthread.
--- kernel/rcu/rcutorture.c | 1 + 1 file changed, 1 insertion(+)
kernel/rcu/rcutorture.c +1 -0
@@ -1244,6 +1244,7 @@ static int rcu_torture_barrier_init(void) ret =PTR_ERR (barrier_task);VERBOSE_TOROUT_ERRSTRING ("Failed to create rcu_torture_barrier" ); barrier_task =NULL ; +return ret; }torture_shuffle_task_register (barrier_task);return 0 ;
Signature · 1 line
1.8.1.5
PATCH 46/55 rcutorture: Remove RCU dependencies from ver_functions.sh API
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
The current set of functions in ver_functions.sh have APIs that are specific to RCU. This commit therefore makes an RCU-independent function that outputs version-specific boot arguments. This has the benefit that a test-type-independent call in kvm-test-1-rcu.sh can now handle any type of test, given a test-type-specific set of files in a configs directory.
--- .../selftests/rcutorture/bin/kvm-test-1-rcu.sh | 8 ++----- .../rcutorture/configs/v0.0/ver_functions.sh | 22 +++++++++---------- .../rcutorture/configs/v3.3/ver_functions.sh | 25 ++++++++++++---------- .../rcutorture/configs/v3.5/ver_functions.sh | 23 ++++++++++++++------ .../selftests/rcutorture/configs/ver_functions.sh | 21 +++++++++++++----- 5 files changed, 59 insertions(+), 40 deletions(-)
tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh +2 -6
@@ -148,12 +148,8 @@ qemu_append="`identify_qemu_append "$QEMU"`" # Pull in Kconfig-fragment boot parameters boot_args="`configfrag_boot_params "$boot_args" "$config_template"`" -# Generate CPU-hotplug boot parameters -boot_args="`rcutorture_param_onoff "$boot_args" $builddir/.config`" -# Generate rcu_barrier() boot parameter -boot_args="`rcutorture_param_n_barrier_cbs "$boot_args"`" -# Pull in standard rcutorture boot arguments -boot_args="$boot_args rcutorture.stat_interval=15 rcutorture.shutdown_secs=$seconds rcutorture.rcutorture_runnable=1 rcutorture.test_no_idle_hz=1 rcutorture.verbose=1" +# Generate kernel-version-specific boot parameters +boot_args="`per_version_boot_params "$boot_args" $builddir/.config $seconds`" echo $QEMU $qemu_args -m 512 -kernel $builddir/arch/x86/boot/bzImage -append \"$qemu_append $boot_args\" > $resdir/qemu-cmd if test -n "$RCU_BUILDONLY"
tools/testing/selftests/rcutorture/configs/v0.0/ver_functions.sh +10 -12
@@ -20,16 +20,14 @@ # # Authors: Paul E. McKenney <[email protected]> -# rcutorture_param_n_barrier_cbs bootparam-string -# -# Adds n_barrier_cbs rcutorture module parameter to kernels having it. -rcutorture_param_n_barrier_cbs () { - echo $1 -} - -# rcutorture_param_onoff bootparam-string config-file -# -# Adds onoff rcutorture module parameters to kernels having it. -rcutorture_param_onoff () { - echo $1 +# per_version_boot_params bootparam-string config-file seconds +# +# Adds per-version torture-module parameters to kernels supporting them. +# Which old kernels do not. +per_version_boot_params () { + echo rcutorture.stat_interval=15 \ + rcutorture.shutdown_secs=$3 \ + rcutorture.rcutorture_runnable=1 \ + rcutorture.test_no_idle_hz=1 \ + rcutorture.verbose=1 }
tools/testing/selftests/rcutorture/configs/v3.3/ver_functions.sh +14 -11
@@ -20,22 +20,25 @@ # # Authors: Paul E. McKenney <[email protected]> -# rcutorture_param_n_barrier_cbs bootparam-string -# -# Adds n_barrier_cbs rcutorture module parameter to kernels having it. -rcutorture_param_n_barrier_cbs () { - echo $1 -} - # rcutorture_param_onoff bootparam-string config-file # # Adds onoff rcutorture module parameters to kernels having it. rcutorture_param_onoff () { if ! bootparam_hotplug_cpu "$1" && configfrag_hotplug_cpu "$2" then - echo CPU-hotplug kernel, adding rcutorture onoff. - echo $1 rcutorture.onoff_interval=3 rcutorture.onoff_holdoff=30 - else - echo $1 + echo CPU-hotplug kernel, adding rcutorture onoff. 1>&2 + echo rcutorture.onoff_interval=3 rcutorture.onoff_holdoff=30 fi } + +# per_version_boot_params bootparam-string config-file seconds +# +# Adds per-version torture-module parameters to kernels supporting them. +per_version_boot_params () { + echo $1 `rcutorture_param_onoff "$1" "$2"` \ + rcutorture.stat_interval=15 \ + rcutorture.shutdown_secs=$3 \ + rcutorture.rcutorture_runnable=1 \ + rcutorture.test_no_idle_hz=1 \ + rcutorture.verbose=1 +}
tools/testing/selftests/rcutorture/configs/v3.5/ver_functions.sh +17 -6
@@ -26,9 +26,9 @@ rcutorture_param_n_barrier_cbs () { if echo $1 | grep -q "rcutorture\.n_barrier_cbs" then - echo $1 + : else - echo $1 rcutorture.n_barrier_cbs=4 + echo rcutorture.n_barrier_cbs=4 fi }
@@ -38,9 +38,20 @@ rcutorture_param_n_barrier_cbs () { rcutorture_param_onoff () { if ! bootparam_hotplug_cpu "$1" && configfrag_hotplug_cpu "$2" then - echo CPU-hotplug kernel, adding rcutorture onoff. - echo $1 rcutorture.onoff_interval=3 rcutorture.onoff_holdoff=30 - else - echo $1 + echo CPU-hotplug kernel, adding rcutorture onoff. 1>&2 + echo rcutorture.onoff_interval=3 rcutorture.onoff_holdoff=30 fi } + +# per_version_boot_params bootparam-string config-file seconds +# +# Adds per-version torture-module parameters to kernels supporting them. +per_version_boot_params () { + echo $1 `rcutorture_param_onoff "$1" "$2"` \ + `rcutorture_param_n_barrier_cbs "$1"` \ + rcutorture.stat_interval=15 \ + rcutorture.shutdown_secs=$3 \ + rcutorture.rcutorture_runnable=1 \ + rcutorture.test_no_idle_hz=1 \ + rcutorture.verbose=1 +}
tools/testing/selftests/rcutorture/configs/ver_functions.sh +16 -5
@@ -26,9 +26,9 @@ rcutorture_param_n_barrier_cbs () { if echo $1 | grep -q "rcutorture\.n_barrier_cbs" then - echo $1 + : else - echo $1 rcutorture.n_barrier_cbs=4 + echo rcutorture.n_barrier_cbs=4 fi }
@@ -39,8 +39,19 @@ rcutorture_param_onoff () { if ! bootparam_hotplug_cpu "$1" && configfrag_hotplug_cpu "$2" then echo CPU-hotplug kernel, adding rcutorture onoff. 1>&2 - echo $1 rcutorture.onoff_interval=3 rcutorture.onoff_holdoff=30 - else - echo $1 + echo rcutorture.onoff_interval=3 rcutorture.onoff_holdoff=30 fi } + +# per_version_boot_params bootparam-string config-file seconds +# +# Adds per-version torture-module parameters to kernels supporting them. +per_version_boot_params () { + echo $1 `rcutorture_param_onoff "$1" "$2"` \ + `rcutorture_param_n_barrier_cbs "$1"` \ + rcutorture.stat_interval=15 \ + rcutorture.shutdown_secs=$3 \ + rcutorture.rcutorture_runnable=1 \ + rcutorture.test_no_idle_hz=1 \ + rcutorture.verbose=1 +}
Signature · 1 line
1.8.1.5
PATCH 49/55 locktorture: Add vestigial locktorture configuration
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
This commit adds a trivial set of configuration files for lock torturing.
--- tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +- .../selftests/rcutorture/configs/lock/BUSTED | 6 +++ .../selftests/rcutorture/configs/lock/BUSTED.boot | 1 + .../selftests/rcutorture/configs/lock/CFLIST | 1 + .../selftests/rcutorture/configs/lock/CFcommon | 2 + .../selftests/rcutorture/configs/lock/LOCK01 | 6 +++ .../rcutorture/configs/lock/ver_functions.sh | 43 ++++++++++++++++++++++ 7 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/rcutorture/configs/lock/BUSTED create mode 100644 tools/testing/selftests/rcutorture/configs/lock/BUSTED.boot create mode 100644 tools/testing/selftests/rcutorture/configs/lock/CFLIST create mode 100644 tools/testing/selftests/rcutorture/configs/lock/CFcommon create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK01 create mode 100644 tools/testing/selftests/rcutorture/configs/lock/ver_functions.sh
tools/testing/selftests/rcutorture/bin/kvm.sh +1 -1
@@ -159,7 +159,7 @@ do shift ;; --torture) - checkarg --torture "(suite name)" "$#" "$2" '^rcu$' '^--' + checkarg --torture "(suite name)" "$#" "$2" '^\(lock\|rcu\)$' '^--' TORTURE_SUITE=$2 shift ;;
tools/testing/selftests/rcutorture/configs/lock/BUSTED new file +6 -0
@@ -0,0 +1,6 @@ +CONFIG_SMP=y +CONFIG_NR_CPUS=4 +CONFIG_HOTPLUG_CPU=y +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y
tools/testing/selftests/rcutorture/configs/lock/BUSTED.boot new file +1 -0
@@ -0,0 +1 @@ +locktorture.torture_type=lock_busted
tools/testing/selftests/rcutorture/configs/lock/CFLIST new file +1 -0
@@ -0,0 +1 @@ +LOCK01
tools/testing/selftests/rcutorture/configs/lock/CFcommon new file +2 -0
@@ -0,0 +1,2 @@ +CONFIG_LOCK_TORTURE_TEST=y +CONFIG_PRINTK_TIME=y
tools/testing/selftests/rcutorture/configs/lock/LOCK01 new file +6 -0
@@ -0,0 +1,6 @@ +CONFIG_SMP=y +CONFIG_NR_CPUS=8 +CONFIG_HOTPLUG_CPU=y +CONFIG_PREEMPT_NONE=n +CONFIG_PREEMPT_VOLUNTARY=n +CONFIG_PREEMPT=y
tools/testing/selftests/rcutorture/configs/lock/ver_functions.sh new file +43 -0
43 lines not on this page · raw message
Signature · 1 line
1.8.1.5
PATCH 15/55 rcutorture: Abstract rcu_torture_random()
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
Because rcu_torture_random() will be used by the locking equivalent to rcutorture, pull it out into its own module.
--- include/linux/torture.h | 47 ++ kernel/Makefile | 1 + kernel/rcu/Makefile | 2 +- kernel/rcu/rcutorture.c | 2125 ++++++++++++++++++++++++++++++++++++++++++++++ kernel/rcu/torture.c | 2148 ----------------------------------------------- kernel/torture.c | 71 ++ lib/Kconfig.debug | 10 + 7 files changed, 2255 insertions(+), 2149 deletions(-) create mode 100644 include/linux/torture.h create mode 100644 kernel/rcu/rcutorture.c delete mode 100644 kernel/rcu/torture.c create mode 100644 kernel/torture.c
include/linux/torture.h new file +47 -0
@@ -0,0 +1,47 @@ +/* +* Common functions for in-kernel torture tests. +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, you can access it online at +* http://www.gnu.org/licenses/gpl-2.0.html. +* +* Copyright IBM Corporation, 2014 +* +* Author: Paul E. McKenney <[email protected]> +*/ + +#ifndef __LINUX_TORTURE_H +#define __LINUX_TORTURE_H + +#include <linux/types.h> +#include <linux/cache.h> +#include <linux/spinlock.h> +#include <linux/threads.h> +#include <linux/cpumask.h> +#include <linux/seqlock.h> +#include <linux/lockdep.h> +#include <linux/completion.h> +#include <linux/debugobjects.h> +#include <linux/bug.h> +#include <linux/compiler.h> + +struct torture_random_state { +unsigned long trs_state; +long trs_count; +}; + +#define DEFINE_TORTURE_RANDOM (name) struct torture_random_state name = { 0, 0 } + +unsigned long torture_random (struct torture_random_state *trsp); + +#endif /* __LINUX_TORTURE_H */
kernel/Makefile +1 -0
@@ -93,6 +93,7 @@ obj-$(CONFIG_PADATA) += padata.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.o obj-$(CONFIG_JUMP_LABEL) += jump_label.o obj-$(CONFIG_CONTEXT_TRACKING) += context_tracking.o +obj-$(CONFIG_TORTURE_TEST) += torture.o $(obj)/configs.o: $(obj)/config_data.h
kernel/rcu/Makefile +1 -1
@@ -1,5 +1,5 @@ obj-y += update.o srcu.o -obj-$(CONFIG_RCU_TORTURE_TEST) += torture.o +obj-$(CONFIG_RCU_TORTURE_TEST) += rcutorture.o obj-$(CONFIG_TREE_RCU) += tree.o obj-$(CONFIG_TREE_PREEMPT_RCU) += tree.o obj-$(CONFIG_TREE_RCU_TRACE) += tree_trace.o
kernel/rcu/rcutorture.c new file +2125 -0
2,125 lines not on this page · raw message
kernel/rcu/torture.c deleted +0 -2148
815 lines not on this page · raw message
kernel/torture.c new file +71 -0
71 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
1.8.1.5
Part of the diff is not shown here. View the raw message.
PATCH 31/55 rcutorture: Apply ACCESS_ONCE() to racy fullstop accesses
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
Because the fullstop variable can be accessed while it is being updated, this commit avoids any resulting compiler mischief through use of ACCESS_ONCE() for non-initialization accesses to this shared variable.
--- kernel/torture.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
kernel/torture.c +5 -5
@@ -439,9 +439,9 @@ static int torture_shutdown_notify(struct notifier_block *unused1, unsigned long unused2, void *unused3) { mutex_lock(&fullstop_mutex); -if (fullstop ==FULLSTOP_DONTSTOP ) { +if (ACCESS_ONCE (fullstop) ==FULLSTOP_DONTSTOP ) {VERBOSE_TOROUT_STRING ("Unscheduled system shutdown detected" ); - fullstop =FULLSTOP_SHUTDOWN ; +ACCESS_ONCE (fullstop) =FULLSTOP_SHUTDOWN ; }else {pr_warn ("Concurrent rmmod and shutdown illegal!\n" ); }
@@ -575,13 +575,13 @@ EXPORT_SYMBOL_GPL(torture_init_end);bool torture_cleanup (void ) {mutex_lock (&fullstop_mutex); -if (fullstop ==FULLSTOP_SHUTDOWN ) { +if (ACCESS_ONCE (fullstop) ==FULLSTOP_SHUTDOWN ) {pr_warn ("Concurrent rmmod and shutdown illegal!\n" );mutex_unlock (&fullstop_mutex);schedule_timeout_uninterruptible (10 );return true; } - fullstop =FULLSTOP_RMMOD ; +ACCESS_ONCE (fullstop) =FULLSTOP_RMMOD ;mutex_unlock (&fullstop_mutex);unregister_reboot_notifier (&torture_shutdown_nb);torture_shuffle_cleanup ();
@@ -605,6 +605,6 @@ EXPORT_SYMBOL_GPL(torture_must_stop);*/ bool torture_must_stop_irq (void ) { -return fullstop !=FULLSTOP_DONTSTOP ; +return ACCESS_ONCE (fullstop) !=FULLSTOP_DONTSTOP ; }EXPORT_SYMBOL_GPL (torture_must_stop_irq);
Signature · 1 line
1.8.1.5
PATCH 18/55 rcutorture: Rename PRINTK to TOROUT
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
Since it doesn't do printk()s anymore anyway, this commit renames these macros from PRINTK to TOROUT (short for torture output).
--- kernel/rcu/rcutorture.c | 134 ++++++++++++++++++++++++------------------------ 1 file changed, 67 insertions(+), 67 deletions(-)
kernel/rcu/rcutorture.c +67 -67
@@ -97,11 +97,11 @@ module_param(torture_type, charp, 0444);MODULE_PARM_DESC (torture_type,"Type of RCU to torture (rcu, rcu_bh, ...)" );#define TORTURE_FLAG "-torture:" -#define PRINTK_STRING (s) \ +#define TOROUT_STRING (s) \ do { pr_alert("%s" TORTURE_FLAG s "\n", torture_type); } while (0) -#define VERBOSE_PRINTK_STRING (s) \ +#define VERBOSE_TOROUT_STRING (s) \ do { if (verbose) pr_alert("%s" TORTURE_FLAG s "\n", torture_type); } while (0) -#define VERBOSE_PRINTK_ERRSTRING (s) \ +#define VERBOSE_TOROUT_ERRSTRING (s) \ do { if (verbose) pr_alert("%s" TORTURE_FLAG "!!! " s "\n", torture_type); } while (0)static int nrealreaders;
@@ -618,12 +618,12 @@ static int rcu_torture_boost(void *arg)struct rcu_boost_inflight rbi = { .inflight =0 };struct sched_param sp; -VERBOSE_PRINTK_STRING ("rcu_torture_boost started" ); +VERBOSE_TOROUT_STRING ("rcu_torture_boost started" );/* Set real-time priority. */ sp.sched_priority =1 ;if (sched_setscheduler (current,SCHED_FIFO , &sp) <0 ) { -VERBOSE_PRINTK_STRING ("rcu_torture_boost RT prio failed!" ); +VERBOSE_TOROUT_STRING ("rcu_torture_boost RT prio failed!" ); n_rcu_torture_boost_rterror++; }
@@ -651,7 +651,7 @@ static int rcu_torture_boost(void *arg)call_rcu (&rbi.rcu, rcu_torture_boost_cb);if (jiffies - call_rcu_time > test_boost_duration *HZ -HZ /2 ) { -VERBOSE_PRINTK_STRING ("rcu_torture_boost boosting failed" ); +VERBOSE_TOROUT_STRING ("rcu_torture_boost boosting failed" ); n_rcu_torture_boost_failure++; } call_rcu_time = jiffies;
@@ -687,7 +687,7 @@ checkwait: rcu_stutter_wait("rcu_torture_boost"); }while (!kthread_should_stop () && fullstop ==FULLSTOP_DONTSTOP );/* Clean up and exit. */ -VERBOSE_PRINTK_STRING ("rcu_torture_boost task stopping" ); +VERBOSE_TOROUT_STRING ("rcu_torture_boost task stopping" );rcutorture_shutdown_absorb ("rcu_torture_boost" );while (!kthread_should_stop () || rbi.inflight)schedule_timeout_uninterruptible (1 );
@@ -707,7 +707,7 @@ rcu_torture_fqs(void *arg)unsigned long fqs_resume_time;int fqs_burst_remaining; -VERBOSE_PRINTK_STRING ("rcu_torture_fqs task started" ); +VERBOSE_TOROUT_STRING ("rcu_torture_fqs task started" ); do { fqs_resume_time = jiffies + fqs_stutter * HZ; while (ULONG_CMP_LT(jiffies, fqs_resume_time) &&
@@ -723,7 +723,7 @@ rcu_torture_fqs(void *arg) }rcu_stutter_wait ("rcu_torture_fqs" ); }while (!kthread_should_stop () && fullstop ==FULLSTOP_DONTSTOP ); -VERBOSE_PRINTK_STRING ("rcu_torture_fqs task stopping" ); +VERBOSE_TOROUT_STRING ("rcu_torture_fqs task stopping" );rcutorture_shutdown_absorb ("rcu_torture_fqs" );while (!kthread_should_stop ())schedule_timeout_uninterruptible (1 );
@@ -745,7 +745,7 @@ rcu_torture_writer(void *arg)struct rcu_torture *old_rp;static DEFINE_TORTURE_RANDOM (rand); -VERBOSE_PRINTK_STRING ("rcu_torture_writer task started" ); +VERBOSE_TOROUT_STRING ("rcu_torture_writer task started" );set_user_nice (current,19 ); do {
@@ -795,7 +795,7 @@ rcu_torture_writer(void *arg)rcutorture_record_progress (++rcu_torture_current_version);rcu_stutter_wait ("rcu_torture_writer" ); }while (!kthread_should_stop () && fullstop ==FULLSTOP_DONTSTOP ); -VERBOSE_PRINTK_STRING ("rcu_torture_writer task stopping" ); +VERBOSE_TOROUT_STRING ("rcu_torture_writer task stopping" );rcutorture_shutdown_absorb ("rcu_torture_writer" );while (!kthread_should_stop ())schedule_timeout_uninterruptible (1 );
@@ -811,7 +811,7 @@ rcu_torture_fakewriter(void *arg) {DEFINE_TORTURE_RANDOM (rand); -VERBOSE_PRINTK_STRING ("rcu_torture_fakewriter task started" ); +VERBOSE_TOROUT_STRING ("rcu_torture_fakewriter task started" );set_user_nice (current,19 ); do {
@@ -833,7 +833,7 @@ rcu_torture_fakewriter(void *arg)rcu_stutter_wait ("rcu_torture_fakewriter" ); }while (!kthread_should_stop () && fullstop ==FULLSTOP_DONTSTOP ); -VERBOSE_PRINTK_STRING ("rcu_torture_fakewriter task stopping" ); +VERBOSE_TOROUT_STRING ("rcu_torture_fakewriter task stopping" );rcutorture_shutdown_absorb ("rcu_torture_fakewriter" );while (!kthread_should_stop ())schedule_timeout_uninterruptible (1 );
@@ -927,7 +927,7 @@ rcu_torture_reader(void *arg)struct timer_list t;unsigned long long ts; -VERBOSE_PRINTK_STRING ("rcu_torture_reader task started" ); +VERBOSE_TOROUT_STRING ("rcu_torture_reader task started" );set_user_nice (current,19 );if (irqreader && cur_ops->irq_capable)setup_timer_on_stack (&t, rcu_torture_timer,0 );
@@ -977,7 +977,7 @@ rcu_torture_reader(void *arg)schedule ();rcu_stutter_wait ("rcu_torture_reader" ); }while (!kthread_should_stop () && fullstop ==FULLSTOP_DONTSTOP ); -VERBOSE_PRINTK_STRING ("rcu_torture_reader task stopping" ); +VERBOSE_TOROUT_STRING ("rcu_torture_reader task stopping" );rcutorture_shutdown_absorb ("rcu_torture_reader" );if (irqreader && cur_ops->irq_capable)del_timer_sync (&t);
@@ -1098,13 +1098,13 @@ rcu_torture_stats_print(void)static int rcu_torture_stats (void *arg) { -VERBOSE_PRINTK_STRING ("rcu_torture_stats task started" ); +VERBOSE_TOROUT_STRING ("rcu_torture_stats task started" );do {schedule_timeout_interruptible (stat_interval *HZ );rcu_torture_stats_print ();rcutorture_shutdown_absorb ("rcu_torture_stats" ); }while (!kthread_should_stop ()); -VERBOSE_PRINTK_STRING ("rcu_torture_stats task stopping" ); +VERBOSE_TOROUT_STRING ("rcu_torture_stats task stopping" );return 0 ; }
@@ -1182,13 +1182,13 @@ static void rcu_torture_shuffle_tasks(void)static int rcu_torture_shuffle (void *arg) { -VERBOSE_PRINTK_STRING ("rcu_torture_shuffle task started" ); +VERBOSE_TOROUT_STRING ("rcu_torture_shuffle task started" );do {schedule_timeout_interruptible (shuffle_interval *HZ );rcu_torture_shuffle_tasks ();rcutorture_shutdown_absorb ("rcu_torture_shuffle" ); }while (!kthread_should_stop ()); -VERBOSE_PRINTK_STRING ("rcu_torture_shuffle task stopping" ); +VERBOSE_TOROUT_STRING ("rcu_torture_shuffle task stopping" );return 0 ; }
@@ -1198,7 +1198,7 @@ rcu_torture_shuffle(void *arg)static int rcu_torture_stutter (void *arg) { -VERBOSE_PRINTK_STRING ("rcu_torture_stutter task started" ); +VERBOSE_TOROUT_STRING ("rcu_torture_stutter task started" ); do { schedule_timeout_interruptible(stutter * HZ); stutter_pause_test = 1;
@@ -1207,7 +1207,7 @@ rcu_torture_stutter(void *arg) stutter_pause_test =0 ;rcutorture_shutdown_absorb ("rcu_torture_stutter" ); }while (!kthread_should_stop ()); -VERBOSE_PRINTK_STRING ("rcu_torture_stutter task stopping" ); +VERBOSE_TOROUT_STRING ("rcu_torture_stutter task stopping" );return 0 ; }
@@ -1245,7 +1245,7 @@ static void rcutorture_booster_cleanup(int cpu)if (boost_tasks[cpu] ==NULL )return ;mutex_lock (&boost_mutex); -VERBOSE_PRINTK_STRING ("Stopping rcu_torture_boost task" ); +VERBOSE_TOROUT_STRING ("Stopping rcu_torture_boost task" ); t = boost_tasks[cpu]; boost_tasks[cpu] =NULL ;mutex_unlock (&boost_mutex);
@@ -1264,13 +1264,13 @@ static int rcutorture_booster_init(int cpu)/* Don't allow time recalculation while creating a new task. */ mutex_lock (&boost_mutex); -VERBOSE_PRINTK_STRING ("Creating rcu_torture_boost task" ); +VERBOSE_TOROUT_STRING ("Creating rcu_torture_boost task" ); boost_tasks[cpu] =kthread_create_on_node (rcu_torture_boost,NULL ,cpu_to_node (cpu),"rcu_torture_boost" );if (IS_ERR (boost_tasks[cpu])) { retval =PTR_ERR (boost_tasks[cpu]); -VERBOSE_PRINTK_STRING ("rcu_torture_boost task create failed" ); +VERBOSE_TOROUT_STRING ("rcu_torture_boost task create failed" ); n_rcu_torture_boost_ktrerror++; boost_tasks[cpu] =NULL ;mutex_unlock (&boost_mutex);
@@ -1292,7 +1292,7 @@ rcu_torture_shutdown(void *arg)long delta;unsigned long jiffies_snap; -VERBOSE_PRINTK_STRING ("rcu_torture_shutdown task started" ); +VERBOSE_TOROUT_STRING ("rcu_torture_shutdown task started" ); jiffies_snap =ACCESS_ONCE (jiffies);while (ULONG_CMP_LT (jiffies_snap, shutdown_time) && !kthread_should_stop ()) {
@@ -1305,13 +1305,13 @@ rcu_torture_shutdown(void *arg) jiffies_snap =ACCESS_ONCE (jiffies); }if (kthread_should_stop ()) { -VERBOSE_PRINTK_STRING ("rcu_torture_shutdown task stopping" ); +VERBOSE_TOROUT_STRING ("rcu_torture_shutdown task stopping" );return 0 ; }/* OK, shut down the system. */ -VERBOSE_PRINTK_STRING ("rcu_torture_shutdown task shutting down system" ); +VERBOSE_TOROUT_STRING ("rcu_torture_shutdown task shutting down system" ); shutdown_task =NULL ;/* Avoid self-kill deadlock. */ rcu_torture_cleanup ();/* Get the success/failure message. */ kernel_power_off ();/* Shut down the system. */
@@ -1334,14 +1334,14 @@ rcu_torture_onoff(void *arg)int ret;unsigned long starttime; -VERBOSE_PRINTK_STRING ("rcu_torture_onoff task started" ); +VERBOSE_TOROUT_STRING ("rcu_torture_onoff task started" );for_each_online_cpu (cpu) maxcpu = cpu;WARN_ON (maxcpu <0 );if (onoff_holdoff >0 ) { -VERBOSE_PRINTK_STRING ("rcu_torture_onoff begin holdoff" ); +VERBOSE_TOROUT_STRING ("rcu_torture_onoff begin holdoff" );schedule_timeout_interruptible (onoff_holdoff *HZ ); -VERBOSE_PRINTK_STRING ("rcu_torture_onoff end holdoff" ); +VERBOSE_TOROUT_STRING ("rcu_torture_onoff end holdoff" ); }while (!kthread_should_stop ()) { cpu = (torture_random (&rand) >>4 ) % (maxcpu +1 );
@@ -1408,7 +1408,7 @@ rcu_torture_onoff(void *arg) }schedule_timeout_interruptible (onoff_interval *HZ ); } -VERBOSE_PRINTK_STRING ("rcu_torture_onoff task stopping" ); +VERBOSE_TOROUT_STRING ("rcu_torture_onoff task stopping" );return 0 ; }
@@ -1432,7 +1432,7 @@ static void rcu_torture_onoff_cleanup(void) {if (onoff_task ==NULL )return ; -VERBOSE_PRINTK_STRING ("Stopping rcu_torture_onoff task" ); +VERBOSE_TOROUT_STRING ("Stopping rcu_torture_onoff task" );kthread_stop (onoff_task); onoff_task =NULL ; }
@@ -1459,11 +1459,11 @@ static int rcu_torture_stall(void *args) {unsigned long stop_at; -VERBOSE_PRINTK_STRING ("rcu_torture_stall task started" ); +VERBOSE_TOROUT_STRING ("rcu_torture_stall task started" );if (stall_cpu_holdoff >0 ) { -VERBOSE_PRINTK_STRING ("rcu_torture_stall begin holdoff" ); +VERBOSE_TOROUT_STRING ("rcu_torture_stall begin holdoff" );schedule_timeout_interruptible (stall_cpu_holdoff *HZ ); -VERBOSE_PRINTK_STRING ("rcu_torture_stall end holdoff" ); +VERBOSE_TOROUT_STRING ("rcu_torture_stall end holdoff" ); }if (!kthread_should_stop ()) { stop_at =get_seconds () + stall_cpu;
@@ -1504,7 +1504,7 @@ static void rcu_torture_stall_cleanup(void) {if (stall_task ==NULL )return ; -VERBOSE_PRINTK_STRING ("Stopping rcu_torture_stall_task." ); +VERBOSE_TOROUT_STRING ("Stopping rcu_torture_stall_task." );kthread_stop (stall_task); stall_task =NULL ; }
@@ -1524,7 +1524,7 @@ static int rcu_torture_barrier_cbs(void *arg)struct rcu_head rcu;init_rcu_head_on_stack (&rcu); -VERBOSE_PRINTK_STRING ("rcu_torture_barrier_cbs task started" ); +VERBOSE_TOROUT_STRING ("rcu_torture_barrier_cbs task started" );set_user_nice (current,19 ); do { wait_event(barrier_cbs_wq[myid],
@@ -1540,7 +1540,7 @@ static int rcu_torture_barrier_cbs(void *arg)if (atomic_dec_and_test (&barrier_cbs_count))wake_up (&barrier_wq); }while (!kthread_should_stop () && fullstop ==FULLSTOP_DONTSTOP ); -VERBOSE_PRINTK_STRING ("rcu_torture_barrier_cbs task stopping" ); +VERBOSE_TOROUT_STRING ("rcu_torture_barrier_cbs task stopping" );rcutorture_shutdown_absorb ("rcu_torture_barrier_cbs" );while (!kthread_should_stop ())schedule_timeout_interruptible (1 );
@@ -1554,7 +1554,7 @@ static int rcu_torture_barrier(void *arg) {int i; -VERBOSE_PRINTK_STRING ("rcu_torture_barrier task starting" ); +VERBOSE_TOROUT_STRING ("rcu_torture_barrier task starting" ); do { atomic_set(&barrier_cbs_invoked, 0); atomic_set(&barrier_cbs_count, n_barrier_cbs);
@@ -1577,7 +1577,7 @@ static int rcu_torture_barrier(void *arg) n_barrier_successes++;schedule_timeout_interruptible (HZ /10 ); }while (!kthread_should_stop () && fullstop ==FULLSTOP_DONTSTOP ); -VERBOSE_PRINTK_STRING ("rcu_torture_barrier task stopping" ); +VERBOSE_TOROUT_STRING ("rcu_torture_barrier task stopping" );rcutorture_shutdown_absorb ("rcu_torture_barrier" );while (!kthread_should_stop ())schedule_timeout_interruptible (1 );
@@ -1618,7 +1618,7 @@ static int rcu_torture_barrier_init(void) "rcu_torture_barrier_cbs");if (IS_ERR (barrier_cbs_tasks[i])) { ret =PTR_ERR (barrier_cbs_tasks[i]); -VERBOSE_PRINTK_ERRSTRING ("Failed to create rcu_torture_barrier_cbs" ); +VERBOSE_TOROUT_ERRSTRING ("Failed to create rcu_torture_barrier_cbs" ); barrier_cbs_tasks[i] =NULL ;return ret; }
@@ -1627,7 +1627,7 @@ static int rcu_torture_barrier_init(void) "rcu_torture_barrier");if (IS_ERR (barrier_task)) { ret =PTR_ERR (barrier_task); -VERBOSE_PRINTK_ERRSTRING ("Failed to create rcu_torture_barrier" ); +VERBOSE_TOROUT_ERRSTRING ("Failed to create rcu_torture_barrier" ); barrier_task =NULL ; }return 0 ;
@@ -1639,14 +1639,14 @@ static void rcu_torture_barrier_cleanup(void)int i;if (barrier_task !=NULL ) { -VERBOSE_PRINTK_STRING ("Stopping rcu_torture_barrier task" ); +VERBOSE_TOROUT_STRING ("Stopping rcu_torture_barrier task" );kthread_stop (barrier_task); barrier_task =NULL ; }if (barrier_cbs_tasks !=NULL ) {for (i =0 ; i < n_barrier_cbs; i++) {if (barrier_cbs_tasks[i] !=NULL ) { -VERBOSE_PRINTK_STRING ("Stopping rcu_torture_barrier_cbs task" ); +VERBOSE_TOROUT_STRING ("Stopping rcu_torture_barrier_cbs task" );kthread_stop (barrier_cbs_tasks[i]); barrier_cbs_tasks[i] =NULL ; }
@@ -1705,19 +1705,19 @@ rcu_torture_cleanup(void)rcu_torture_barrier_cleanup ();rcu_torture_stall_cleanup ();if (stutter_task) { -VERBOSE_PRINTK_STRING ("Stopping rcu_torture_stutter task" ); +VERBOSE_TOROUT_STRING ("Stopping rcu_torture_stutter task" );kthread_stop (stutter_task); } stutter_task =NULL ;if (shuffler_task) { -VERBOSE_PRINTK_STRING ("Stopping rcu_torture_shuffle task" ); +VERBOSE_TOROUT_STRING ("Stopping rcu_torture_shuffle task" );kthread_stop (shuffler_task);free_cpumask_var (shuffle_tmp_mask); } shuffler_task =NULL ;if (writer_task) { -VERBOSE_PRINTK_STRING ("Stopping rcu_torture_writer task" ); +VERBOSE_TOROUT_STRING ("Stopping rcu_torture_writer task" );kthread_stop (writer_task); } writer_task =NULL ;
@@ -1725,7 +1725,7 @@ rcu_torture_cleanup(void)if (reader_tasks) {for (i =0 ; i < nrealreaders; i++) {if (reader_tasks[i]) { -VERBOSE_PRINTK_STRING ( +VERBOSE_TOROUT_STRING ("Stopping rcu_torture_reader task" );kthread_stop (reader_tasks[i]); }
@@ -1739,7 +1739,7 @@ rcu_torture_cleanup(void)if (fakewriter_tasks) {for (i =0 ; i < nfakewriters; i++) {if (fakewriter_tasks[i]) { -VERBOSE_PRINTK_STRING ( +VERBOSE_TOROUT_STRING ("Stopping rcu_torture_fakewriter task" );kthread_stop (fakewriter_tasks[i]); }
@@ -1750,13 +1750,13 @@ rcu_torture_cleanup(void) }if (stats_task) { -VERBOSE_PRINTK_STRING ("Stopping rcu_torture_stats task" ); +VERBOSE_TOROUT_STRING ("Stopping rcu_torture_stats task" );kthread_stop (stats_task); } stats_task =NULL ;if (fqs_task) { -VERBOSE_PRINTK_STRING ("Stopping rcu_torture_fqs task" ); +VERBOSE_TOROUT_STRING ("Stopping rcu_torture_fqs task" );kthread_stop (fqs_task); } fqs_task =NULL ;
@@ -1767,7 +1767,7 @@ rcu_torture_cleanup(void)rcutorture_booster_cleanup (i); }if (shutdown_task !=NULL ) { -VERBOSE_PRINTK_STRING ("Stopping rcu_torture_shutdown task" ); +VERBOSE_TOROUT_STRING ("Stopping rcu_torture_shutdown task" );kthread_stop (shutdown_task); } shutdown_task =NULL ;
@@ -1923,12 +1923,12 @@ rcu_torture_init(void)/* Start up the kthreads. */ -VERBOSE_PRINTK_STRING ("Creating rcu_torture_writer task" ); +VERBOSE_TOROUT_STRING ("Creating rcu_torture_writer task" ); writer_task =kthread_create (rcu_torture_writer,NULL ,"rcu_torture_writer" );if (IS_ERR (writer_task)) { firsterr =PTR_ERR (writer_task); -VERBOSE_PRINTK_ERRSTRING ("Failed to create writer" ); +VERBOSE_TOROUT_ERRSTRING ("Failed to create writer" ); writer_task =NULL ; goto unwind; }
@@ -1936,17 +1936,17 @@ rcu_torture_init(void) fakewriter_tasks =kzalloc (nfakewriters *sizeof (fakewriter_tasks[0 ]),GFP_KERNEL );if (fakewriter_tasks ==NULL ) { -VERBOSE_PRINTK_ERRSTRING ("out of memory" ); +VERBOSE_TOROUT_ERRSTRING ("out of memory" ); firsterr = -ENOMEM ; goto unwind; }for (i =0 ; i < nfakewriters; i++) { -VERBOSE_PRINTK_STRING ("Creating rcu_torture_fakewriter task" ); +VERBOSE_TOROUT_STRING ("Creating rcu_torture_fakewriter task" ); fakewriter_tasks[i] =kthread_run (rcu_torture_fakewriter,NULL ,"rcu_torture_fakewriter" );if (IS_ERR (fakewriter_tasks[i])) { firsterr =PTR_ERR (fakewriter_tasks[i]); -VERBOSE_PRINTK_ERRSTRING ("Failed to create fakewriter" ); +VERBOSE_TOROUT_ERRSTRING ("Failed to create fakewriter" ); fakewriter_tasks[i] =NULL ; goto unwind; }
@@ -1954,28 +1954,28 @@ rcu_torture_init(void) reader_tasks =kzalloc (nrealreaders *sizeof (reader_tasks[0 ]),GFP_KERNEL );if (reader_tasks ==NULL ) { -VERBOSE_PRINTK_ERRSTRING ("out of memory" ); +VERBOSE_TOROUT_ERRSTRING ("out of memory" ); firsterr = -ENOMEM ; goto unwind; }for (i =0 ; i < nrealreaders; i++) { -VERBOSE_PRINTK_STRING ("Creating rcu_torture_reader task" ); +VERBOSE_TOROUT_STRING ("Creating rcu_torture_reader task" ); reader_tasks[i] =kthread_run (rcu_torture_reader,NULL ,"rcu_torture_reader" );if (IS_ERR (reader_tasks[i])) { firsterr =PTR_ERR (reader_tasks[i]); -VERBOSE_PRINTK_ERRSTRING ("Failed to create reader" ); +VERBOSE_TOROUT_ERRSTRING ("Failed to create reader" ); reader_tasks[i] =NULL ; goto unwind; } }if (stat_interval >0 ) { -VERBOSE_PRINTK_STRING ("Creating rcu_torture_stats task" ); +VERBOSE_TOROUT_STRING ("Creating rcu_torture_stats task" ); stats_task =kthread_run (rcu_torture_stats,NULL ,"rcu_torture_stats" );if (IS_ERR (stats_task)) { firsterr =PTR_ERR (stats_task); -VERBOSE_PRINTK_ERRSTRING ("Failed to create stats" ); +VERBOSE_TOROUT_ERRSTRING ("Failed to create stats" ); stats_task =NULL ; goto unwind; }
@@ -1985,7 +1985,7 @@ rcu_torture_init(void)if (!alloc_cpumask_var (&shuffle_tmp_mask,GFP_KERNEL )) { firsterr = -ENOMEM ; -VERBOSE_PRINTK_ERRSTRING ("Failed to alloc mask" ); +VERBOSE_TOROUT_ERRSTRING ("Failed to alloc mask" ); goto unwind; }
@@ -1995,7 +1995,7 @@ rcu_torture_init(void)if (IS_ERR (shuffler_task)) {free_cpumask_var (shuffle_tmp_mask); firsterr =PTR_ERR (shuffler_task); -VERBOSE_PRINTK_ERRSTRING ("Failed to create shuffler" ); +VERBOSE_TOROUT_ERRSTRING ("Failed to create shuffler" ); shuffler_task =NULL ; goto unwind; }
@@ -2008,7 +2008,7 @@ rcu_torture_init(void) "rcu_torture_stutter");if (IS_ERR (stutter_task)) { firsterr =PTR_ERR (stutter_task); -VERBOSE_PRINTK_ERRSTRING ("Failed to create stutter" ); +VERBOSE_TOROUT_ERRSTRING ("Failed to create stutter" ); stutter_task =NULL ; goto unwind; }
@@ -2021,7 +2021,7 @@ rcu_torture_init(void) "rcu_torture_fqs");if (IS_ERR (fqs_task)) { firsterr =PTR_ERR (fqs_task); -VERBOSE_PRINTK_ERRSTRING ("Failed to create fqs" ); +VERBOSE_TOROUT_ERRSTRING ("Failed to create fqs" ); fqs_task =NULL ; goto unwind; }
@@ -2051,7 +2051,7 @@ rcu_torture_init(void) "rcu_torture_shutdown");if (IS_ERR (shutdown_task)) { firsterr =PTR_ERR (shutdown_task); -VERBOSE_PRINTK_ERRSTRING ("Failed to create shutdown" ); +VERBOSE_TOROUT_ERRSTRING ("Failed to create shutdown" ); shutdown_task =NULL ; goto unwind; }
Signature · 1 line
1.8.1.5
PATCH 34/55 rcutorture: Announce task creation
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
A few "stealth-start rcutorture kthreads" have accumulated over the years, so this commit adds console-log announcements (but only if the torture tests are running verbose).
--- kernel/rcu/rcutorture.c | 4 ++++ kernel/torture.c | 4 ++++ 2 files changed, 8 insertions(+)
kernel/rcu/rcutorture.c +4 -0
@@ -1119,6 +1119,7 @@ static int __init rcu_torture_stall_init(void)if (stall_cpu <=0 )return 0 ; +VERBOSE_TOROUT_STRING ("Creating rcu_torture_stall task" ); stall_task =kthread_run (rcu_torture_stall,NULL ,"rcu_torture_stall" );if (IS_ERR (stall_task)) { ret =PTR_ERR (stall_task);
@@ -1241,6 +1242,7 @@ static int rcu_torture_barrier_init(void)return -ENOMEM ;for (i =0 ; i < n_barrier_cbs; i++) {init_waitqueue_head (&barrier_cbs_wq[i]); +VERBOSE_TOROUT_STRING ("Creating rcu_torture_barrier_cbs task" ); barrier_cbs_tasks[i] =kthread_run (rcu_torture_barrier_cbs, (void *)(long )i,"rcu_torture_barrier_cbs" );
@@ -1252,6 +1254,7 @@ static int rcu_torture_barrier_init(void) }torture_shuffle_task_register (barrier_cbs_tasks[i]); } +VERBOSE_TOROUT_STRING ("Creating rcu_torture_barrier task" ); barrier_task =kthread_run (rcu_torture_barrier,NULL ,"rcu_torture_barrier" );if (IS_ERR (barrier_task)) {
@@ -1605,6 +1608,7 @@ rcu_torture_init(void) fqs_duration =0 ;if (fqs_duration) {/* Create the fqs thread */ +VERBOSE_TOROUT_STRING ("Creating rcu_torture_fqs task" ); fqs_task =kthread_run (rcu_torture_fqs,NULL ,"rcu_torture_fqs" );if (IS_ERR (fqs_task)) {
kernel/torture.c +4 -0
@@ -187,6 +187,7 @@ int torture_onoff_init(long ooholdoff, long oointerval) onoff_interval = oointerval;if (onoff_interval <=0 )return 0 ; +VERBOSE_TOROUT_STRING ("Creating torture_onoff task" ); onoff_task =kthread_run (torture_onoff,NULL ,"torture_onoff" );if (IS_ERR (onoff_task)) { ret =PTR_ERR (onoff_task);
@@ -390,6 +391,7 @@ int torture_shuffle_init(long shuffint) }/* Create the shuffler thread */ +VERBOSE_TOROUT_STRING ("Creating torture_shuffle task" ); shuffler_task =kthread_run (torture_shuffle,NULL ,"torture_shuffle" );if (IS_ERR (shuffler_task)) { ret =PTR_ERR (shuffler_task);
@@ -486,6 +488,7 @@ int torture_shutdown_init(int ssecs, void (*cleanup)(void)) shutdown_secs = ssecs; torture_shutdown_hook = cleanup;if (shutdown_secs >0 ) { +VERBOSE_TOROUT_STRING ("Creating torture_shutdown task" ); shutdown_time = jiffies + shutdown_secs *HZ ; shutdown_task =kthread_create (torture_shutdown,NULL ,"torture_shutdown" );
@@ -592,6 +595,7 @@ int torture_stutter_init(int s)int ret; stutter = s; +VERBOSE_TOROUT_STRING ("Creating torture_stutter task" ); stutter_task =kthread_run (torture_stutter,NULL ,"torture_stutter" );if (IS_ERR (stutter_task)) { ret =PTR_ERR (stutter_task);
Signature · 1 line
1.8.1.5
PATCH 28/55 rcutorture: Privatize fullstop
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
This commit introduces the torture_must_stop() function in order to keep use of the fullstop variable local to kernel/torture.c. There is also a torture_must_stop_irq() counterpart for use from RCU callbacks, timeout handlers, and the like.
--- include/linux/torture.h | 8 ++------ kernel/rcu/rcutorture.c | 38 +++++++++++++++----------------------- kernel/torture.c | 27 +++++++++++++++++++++++++-- 3 files changed, 42 insertions(+), 31 deletions(-)
include/linux/torture.h +2 -6
@@ -41,12 +41,6 @@module_param (name, type,0444 ); \MODULE_PARM_DESC (name, msg); -/* Mediate rmmod and system shutdown. Concurrent rmmod & shutdown illegal! */ -#define FULLSTOP_DONTSTOP 0/* Normal operation. */ -#define FULLSTOP_SHUTDOWN 1/* System shutdown with rcutorture running. */ -#define FULLSTOP_RMMOD 2/* Normal rmmod of rcutorture. */ -extern int fullstop; -#define TORTURE_FLAG "-torture:"#define TOROUT_STRING (s) \ pr_alert("%s" TORTURE_FLAG s "\n", torture_type)
@@ -85,5 +79,7 @@ void torture_shutdown_absorb(const char *title);void torture_init_begin (char *ttype,bool v);void torture_init_end (void );bool torture_cleanup (void ); +bool torture_must_stop (void ); +bool torture_must_stop_irq (void );#endif /* __LINUX_TORTURE_H */
kernel/rcu/rcutorture.c +15 -23
@@ -303,7 +303,7 @@ rcu_torture_cb(struct rcu_head *p)int i; struct rcu_torture *rp = container_of(p, struct rcu_torture, rtort_rcu); -if (fullstop !=FULLSTOP_DONTSTOP ) { +if (torture_must_stop_irq ()) {/* Test is ending, just drop callbacks on the floor. */ /* The next initialization will pick up the pieces. */ return ;
@@ -571,8 +571,7 @@ static int rcu_torture_boost(void *arg)while (ULONG_CMP_LT (jiffies, oldstarttime)) {schedule_timeout_interruptible (oldstarttime - jiffies);rcu_stutter_wait ("rcu_torture_boost" ); -if (kthread_should_stop () || - fullstop !=FULLSTOP_DONTSTOP ) +if (torture_must_stop ()) goto checkwait; }
@@ -594,8 +593,7 @@ static int rcu_torture_boost(void *arg) }cond_resched ();rcu_stutter_wait ("rcu_torture_boost" ); -if (kthread_should_stop () || - fullstop !=FULLSTOP_DONTSTOP ) +if (torture_must_stop ()) goto checkwait; }
@@ -620,7 +618,7 @@ static int rcu_torture_boost(void *arg)/* Go do the stutter. */ checkwait:rcu_stutter_wait ("rcu_torture_boost" ); - }while (!kthread_should_stop () && fullstop ==FULLSTOP_DONTSTOP ); + }while (!torture_must_stop ());/* Clean up and exit. */ VERBOSE_TOROUT_STRING ("rcu_torture_boost task stopping" );
@@ -658,7 +656,7 @@ rcu_torture_fqs(void *arg) fqs_burst_remaining -= fqs_holdoff; }rcu_stutter_wait ("rcu_torture_fqs" ); - }while (!kthread_should_stop () && fullstop ==FULLSTOP_DONTSTOP ); + }while (!torture_must_stop ());VERBOSE_TOROUT_STRING ("rcu_torture_fqs task stopping" );torture_shutdown_absorb ("rcu_torture_fqs" );while (!kthread_should_stop ())
@@ -730,7 +728,7 @@ rcu_torture_writer(void *arg) }rcutorture_record_progress (++rcu_torture_current_version);rcu_stutter_wait ("rcu_torture_writer" ); - }while (!kthread_should_stop () && fullstop ==FULLSTOP_DONTSTOP ); + }while (!torture_must_stop ());VERBOSE_TOROUT_STRING ("rcu_torture_writer task stopping" );torture_shutdown_absorb ("rcu_torture_writer" );while (!kthread_should_stop ())
@@ -767,7 +765,7 @@ rcu_torture_fakewriter(void *arg) cur_ops->exp_sync (); }rcu_stutter_wait ("rcu_torture_fakewriter" ); - }while (!kthread_should_stop () && fullstop ==FULLSTOP_DONTSTOP ); + }while (!torture_must_stop ());VERBOSE_TOROUT_STRING ("rcu_torture_fakewriter task stopping" );torture_shutdown_absorb ("rcu_torture_fakewriter" );
@@ -912,7 +910,7 @@ rcu_torture_reader(void *arg) cur_ops->readunlock (idx);schedule ();rcu_stutter_wait ("rcu_torture_reader" ); - }while (!kthread_should_stop () && fullstop ==FULLSTOP_DONTSTOP ); + }while (!torture_must_stop ());VERBOSE_TOROUT_STRING ("rcu_torture_reader task stopping" );torture_shutdown_absorb ("rcu_torture_reader" );if (irqreader && cur_ops->irq_capable)
@@ -1021,9 +1019,6 @@ rcu_torture_stats_print(void)/* * Periodically prints torture statistics, if periodic statistics printing * was specified via the stat_interval module parameter. -* -* No need to worry about fullstop here, since this one doesn't reference -* volatile state or register callbacks. */ static int rcu_torture_stats (void *arg)
@@ -1033,7 +1028,7 @@ rcu_torture_stats(void *arg)schedule_timeout_interruptible (stat_interval *HZ );rcu_torture_stats_print ();torture_shutdown_absorb ("rcu_torture_stats" ); - }while (!kthread_should_stop ()); + }while (!torture_must_stop ());VERBOSE_TOROUT_STRING ("rcu_torture_stats task stopping" );return 0 ; }
@@ -1240,16 +1235,15 @@ static int rcu_torture_barrier_cbs(void *arg)wait_event (barrier_cbs_wq[myid], (newphase =ACCESS_ONCE (barrier_phase)) != lastphase || -kthread_should_stop () || - fullstop !=FULLSTOP_DONTSTOP ); +torture_must_stop ()); lastphase = newphase;smp_mb ();/* ensure barrier_phase load before ->call(). */ -if (kthread_should_stop () || fullstop !=FULLSTOP_DONTSTOP ) +if (torture_must_stop ())break ; cur_ops->call (&rcu, rcu_torture_barrier_cbf);if (atomic_dec_and_test (&barrier_cbs_count))wake_up (&barrier_wq); - }while (!kthread_should_stop () && fullstop ==FULLSTOP_DONTSTOP ); + }while (!torture_must_stop ());VERBOSE_TOROUT_STRING ("rcu_torture_barrier_cbs task stopping" );torture_shutdown_absorb ("rcu_torture_barrier_cbs" );while (!kthread_should_stop ())
@@ -1274,9 +1268,8 @@ static int rcu_torture_barrier(void *arg)wake_up (&barrier_cbs_wq[i]);wait_event (barrier_wq,atomic_read (&barrier_cbs_count) ==0 || -kthread_should_stop () || - fullstop !=FULLSTOP_DONTSTOP ); -if (kthread_should_stop () || fullstop !=FULLSTOP_DONTSTOP ) +torture_must_stop ()); +if (torture_must_stop ())break ; n_barrier_attempts++; cur_ops->cb_barrier ();/* Implies smp_mb() for wait_event(). */
@@ -1286,7 +1279,7 @@ static int rcu_torture_barrier(void *arg) } n_barrier_successes++;schedule_timeout_interruptible (HZ /10 ); - }while (!kthread_should_stop () && fullstop ==FULLSTOP_DONTSTOP ); + }while (!torture_must_stop ());VERBOSE_TOROUT_STRING ("rcu_torture_barrier task stopping" );torture_shutdown_absorb ("rcu_torture_barrier" );while (!kthread_should_stop ())
@@ -1584,7 +1577,6 @@ rcu_torture_init(void)else nrealreaders =2 *num_online_cpus ();rcu_torture_print_module_parms (cur_ops,"Start of test" ); - fullstop =FULLSTOP_DONTSTOP ;/* Set up the freelist. */
kernel/torture.c +25 -2
@@ -52,8 +52,11 @@ MODULE_AUTHOR("Paul E. McKenney <[email protected]>");static char *torture_type;static bool verbose; -int fullstop =FULLSTOP_RMMOD ; -EXPORT_SYMBOL_GPL (fullstop); +/* Mediate rmmod and system shutdown. Concurrent rmmod & shutdown illegal! */ +#define FULLSTOP_DONTSTOP 0/* Normal operation. */ +#define FULLSTOP_SHUTDOWN 1/* System shutdown with torture running. */ +#define FULLSTOP_RMMOD 2/* Normal rmmod of torture. */ +static int fullstop =FULLSTOP_RMMOD ;static DEFINE_MUTEX (fullstop_mutex);#ifdef CONFIG_HOTPLUG_CPU
@@ -458,6 +461,7 @@ void __init torture_init_begin(char *ttype, bool v)mutex_lock (&fullstop_mutex); torture_type = ttype; verbose = v; + fullstop =FULLSTOP_DONTSTOP ; }EXPORT_SYMBOL_GPL (torture_init_begin);
@@ -498,3 +502,22 @@ bool torture_cleanup(void)return false; }EXPORT_SYMBOL_GPL (torture_cleanup); + +/* +* Is it time for the current torture test to stop? +*/ +bool torture_must_stop (void ) +{ +return torture_must_stop_irq () ||kthread_should_stop (); +} +EXPORT_SYMBOL_GPL (torture_must_stop); + +/* +* Is it time for the current torture test to stop? This is the irq-safe +* version, hence no check for kthread_should_stop(). +*/ +bool torture_must_stop_irq (void ) +{ +return fullstop !=FULLSTOP_DONTSTOP ; +} +EXPORT_SYMBOL_GPL (torture_must_stop_irq);
Signature · 1 line
1.8.1.5
PATCH 30/55 rcutorture: Abstract stutter_wait()
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
Because stuttering the test load (stopping and restarting it) is useful for non-RCU testing, this commit moves the load-stuttering functionality to kernel/torture.c.
--- include/linux/torture.h | 7 +++- kernel/rcu/rcutorture.c | 69 +++++++-------------------------------- kernel/torture.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 104 insertions(+), 59 deletions(-)
include/linux/torture.h +6 -1
@@ -75,8 +75,13 @@ int torture_shuffle_init(long shuffint);/* Shutdown task absorption, for when the tasks cannot safely be killed. */ void torture_shutdown_absorb (const char *title); +/* Task stuttering, which forces load/no-load transitions. */ +void stutter_wait (const char *title); +int torture_stutter_init (int s); +void torture_stutter_cleanup (void ); +/* Initialization and cleanup. */ -void torture_init_begin (char *ttype,bool v); +void torture_init_begin (char *ttype,bool v,int *runnable);void torture_init_end (void );bool torture_cleanup (void );bool torture_must_stop (void );
kernel/rcu/rcutorture.c +12 -57
158 lines not on this page · raw message
kernel/torture.c +86 -1
108 lines not on this page · raw message
Signature · 1 line
1.8.1.5
PATCH 24/55 rcutorture: Abstract torture-test initialization
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
This commit creates torture_init_begin() and torture_init_end() functions to abstract locking and allow the torture_type and verbose variables in kernel/torture.o to become static. With a bit more abstraction, fullstop_mutex will also become static.
--- include/linux/torture.h | 9 +++++---- kernel/rcu/rcutorture.c | 19 ++++++++----------- kernel/torture.c | 27 +++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 15 deletions(-)
include/linux/torture.h +5 -4
@@ -49,10 +49,6 @@ extern int fullstop;/* Protect fullstop transitions and spawning of kthreads. */ extern struct mutex fullstop_mutex; -/* Common module parameters. */ -extern char *torture_type; -extern bool verbose; -#define TORTURE_FLAG "-torture:"#define TOROUT_STRING (s) \ pr_alert("%s" TORTURE_FLAG s "\n", torture_type)
@@ -89,4 +85,9 @@ void torture_shuffle_cleanup(void);/* Shutdown task absorption, for when the tasks cannot safely be killed. */ void torture_shutdown_absorb (const char *title); +/* Initialization and cleanup. */ + +void torture_init_begin (char *ttype,bool v); +void torture_init_end (void ); +#endif /* __LINUX_TORTURE_H */
kernel/rcu/rcutorture.c +8 -11
@@ -90,15 +90,12 @@ torture_parm(int, test_boost_interval, 7, "Interval between boost tests, seconds.");torture_parm (bool, test_no_idle_hz, true,"Test support for tickless idle CPUs" ); +torture_parm (bool, verbose, true, +"Enable verbose debugging printk()s" ); -char *torture_type ="rcu" ; -EXPORT_SYMBOL_GPL (torture_type); +static char *torture_type ="rcu" ;module_param (torture_type, charp,0444 );MODULE_PARM_DESC (torture_type,"Type of RCU to torture (rcu, rcu_bh, ...)" ); -bool verbose; -EXPORT_SYMBOL_GPL (verbose); -module_param (verbose, bool,0444 ); -MODULE_PARM_DESC (verbose,"Enable verbose debugging printk()s" );static int nrealreaders;static struct task_struct *writer_task;
@@ -1424,8 +1421,8 @@ rcu_torture_cleanup(void) {int i; -mutex_lock (&fullstop_mutex);rcutorture_record_test_transition (); +mutex_lock (&fullstop_mutex);if (fullstop ==FULLSTOP_SHUTDOWN ) {pr_warn (/* but going down anyway, so... */ "Concurrent 'rmmod rcutorture' and shutdown illegal!\n" );
@@ -1588,7 +1585,7 @@ rcu_torture_init(void) &rcu_ops, &rcu_bh_ops, &srcu_ops, &sched_ops, }; -mutex_lock (&fullstop_mutex); +torture_init_begin (torture_type, verbose);/* Process args and tell the world that the torturer is on the job. */ for (i =0 ; i <ARRAY_SIZE (torture_ops); i++) {
@@ -1603,7 +1600,7 @@ rcu_torture_init(void)for (i =0 ; i <ARRAY_SIZE (torture_ops); i++)pr_alert (" %s" , torture_ops[i]->name);pr_alert ("\n" ); -mutex_unlock (&fullstop_mutex); +torture_init_end ();return -EINVAL ; }if (cur_ops->fqs ==NULL && fqs_duration !=0 ) {
@@ -1799,11 +1796,11 @@ rcu_torture_init(void)if (object_debug)rcu_test_debug_objects ();rcutorture_record_test_transition (); -mutex_unlock (&fullstop_mutex); +torture_init_end ();return 0 ; unwind: -mutex_unlock (&fullstop_mutex); +torture_init_end ();rcu_torture_cleanup ();return firsterr; }
kernel/torture.c +27 -0
@@ -49,6 +49,9 @@MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Paul E. McKenney <[email protected]>" ); +static char *torture_type; +static bool verbose; +int fullstop =FULLSTOP_RMMOD ;EXPORT_SYMBOL_GPL (fullstop);DEFINE_MUTEX (fullstop_mutex);
@@ -426,3 +429,27 @@ void torture_shutdown_absorb(const char *title) } }EXPORT_SYMBOL_GPL (torture_shutdown_absorb); + +/* +* Initialize torture module. Please note that this is -not- invoked via +* the usual module_init() mechanism, but rather by an explicit call from +* the client torture module. This call must be paired with a later +* torture_init_end(). +*/ +void __init torture_init_begin (char *ttype,bool v) +{ +mutex_lock (&fullstop_mutex); + torture_type = ttype; + verbose = v; + +} +EXPORT_SYMBOL_GPL (torture_init_begin); + +/* +* Tell the torture module that initialization is complete. +*/ +void __init torture_init_end (void ) +{ +mutex_unlock (&fullstop_mutex); +} +EXPORT_SYMBOL_GPL (torture_init_end);
Signature · 1 line
1.8.1.5
PATCH 12/55 rcutorture: Add comments, especially on bin packing.
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
--- tools/testing/selftests/rcutorture/bin/kvm.sh | 33 +++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-)
tools/testing/selftests/rcutorture/bin/kvm.sh +31 -2
@@ -188,6 +188,7 @@ fi mkdir $resdir/$ds if test "$dryrun" = "" then + # Be noisy only if running the script. echo Results directory: $resdir/$ds echo $scriptname $args fi
@@ -201,6 +202,7 @@ then git rev-parse HEAD >> $resdir/$ds/testid.txt fi +# Create a file of test-name/#cpus pairs, sorted by decreasing #cpus. touch $T/cfgcpu for CF in $configs do
@@ -214,12 +216,14 @@ do done sort -k2nr $T/cfgcpu > $T/cfgcpu.sort +# Use a greedy bin-packing algorithm, sorting the list accordingly. awk < $T/cfgcpu.sort > $T/cfgcpu.pack -v ncpus=$cpus ' BEGIN { njobs = 0; } { + # Read file of tests and corresponding required numbers of CPUs. cf[njobs] = $1; cpus[njobs] = $2; njobs++;
@@ -229,26 +233,40 @@ END { alldone = 0; batch = 0; nc = -1; + + # Each pass through the following loop creates on test batch + # that can be executed concurrently given ncpus. Note that a + # given test that requires more than the available CPUs will run in + # their own batch. Such tests just have to make do with what + # is available. while (nc != ncpus) { batch++; nc = ncpus; + + # Each pass through the following loop considers one + # test for inclusion in the current batch. for (i = 0; i < njobs; i++) { if (done[i]) - continue; + continue; # Already part of a batch. if (nc >= cpus[i] || nc == ncpus) { + + # This test fits into the current batch. done[i] = batch; nc -= cpus[i]; if (nc <= 0) - break; + break; # Too-big test in its own batch. } } } + + # Dump out the tests in batch order. for (b = 1; b <= batch; b++) for (i = 0; i < njobs; i++) if (done[i] == b) print cf[i], cpus[i]; }' +# Generate a script to execute the tests in appropriate batches. awk < $T/cfgcpu.pack \ -v CONFIGDIR="$CONFIGFRAG/$kversion/" \ -v KVM="$KVM" \
@@ -267,6 +285,7 @@ awk < $T/cfgcpu.pack \ i++; } +# Dump out the scripting required to run one test batch. function dump(first, pastlast) { print "echo ----start batch----"
@@ -313,23 +332,31 @@ END { njobs = i; nc = ncpus; first = 0; + + # Each pass through the following loop considers one test. for (i = 0; i < njobs; i++) { if (ncpus == 0) { + # Sequential test specified, each test its own batch. dump(i, i + 1); first = i; } else if (nc < cpus[i] && i != 0) { + # Out of CPUs, dump out a batch. dump(first, i); first = i; nc = ncpus; } + # Account for the CPUs needed by the current test. nc -= cpus[i]; } + # Dump the last batch. if (ncpus != 0) dump(first, i); }' > $T/script if test "$dryrun" = script then + # Dump out the script, but define the environment variables that + # it needs to run standalone. echo CONFIGFRAG="$CONFIGFRAG; export CONFIGFRAG" echo KVM="$KVM; export KVM" echo KVPATH="$KVPATH; export KVPATH"
@@ -344,10 +371,12 @@ then exit 0 elif test "$dryrun" = sched then + # Extract the test run schedule from the script. egrep 'start batch|Starting build\.' $T/script | sed -e 's/:.*$//' -e 's/^echo //' exit 0 else + # Not a dryru, so run the script. sh $T/script fi
Signature · 1 line
1.8.1.5
PATCH 20/55 rcutorture: Abstract torture_shutdown_absorb()
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
Because handling races between rmmod and normal shutdown is not specific to rcutorture, this commit renames rcutorture_shutdown_absorb() to torture_shutdown_absorb() and pulls it out into then kernel/torture.c module. This implies pulling the fullstop mechanism into kernel/torture.c as well.
The exporting of fullstop and fullstop_mutex is ugly and must die. And it does in fact die in later commits that introduce higher-level APIs that encapsulate both of these variables.
--- include/linux/torture.h | 11 +++++++++++ kernel/rcu/rcutorture.c | 49 ++++++++++++------------------------------------- kernel/torture.c | 20 ++++++++++++++++++++ 3 files changed, 43 insertions(+), 37 deletions(-)
include/linux/torture.h +11 -0
@@ -41,6 +41,14 @@module_param (name, type,0444 ); \MODULE_PARM_DESC (name, msg); +/* Mediate rmmod and system shutdown. Concurrent rmmod & shutdown illegal! */ +#define FULLSTOP_DONTSTOP 0/* Normal operation. */ +#define FULLSTOP_SHUTDOWN 1/* System shutdown with rcutorture running. */ +#define FULLSTOP_RMMOD 2/* Normal rmmod of rcutorture. */ +extern int fullstop; +/* Protect fullstop transitions and spawning of kthreads. */ +extern struct mutex fullstop_mutex; +#define TORTURE_FLAG "-torture:"#define TOROUT_STRING (s) \ pr_alert("%s" TORTURE_FLAG s "\n", torture_type)
@@ -57,4 +65,7 @@ struct torture_random_state {#define DEFINE_TORTURE_RANDOM (name) struct torture_random_state name = { 0, 0 }unsigned long torture_random (struct torture_random_state *trsp); +/* Shutdown task absorption, for when the tasks cannot safely be killed. */ +void torture_shutdown_absorb (const char *title); +#endif /* __LINUX_TORTURE_H */
kernel/rcu/rcutorture.c +12 -37
133 lines not on this page · raw message
kernel/torture.c +20 -0
@@ -49,6 +49,11 @@MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Paul E. McKenney <[email protected]>" ); +int fullstop =FULLSTOP_RMMOD ; +EXPORT_SYMBOL_GPL (fullstop); +DEFINE_MUTEX (fullstop_mutex); +EXPORT_SYMBOL_GPL (fullstop_mutex); +#define TORTURE_RANDOM_MULT 39916801/* prime */ #define TORTURE_RANDOM_ADD 479001701/* prime */ #define TORTURE_RANDOM_REFRESH 10000
@@ -69,3 +74,18 @@ torture_random(struct torture_random_state *trsp)return swahw32 (trsp->trs_state); }EXPORT_SYMBOL_GPL (torture_random); + +/* +* Absorb kthreads into a kernel function that won't return, so that +* they won't ever access module text or data again. +*/ +void torture_shutdown_absorb (const char *title) +{ +while (ACCESS_ONCE (fullstop) ==FULLSTOP_SHUTDOWN ) { +pr_notice ( +"torture thread %s parking due to system shutdown\n" , + title); +schedule_timeout_uninterruptible (MAX_SCHEDULE_TIMEOUT ); + } +} +EXPORT_SYMBOL_GPL (torture_shutdown_absorb);
Signature · 1 line
1.8.1.5
PATCH 7/55 rcutorture: Enable concurrent rcutorture runs
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
The rcutorture tests run by default range from using one CPU to using sixteen of them. Therefore, rcutorture testing could be sped up significantly simply by running the kernels in parallel. Building them in parallel is not all that helpful: "make -j" is usually a better bet. So this commit takes a new "--cpus" argument that specifies how many CPUs rcutorture is permitted to use for its parallel runs. The default of zero does sequential runs as before.
The bin-packing is minimal, and will be grossly suboptimal for some configurations. However, powers of two work reasonably well.
--- .../testing/selftests/rcutorture/bin/functions.sh | 1 + .../selftests/rcutorture/bin/kvm-recheck.sh | 4 +- .../selftests/rcutorture/bin/kvm-test-1-rcu.sh | 2 +- tools/testing/selftests/rcutorture/bin/kvm.sh | 125 +++++++++++++++++---- 4 files changed, 108 insertions(+), 24 deletions(-)
tools/testing/selftests/rcutorture/bin/functions.sh +1 -0
@@ -96,6 +96,7 @@ identify_qemu () { echo qemu-system-ppc64 else echo Cannot figure out what qemu command to use! 1>&2 + echo file $1 output: $u # Usually this will be one of /usr/bin/qemu-system-* # Use RCU_QEMU_CMD environment variable or appropriate # argument to top-level script.
tools/testing/selftests/rcutorture/bin/kvm-recheck.sh +2 -2
@@ -31,9 +31,9 @@ do dirs=`find $rd -name Make.defconfig.out -print | sort | sed -e 's,/[^/]*$,,' | sort -u` for i in $dirs do - if test $firsttime + if test -n "$firsttime" then - firsttime=0 + firsttime="" resdir=`echo $i | sed -e 's,/$,,' -e 's,/[^/]*$,,'` head -1 $resdir/log fi
tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh +1 -1
@@ -123,7 +123,7 @@ kstarttime=`awk 'BEGIN { print systime() }' < /dev/null` echo ' ---' `date`: Starting kernel # Determine the appropriate flavor of qemu command. -QEMU="`identify_qemu $builddir/vmlinux.o`" +QEMU="`identify_qemu $builddir/vmlinux`" # Generate -smp qemu argument. qemu_args="-nographic $qemu_args"
tools/testing/selftests/rcutorture/bin/kvm.sh +104 -21
167 lines not on this page · raw message
Signature · 1 line
1.8.1.5
PATCH 17/55 rcutorture: Abstract torture_param()
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
Create a torture_param() macro and apply it to rcutorture in order to save a few lines of code. This same macro may be applied to other torture frameworks.
--- include/linux/torture.h | 9 ++++- kernel/rcu/rcutorture.c | 102 ++++++++++++++++-------------------------------- 2 files changed, 40 insertions(+), 71 deletions(-)
include/linux/torture.h +7 -2
@@ -35,13 +35,18 @@#include <linux/bug.h> #include <linux/compiler.h> +/* Definitions for a non-string torture-test module parameter. */ +#define torture_parm (type, name, init, msg) \ + static type name = init; \ + module_param(name, type, 0444); \ + MODULE_PARM_DESC(name, msg); + +/* Low-rider random number generator. */ struct torture_random_state {unsigned long trs_state;long trs_count; }; -#define DEFINE_TORTURE_RANDOM (name) struct torture_random_state name = { 0, 0 } -unsigned long torture_random (struct torture_random_state *trsp);#endif /* __LINUX_TORTURE_H */
kernel/rcu/rcutorture.c +33 -69
111 lines not on this page · raw message
Signature · 1 line
1.8.1.5
PATCH 19/55 rcutorture: Abstract TOROUT_STRING() and friends
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
These diagnostic macros are not confined to torturing RCU, so this commit makes them available to other torture tests.
--- include/linux/torture.h | 8 ++++++++ kernel/rcu/rcutorture.c | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-)
include/linux/torture.h +8 -0
@@ -41,6 +41,14 @@module_param (name, type,0444 ); \MODULE_PARM_DESC (name, msg); +#define TORTURE_FLAG "-torture:" +#define TOROUT_STRING (s) \ + pr_alert("%s" TORTURE_FLAG s "\n", torture_type) +#define VERBOSE_TOROUT_STRING (s) \ + do { if (verbose) pr_alert("%s" TORTURE_FLAG s "\n", torture_type); } while (0) +#define VERBOSE_TOROUT_ERRSTRING (s) \ + do { if (verbose) pr_alert("%s" TORTURE_FLAG "!!! " s "\n", torture_type); } while (0) +/* Low-rider random number generator. */ struct torture_random_state {unsigned long trs_state;
kernel/rcu/rcutorture.c +0 -8
@@ -96,14 +96,6 @@ static char *torture_type = "rcu";module_param (torture_type, charp,0444 );MODULE_PARM_DESC (torture_type,"Type of RCU to torture (rcu, rcu_bh, ...)" ); -#define TORTURE_FLAG "-torture:" -#define TOROUT_STRING (s) \ - do { pr_alert("%s" TORTURE_FLAG s "\n", torture_type); } while (0) -#define VERBOSE_TOROUT_STRING (s) \ - do { if (verbose) pr_alert("%s" TORTURE_FLAG s "\n", torture_type); } while (0) -#define VERBOSE_TOROUT_ERRSTRING (s) \ - do { if (verbose) pr_alert("%s" TORTURE_FLAG "!!! " s "\n", torture_type); } while (0) -static int nrealreaders;static struct task_struct *writer_task;static struct task_struct **fakewriter_tasks;
Signature · 1 line
1.8.1.5
PATCH 25/55 rcutorture: Abstract torture-test cleanup
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
This commit creates a torture_cleanup() that handles the generic cleanup actions local to kernel/torture.c.
--- include/linux/torture.h | 4 +--- kernel/rcu/rcutorture.c | 11 +---------- kernel/torture.c | 30 ++++++++++++++++++++++++++++-- 3 files changed, 30 insertions(+), 15 deletions(-)
include/linux/torture.h +1 -3
@@ -65,7 +65,6 @@ extern struct mutex fullstop_mutex;/* Definitions for online/offline exerciser. */ int torture_onoff_init (long ooholdoff,long oointerval); -void torture_onoff_cleanup (void );char *torture_onoff_stats (char *page);bool torture_onoff_failures (void );
@@ -80,14 +79,13 @@ unsigned long torture_random(struct torture_random_state *trsp);/* Task shuffler, which causes CPUs to occasionally go idle. */ void torture_shuffle_task_register (struct task_struct *tp);int torture_shuffle_init (long shuffint); -void torture_shuffle_cleanup (void );/* Shutdown task absorption, for when the tasks cannot safely be killed. */ void torture_shutdown_absorb (const char *title);/* Initialization and cleanup. */ -void torture_init_begin (char *ttype,bool v);void torture_init_end (void ); +bool torture_cleanup (void );#endif /* __LINUX_TORTURE_H */
kernel/rcu/rcutorture.c +1 -10
@@ -1422,21 +1422,13 @@ rcu_torture_cleanup(void)int i;rcutorture_record_test_transition (); -mutex_lock (&fullstop_mutex); -if (fullstop ==FULLSTOP_SHUTDOWN ) { -pr_warn (/* but going down anyway, so... */ -"Concurrent 'rmmod rcutorture' and shutdown illegal!\n" ); -mutex_unlock (&fullstop_mutex); -schedule_timeout_uninterruptible (10 ); +if (torture_cleanup ()) {if (cur_ops->cb_barrier !=NULL ) cur_ops->cb_barrier ();return ; } - fullstop =FULLSTOP_RMMOD ; -mutex_unlock (&fullstop_mutex);unregister_reboot_notifier (&rcutorture_shutdown_nb); -torture_shuffle_cleanup ();/* Must be first task cleaned up. */ rcu_torture_barrier_cleanup ();rcu_torture_stall_cleanup ();if (stutter_task) {
@@ -1500,7 +1492,6 @@ rcu_torture_cleanup(void)kthread_stop (shutdown_task); } shutdown_task =NULL ; -torture_onoff_cleanup ();/* Wait for all RCU callbacks to fire. */
kernel/torture.c +28 -2
@@ -199,7 +199,7 @@ EXPORT_SYMBOL_GPL(torture_onoff_init);/* * Clean up after online/offline testing. */ -void torture_onoff_cleanup (void ) +static void torture_onoff_cleanup (void ) {#ifdef CONFIG_HOTPLUG_CPU if (onoff_task ==NULL )
@@ -403,7 +403,7 @@ EXPORT_SYMBOL_GPL(torture_shuffle_init);/* * Stop the shuffling. */ -void torture_shuffle_cleanup (void ) +static void torture_shuffle_cleanup (void ) {torture_shuffle_task_unregister_all ();if (shuffler_task) {
@@ -453,3 +453,29 @@ void __init torture_init_end(void)mutex_unlock (&fullstop_mutex); }EXPORT_SYMBOL_GPL (torture_init_end); + +/* +* Clean up torture module. Please note that this is -not- invoked via +* the usual module_exit() mechanism, but rather by an explicit call from +* the client torture module. Returns true if a race with system shutdown +* is detected. +* +* This must be called before the caller starts shutting down its own +* kthreads. +*/ +bool torture_cleanup (void ) +{ +mutex_lock (&fullstop_mutex); +if (fullstop ==FULLSTOP_SHUTDOWN ) { +pr_warn ("Concurrent rmmod and shutdown illegal!\n" ); +mutex_unlock (&fullstop_mutex); +schedule_timeout_uninterruptible (10 ); +return true; + } + fullstop =FULLSTOP_RMMOD ; +mutex_unlock (&fullstop_mutex); +torture_shuffle_cleanup (); +torture_onoff_cleanup (); +return false; +} +EXPORT_SYMBOL_GPL (torture_cleanup);
Signature · 1 line
1.8.1.5
PATCH 13/55 rcutorture: Flag tests requiring more CPUs than are available
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
This commit adds a "(!)" flag after the number of CPUs required by a given test if that test requires more than the available number of CPUs. Note that these flags appear only when the number of CPUs is specified using the --cpus argument. In the absence of a --cpus argument, no tests are flagged.
--- tools/testing/selftests/rcutorture/bin/kvm.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
tools/testing/selftests/rcutorture/bin/kvm.sh +9 -5
@@ -300,30 +300,34 @@ function dump(first, pastlast) cfrep[cf[j]]++; cfr[jn] = cf[j] "." cfrep[cf[j]]; } - print "echo ", cfr[jn], cpusr[jn] ": Starting build."; + if (cpusr[jn] > ncpus && ncpus != 0) + ovf = "(!)"; + else + ovf = ""; + print "echo ", cfr[jn], cpusr[jn] ovf ": Starting build."; print "rm -f " builddir ".*"; print "touch " builddir ".wait"; print "mkdir " builddir " > /dev/null 2>&1 || :"; print "mkdir " rd cfr[jn] " || :"; print "kvm-test-1-rcu.sh " CONFIGDIR cf[j], builddir, rd cfr[jn], dur " \"" RCU_QEMU_ARG "\" \"" RCU_BOOTARGS "\" > " builddir ".out 2>&1 &" - print "echo ", cfr[jn], cpusr[jn] ": Waiting for build to complete." + print "echo ", cfr[jn], cpusr[jn] ovf ": Waiting for build to complete." print "while test -f " builddir ".wait" print "do" print "\tsleep 1" print "done" - print "echo ", cfr[jn], cpusr[jn] ": Build complete." + print "echo ", cfr[jn], cpusr[jn] ovf ": Build complete." jn++; } for (j = 1; j < jn; j++) { builddir=KVM "/b" j print "rm -f " builddir ".ready" - print "echo ----", cfr[j], cpusr[j] ": Starting kernel" + print "echo ----", cfr[j], cpusr[j] ovf ": Starting kernel" } print "wait" print "echo ---- All kernel runs complete" for (j = 1; j < jn; j++) { builddir=KVM "/b" j - print "echo ----", cfr[j], cpusr[j] ": Build/run results:" + print "echo ----", cfr[j], cpusr[j] ovf ": Build/run results:" print "cat " builddir ".out" } }
Signature · 1 line
1.8.1.5
PATCH 10/55 rcutorture: Handle multiple runs of the same test
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
This commit fixes handling numbering of multiple runs of the same test so as to disambiguate output.
--- tools/testing/selftests/rcutorture/bin/kvm.sh | 29 ++++++++++++--------------- 1 file changed, 13 insertions(+), 16 deletions(-)
tools/testing/selftests/rcutorture/bin/kvm.sh +13 -16
@@ -238,42 +238,39 @@ function dump(first, pastlast) jn=1 for (j = first; j < pastlast; j++) { builddir=KVM "/b" jn - print "echo ", cf[j], cpus[j] ": Starting build." - print "rm -f " builddir ".*" - print "touch " builddir ".wait" - print "mkdir " builddir " > /dev/null 2>&1 || :" + cpusr[jn] = cpus[j]; if (cfrep[cf[j]] == "") { - cfr[j] = cf[j]; + cfr[jn] = cf[j]; cfrep[cf[j]] = 1; } else { cfrep[cf[j]]++; - cfr[j] = cf[j] "." cfrep[cf[j]]; + cfr[jn] = cf[j] "." cfrep[cf[j]]; } - print "mkdir " rd cfr[j] " || :"; - print "kvm-test-1-rcu.sh " CONFIGDIR cf[j], builddir, rd cfr[j], dur " \"" RCU_QEMU_ARG "\" \"" RCU_BOOTARGS "\" > " builddir ".out 2>&1 &" - print "echo ", cf[j], cpus[j] ": Waiting for build to complete." + print "echo ", cfr[jn], cpusr[jn] ": Starting build."; + print "rm -f " builddir ".*"; + print "touch " builddir ".wait"; + print "mkdir " builddir " > /dev/null 2>&1 || :"; + print "mkdir " rd cfr[jn] " || :"; + print "kvm-test-1-rcu.sh " CONFIGDIR cf[j], builddir, rd cfr[jn], dur " \"" RCU_QEMU_ARG "\" \"" RCU_BOOTARGS "\" > " builddir ".out 2>&1 &" + print "echo ", cfr[jn], cpusr[jn] ": Waiting for build to complete." print "while test -f " builddir ".wait" print "do" print "\tsleep 1" print "done" - print "echo ", cf[j], cpus[j] ": Build complete." + print "echo ", cfr[jn], cpusr[jn] ": Build complete." jn++; } - k = first for (j = 1; j < jn; j++) { builddir=KVM "/b" j print "rm -f " builddir ".ready" - print "echo ----", cf[k], cpus[k] ": Starting kernel" - k++; + print "echo ----", cfr[j], cpusr[j] ": Starting kernel" } print "wait" print "echo ---- All kernel runs complete" - k = first for (j = 1; j < jn; j++) { builddir=KVM "/b" j - print "echo ----", cf[k], cpus[k] ": Build/run results:" + print "echo ----", cfr[j], cpusr[j] ": Build/run results:" print "cat " builddir ".out" - k++; } }
Signature · 1 line
1.8.1.5
PATCH 23/55 rcutorture: Abstract torture_onoff()
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
Because online/offline torturing is not specific to RCU, this commit abstracts it into the kernel/torture.c module to allow other torture tests to use it.
Conflicts:
include/linux/torture.h
--- include/linux/torture.h | 12 ++++ kernel/rcu/rcutorture.c | 162 ++--------------------------------------- kernel/torture.c | 186 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 202 insertions(+), 158 deletions(-)
include/linux/torture.h +12 -0
@@ -61,6 +61,18 @@ extern bool verbose;#define VERBOSE_TOROUT_ERRSTRING (s) \ do { if (verbose) pr_alert("%s" TORTURE_FLAG "!!! " s "\n", torture_type); } while (0) +/* Definitions for a non-string torture-test module parameter. */ +#define torture_parm (type, name, init, msg) \ + static type name = init; \ + module_param(name, type, 0444); \ + MODULE_PARM_DESC(name, msg); + +/* Definitions for online/offline exerciser. */ +int torture_onoff_init (long ooholdoff,long oointerval); +void torture_onoff_cleanup (void ); +char *torture_onoff_stats (char *page); +bool torture_onoff_failures (void ); +/* Low-rider random number generator. */ struct torture_random_state {unsigned long trs_state;
kernel/rcu/rcutorture.c +4 -158
204 lines not on this page · raw message
kernel/torture.c +186 -0
192 lines not on this page · raw message
Signature · 1 line
1.8.1.5
PATCH 4/55 rcutorture: Allow kvm-test-1-rcu.sh to pause after build
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
Parallel rcutorture runs is valuable on large systems, but it is not a good idea to do (say) five builds in parallel if each build believes it has the whole system at its disposal, especially if the system is shared. It is also bad to restrict the build to (say) a single CPU just because the corresponding rcutorture run uses only a single CPU. This commit therefore adds a kvm-test-1-rcu.sh ability to pause after the build completes, which will allow kvm.sh to do a number of builds serially (with each build thus having the full system at its disposal), then allow the rcutorture runs to proceed in parallel.
--- tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+)
tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh +12 -0
@@ -96,11 +96,23 @@ then cp $builddir/.config $resdir cp $builddir/arch/x86/boot/bzImage $resdir parse-build.sh $resdir/Make.out $title + if test -f $builddir.wait + then + mv $builddir.wait $builddir.ready + fi else cp $builddir/Make*.out $resdir echo Build failed, not running KVM, see $resdir. + if test -f $builddir.wait + then + mv $builddir.wait $builddir.ready + fi exit 1 fi +while test -f $builddir.ready +do + sleep 1 +done minutes=$4 seconds=$(($minutes * 60)) qemu_args=$5
Signature · 1 line
1.8.1.5
PATCH 21/55 rcutorture: Export torture_type and verbose module parameters
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
The torture_type and verbose module parameters are needed for log messages, so this commit exports them to include/linux/torture.h.
--- include/linux/torture.h | 4 ++++ kernel/rcu/rcutorture.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-)
include/linux/torture.h +4 -0
@@ -49,6 +49,10 @@ extern int fullstop;/* Protect fullstop transitions and spawning of kthreads. */ extern struct mutex fullstop_mutex; +/* Common module parameters. */ +extern char *torture_type; +extern bool verbose; +#define TORTURE_FLAG "-torture:"#define TOROUT_STRING (s) \ pr_alert("%s" TORTURE_FLAG s "\n", torture_type)
kernel/rcu/rcutorture.c +6 -2
@@ -90,11 +90,15 @@ torture_parm(int, test_boost_interval, 7, "Interval between boost tests, seconds.");torture_parm (bool, test_no_idle_hz, true,"Test support for tickless idle CPUs" ); -torture_parm (bool, verbose, false,"Enable verbose debugging printk()s" ); -static char *torture_type ="rcu" ; +char *torture_type ="rcu" ; +EXPORT_SYMBOL_GPL (torture_type);module_param (torture_type, charp,0444 );MODULE_PARM_DESC (torture_type,"Type of RCU to torture (rcu, rcu_bh, ...)" ); +bool verbose; +EXPORT_SYMBOL_GPL (verbose); +module_param (verbose, bool,0444 ); +MODULE_PARM_DESC (verbose,"Enable verbose debugging printk()s" );static int nrealreaders;static struct task_struct *writer_task;
Signature · 1 line
1.8.1.5
PATCH 16/55 rcutorture: Don't create results directory for dryruns
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
This commit prevents the results directory from being created for dryruns. However, a script generated from a dryrun will create the results directory should it be run.
--- tools/testing/selftests/rcutorture/bin/kvm.sh | 34 +++++++++++++-------------- 1 file changed, 17 insertions(+), 17 deletions(-)
tools/testing/selftests/rcutorture/bin/kvm.sh +17 -17
@@ -175,31 +175,29 @@ fi if test -z "$resdir" then resdir=$KVM/res - if ! test -e $resdir - then - mkdir $resdir || : - fi -else +fi + +if test "$dryrun" = "" +then if ! test -e $resdir then mkdir -p "$resdir" || : fi -fi -mkdir $resdir/$ds -if test "$dryrun" = "" -then + mkdir $resdir/$ds + # Be noisy only if running the script. echo Results directory: $resdir/$ds echo $scriptname $args -fi -touch $resdir/$ds/log -echo $scriptname $args >> $resdir/$ds/log -pwd > $resdir/$ds/testid.txt -if test -d .git -then - git status >> $resdir/$ds/testid.txt - git rev-parse HEAD >> $resdir/$ds/testid.txt + touch $resdir/$ds/log + echo $scriptname $args >> $resdir/$ds/log + + pwd > $resdir/$ds/testid.txt + if test -d .git + then + git status >> $resdir/$ds/testid.txt + git rev-parse HEAD >> $resdir/$ds/testid.txt + fi fi # Create a file of test-name/#cpus pairs, sorted by decreasing #cpus.
@@ -371,6 +369,8 @@ then echo RCU_QEMU_CMD="$RCU_QEMU_CMD; export RCU_QEMU_CMD" echo RCU_QEMU_INTERACTIVE="$RCU_QEMU_INTERACTIVE; export RCU_QEMU_INTERACTIVE" echo RCU_QEMU_MAC="$RCU_QEMU_MAC; export RCU_QEMU_MAC" + echo "mkdir -p "$resdir" || :" + echo "mkdir $resdir/$ds" cat $T/script exit 0 elif test "$dryrun" = sched
Signature · 1 line
1.8.1.5
PATCH 8/55 rcutorture: Fix results-directory error message
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
The message complains about a build directory when it should instead be complaining about the results directory, so this commit fixes it.
--- tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/rcutorture/bin/kvm-test-1-rcu.sh +1 -1
@@ -57,7 +57,7 @@ fi resdir=${3} if test -z "$resdir" -o ! -d "$resdir" -o ! -w "$resdir" then - echo "kvm-test-1-rcu.sh :$resdir: Not a writable directory, cannot build into it" + echo "kvm-test-1-rcu.sh :$resdir: Not a writable directory, cannot store results into it" exit 1 fi cp $config_template $resdir/ConfigFragment
Signature · 1 line
1.8.1.5
PATCH 1/55 rcutorture: Print grace-period performance statistics
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
Sometime problems can manifest themselves as unusually slow grace periods. This commit therefore prints the number of rcutorture updates during the test and the number per second. These statistics are harvested from the config.out and qemu-cmd files, and are silently omitted if these files are not available, as would be the case if there was a build failure or a boot-time hang.
--- tools/testing/selftests/rcutorture/bin/kvm-recheck.sh | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
tools/testing/selftests/rcutorture/bin/kvm-recheck.sh +18 -1
@@ -31,7 +31,24 @@ do for i in $dirs do configfile=`echo $i | sed -e 's/^.*\///'` - echo $configfile + ngps=`grep ver: $i/console.log 2> /dev/null | tail -1 | sed -e 's/^.* ver: //' -e 's/ .*$//'` + if test -z "$ngps" + then + echo $configfile + else + title="$configfile ------- $ngps grace periods" + dur=`sed -e 's/^.* rcutorture.shutdown_secs=//' -e 's/ .*$//' < $i/qemu-cmd 2> /dev/null` + if test -z "$dur" + then + : + else + ngpsps=$((ngps / dur)) + ngpsps=`awk -v ngps=$ngps -v dur=$dur ' + BEGIN { print ngps / dur }' < /dev/null` + title="$title ($ngpsps per second)" + fi + echo $title + fi configcheck.sh $i/.config $i/ConfigFragment parse-build.sh $i/Make.out $configfile parse-rcutorture.sh $i/console.log $configfile
Signature · 1 line
1.8.1.5
PATCH 6/55 rcutorture: Reduce SRCU-N number of CPUs
From: "Paul E. McKenney" <[email protected]>
Both SRCU-P and SRCU-N specify eight CPUs, which results in four iterations for a parallel run on 32 CPUs. This commit reduces SRCU-N to four CPUs (but leaving SRCU-P at eight) to speed up parallel runs, while maintaining essentially the same test coverage.
--- tools/testing/selftests/rcutorture/configs/SRCU-N | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/rcutorture/configs/SRCU-N +1 -1
@@ -1,6 +1,6 @@ CONFIG_RCU_TRACE=n CONFIG_SMP=y -CONFIG_NR_CPUS=8 +CONFIG_NR_CPUS=4 CONFIG_HOTPLUG_CPU=y CONFIG_PREEMPT_NONE=y CONFIG_PREEMPT_VOLUNTARY=n
Signature · 1 line
1.8.1.5
PATCH 11/55 rcutorture: Do better bin packing
In reply to Paul E. McKenneyFrom: "Paul E. McKenney" <[email protected]>
Running the standard set of rcutorture tests on 24 CPUs results in the following sub-optimal schedule:
----start batch---- TREE07 16 ----start batch---- TREE08 16 SRCU-P 8 ----start batch---- TREE01 8 TREE02 8 TREE03 8 ----start batch---- TREE04 8 TREE05 8 TREE06 8 ----start batch---- SRCU-N 4 TINY01 1 TINY02 1 TREE09 1
If one of the eight-CPU runs were to be moved into the first batch, the test suite would complete in four batches rather than five.
This commit therefore uses a greedy algorithm to re-order the test entries so that the sequential batching will produce an optimal schedule in this case:
----start batch---- TREE07 16 SRCU-P 8 ----start batch---- TREE08 16 TREE01 8 ----start batch---- TREE02 8 TREE03 8 TREE04 8 ----start batch---- TREE05 8 TREE06 8 SRCU-N 4 TINY01 1 TINY02 1 TREE09 1
Please note that this is still not an optimal bin-packing algorithm, however, it does produce optimal solutions for most common scenarios.
--- tools/testing/selftests/rcutorture/bin/kvm.sh | 37 ++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-)
tools/testing/selftests/rcutorture/bin/kvm.sh +36 -1
@@ -214,7 +214,42 @@ do done sort -k2nr $T/cfgcpu > $T/cfgcpu.sort -awk < $T/cfgcpu.sort \ +awk < $T/cfgcpu.sort > $T/cfgcpu.pack -v ncpus=$cpus ' +BEGIN { + njobs = 0; +} + +{ + cf[njobs] = $1; + cpus[njobs] = $2; + njobs++; +} + +END { + alldone = 0; + batch = 0; + nc = -1; + while (nc != ncpus) { + batch++; + nc = ncpus; + for (i = 0; i < njobs; i++) { + if (done[i]) + continue; + if (nc >= cpus[i] || nc == ncpus) { + done[i] = batch; + nc -= cpus[i]; + if (nc <= 0) + break; + } + } + } + for (b = 1; b <= batch; b++) + for (i = 0; i < njobs; i++) + if (done[i] == b) + print cf[i], cpus[i]; +}' + +awk < $T/cfgcpu.pack \ -v CONFIGDIR="$CONFIGFRAG/$kversion/" \ -v KVM="$KVM" \ -v ncpus=$cpus \
Signature · 1 line
1.8.1.5
Josh Triplett
maintainerRe: [PATCH tip/core/rcu 15/55] rcutorture: Abstract rcu_torture_random()
In reply to Paul E. McKenneyQuoted 7 lines · Paul E. McKenney
From: "Paul E. McKenney" <[email protected]>
Because
rcu_torture_random()will be used by the locking equivalent to rcutorture, pull it out into its own module.Suggested-by Rusty Russell <[email protected]>Signed-off-by Paul E. McKenney <[email protected]>
I'd suggest making CONFIG_TORTURE_TEST a completely invisible option, with no description; it should only be brought in via "select".
Also, it doesn't need most of the headers it currently includes.
Have you considered moving it into the existing random generation infrastructure, as something like "fast_insecure_nonblocking_random"? That seems more generally useful.
- Josh Triplett
Re: [PATCH tip/core/rcu 15/55] rcutorture: Abstract rcu_torture_random()
Quoted 9 lines · Josh Triplett
Quoted 7 lines · Paul E. McKenney
From: "Paul E. McKenney" <[email protected]>
Because
rcu_torture_random()will be used by the locking equivalent to rcutorture, pull it out into its own module.Suggested-by Rusty Russell <[email protected]>Signed-off-by Paul E. McKenney <[email protected]>
Quoted 8 lines
I'd suggest making
CONFIG_TORTURE_TESTa completely invisible option, with no description; it should only be brought in via "select".Also, it doesn't need most of the headers it currently includes.
Have you considered moving it into the existing random generation infrastructure, as something like "
fast_insecure_nonblocking_random"? That seems more generally useful.
George Spelvin was also advising me on random-number generation in rcutorture, so I added him on CC. In any case, I would not be adverse to using some other random-number service, as long as it is fast enough. (George suggested some optimizations that I have not yet tried out.)
Thanx, Paul
Josh Triplett
maintainerRe: [PATCH tip/core/rcu 17/55] rcutorture: Abstract torture_param()
In reply to Paul E. McKenneyQuoted 7 lines · Paul E. McKenney
From: "Paul E. McKenney" <[email protected]>
Create a
torture_param()macro and apply it to rcutorture in order to save a few lines of code. This same macro may be applied to other torture frameworks.Signed-off-by Paul E. McKenney <[email protected]>
Your commit message says "torture_param", but your code says "torture_parm". Let's go with the former, please; no need to creat more disemvoweled abbreviations.
Also, this seems rather generally useful. A quick check with "git grep -B2 MODULE_PARM_DESC" turns up numerous instances of the pattern. You might consider adding this as a helper DECLARE_MODULE_PARAM_RO in include/linux/moduleparam.h (possibly calling a generalized version that takes the mode as another parameter).
- Josh Triplett
Josh Triplett
maintainerRe: [PATCH tip/core/rcu 19/55] rcutorture: Abstract TOROUT_STRING() and friends
In reply to Paul E. McKenneyQuoted 6 lines · Paul E. McKenney
From: "Paul E. McKenney" <[email protected]>
These diagnostic macros are not confined to torturing RCU, so this commit makes them available to other torture tests.
Signed-off-by Paul E. McKenney <[email protected]>
This removes the do {} while (0) around the first of the macros, without any explanation in the commit message.
Also, to what extent could these be made redundant with pr_fmt? if(verbose) seems like it really ought to become a priority level or dynamic debugging (and it's really awful to further propagate macros that reference an out-of-macro variable). Ideally all of these could go away in favor of pr_fmt, and then the individual calls to them would become pr_alert, pr_debug, pr_error, or similar.
- Josh Triplett
Quoted 45 lines
include/linux/torture.h | 8 ++++++++ kernel/rcu/rcutorture.c | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-)include/linux/torture.h +8
-0@@ -41,6 +41,14 @@module_param (name, type,0444 ); \MODULE_PARM_DESC (name, msg); +#define TORTURE_FLAG "-torture:" +#define TOROUT_STRING (s) \ + pr_alert("%s" TORTURE_FLAG s "\n", torture_type) +#define VERBOSE_TOROUT_STRING (s) \ + do { if (verbose) pr_alert("%s" TORTURE_FLAG s "\n", torture_type); } while (0) +#define VERBOSE_TOROUT_ERRSTRING (s) \ + do { if (verbose) pr_alert("%s" TORTURE_FLAG "!!! " s "\n", torture_type); } while (0) +/* Low-rider random number generator. */ struct torture_random_state {unsigned long trs_state;kernel/rcu/rcutorture.c +0
-8@@ -96,14 +96,6 @@ static char *torture_type = "rcu";module_param (torture_type, charp,0444 );MODULE_PARM_DESC (torture_type,"Type of RCU to torture (rcu, rcu_bh, ...)" ); -#define TORTURE_FLAG "-torture:" -#define TOROUT_STRING (s) \ - do { pr_alert("%s" TORTURE_FLAG s "\n", torture_type); } while (0) -#define VERBOSE_TOROUT_STRING (s) \ - do { if (verbose) pr_alert("%s" TORTURE_FLAG s "\n", torture_type); } while (0) -#define VERBOSE_TOROUT_ERRSTRING (s) \ - do { if (verbose) pr_alert("%s" TORTURE_FLAG "!!! " s "\n", torture_type); } while (0) -static int nrealreaders;static struct task_struct *writer_task;static struct task_struct **fakewriter_tasks;Signature · 1 line
1.8.1.5
Josh Triplett
maintainerRe: [PATCH tip/core/rcu 15/55] rcutorture: Abstract rcu_torture_random()
In reply to Paul E. McKenneyQuoted 15 lines · Paul E. McKenney
Quoted 14 lines · Josh Triplett
Quoted 7 lines · Paul E. McKenney
From: "Paul E. McKenney" <[email protected]>
Because
rcu_torture_random()will be used by the locking equivalent to rcutorture, pull it out into its own module.Suggested-by Rusty Russell <[email protected]>Signed-off-by Paul E. McKenney <[email protected]>I'd suggest making
CONFIG_TORTURE_TESTa completely invisible option, with no description; it should only be brought in via "select".Also, it doesn't need most of the headers it currently includes.
Quoted 8 lines
Quoted 3 lines
Have you considered moving it into the existing random generation infrastructure, as something like "
fast_insecure_nonblocking_random"? That seems more generally useful.George Spelvin was also advising me on random-number generation in rcutorture, so I added him on CC. In any case, I would not be adverse to using some other random-number service, as long as it is fast enough. (George suggested some optimizations that I have not yet tried out.)
I suspect the fastest way to find out about any existing generator with the desired properties would be to post this one as a patch to the random number infrastructure and read the resulting replies. :)
- Josh Triplett
Josh Triplett
maintainerRe: [PATCH tip/core/rcu 21/55] rcutorture: Export torture_type and verbose module parameters
In reply to Paul E. McKenneyQuoted 6 lines · Paul E. McKenney
From: "Paul E. McKenney" <[email protected]>
The
torture_typeand verbose module parameters are needed for log messages, so this commit exports them toinclude/linux/torture.h.Signed-off-by Paul E. McKenney <[email protected]>
Assuming this doesn't go away (which I really hope it does), this needs to occur *before* the introduction of the macros using these variables.
- Josh Triplett
Quoted 44 lines
include/linux/torture.h | 4 ++++ kernel/rcu/rcutorture.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-)include/linux/torture.h +4
-0@@ -49,6 +49,10 @@ extern int fullstop;/* Protect fullstop transitions and spawning of kthreads. */ extern struct mutex fullstop_mutex; +/* Common module parameters. */ +extern char *torture_type; +extern bool verbose; +#define TORTURE_FLAG "-torture:"#define TOROUT_STRING (s) \ pr_alert("%s" TORTURE_FLAG s "\n", torture_type)kernel/rcu/rcutorture.c +6
-2@@ -90,11 +90,15 @@ torture_parm(int, test_boost_interval, 7, "Interval between boost tests, seconds.");torture_parm (bool, test_no_idle_hz, true,"Test support for tickless idle CPUs" ); -torture_parm (bool, verbose, false,"Enable verbose debugging printk()s" ); -static char *torture_type ="rcu" ; +char *torture_type ="rcu" ; +EXPORT_SYMBOL_GPL (torture_type);module_param (torture_type, charp,0444 );MODULE_PARM_DESC (torture_type,"Type of RCU to torture (rcu, rcu_bh, ...)" ); +bool verbose; +EXPORT_SYMBOL_GPL (verbose); +module_param (verbose, bool,0444 ); +MODULE_PARM_DESC (verbose,"Enable verbose debugging printk()s" );static int nrealreaders;static struct task_struct *writer_task;Signature · 1 line
1.8.1.5
Josh Triplett
maintainerRe: [PATCH tip/core/rcu 35/55] rcutorture: Fix rcutorture shutdown races
In reply to Paul E. McKenneyQuoted 11 lines · Paul E. McKenney
From: "Paul E. McKenney" <[email protected]>
Not all of the rcutorture kthreads waited for
kthread_should_stop()before returning from their top-level functions, and none of them usedtorture_shutdown_absorb()properly. These problems can result in segfaults and hangs at shutdown time, and some recent changes perturbed timing sufficiently to make them much more probable. This commit therefore creates atorture_kthread_stopping()function that does the proper kthread shutdown dance in one centralized location.Signed-off-by Paul E. McKenney <[email protected]>
One comment below.
Quoted 10 lines
include/linux/torture.h | 3 ++- kernel/rcu/rcutorture.c | 39 +++++++++++---------------------------- kernel/torture.c | 26 ++++++++++++++++++++++---- 3 files changed, 35 insertions(+), 33 deletions(-)include/linux/torture.h +0
-0
include/linux/torture.h line 48
Quoted 5 lines
include/linux/torture.h +1
-1@@ -45,7 +45,7 @@#define TOROUT_STRING (s) \ pr_alert("%s" TORTURE_FLAG s "\n", torture_type)#define VERBOSE_TOROUT_STRING (s) \ - do { if (verbose) pr_alert("%s" TORTURE_FLAG s "\n", torture_type); } while (0) + do { if (verbose) pr_alert("%s" TORTURE_FLAG " %s\n", torture_type, s); } while (0)
This change is completely unrelated to the change described in the commit message. This should not be part of this commit.
Quoted 181 lines
include/linux/torture.h +1
-0#define VERBOSE_TOROUT_ERRSTRING (s) \ do { if (verbose) pr_alert("%s" TORTURE_FLAG "!!! " s "\n", torture_type); } while (0)@@ -88,5 +88,6 @@ void torture_init_end(void);bool torture_cleanup (void );bool torture_must_stop (void );bool torture_must_stop_irq (void ); +void torture_kthread_stopping (char *title);#endif /* __LINUX_TORTURE_H */ kernel/rcu/rcutorture.c +11
-28@@ -601,12 +601,13 @@ checkwait: stutter_wait("rcu_torture_boost"); }while (!torture_must_stop ());/* Clean up and exit. */ -VERBOSE_TOROUT_STRING ("rcu_torture_boost task stopping" ); -torture_shutdown_absorb ("rcu_torture_boost" ); -while (!kthread_should_stop () || rbi.inflight) +while (!kthread_should_stop () || rbi.inflight) { +torture_shutdown_absorb ("rcu_torture_boost" );schedule_timeout_uninterruptible (1 ); + }smp_mb ();/* order accesses to ->inflight before stack-frame death. */ destroy_rcu_head_on_stack (&rbi.rcu); +torture_kthread_stopping ("rcu_torture_boost" );return 0 ; }@@ -637,10 +638,7 @@ rcu_torture_fqs(void *arg) }stutter_wait ("rcu_torture_fqs" ); }while (!torture_must_stop ()); -VERBOSE_TOROUT_STRING ("rcu_torture_fqs task stopping" ); -torture_shutdown_absorb ("rcu_torture_fqs" ); -while (!kthread_should_stop ()) -schedule_timeout_uninterruptible (1 ); +torture_kthread_stopping ("rcu_torture_fqs" );return 0 ; }@@ -709,10 +707,7 @@ rcu_torture_writer(void *arg)rcutorture_record_progress (++rcu_torture_current_version);stutter_wait ("rcu_torture_writer" ); }while (!torture_must_stop ()); -VERBOSE_TOROUT_STRING ("rcu_torture_writer task stopping" ); -torture_shutdown_absorb ("rcu_torture_writer" ); -while (!kthread_should_stop ()) -schedule_timeout_uninterruptible (1 ); +torture_kthread_stopping ("rcu_torture_writer" );return 0 ; }@@ -747,10 +742,7 @@ rcu_torture_fakewriter(void *arg)stutter_wait ("rcu_torture_fakewriter" ); }while (!torture_must_stop ()); -VERBOSE_TOROUT_STRING ("rcu_torture_fakewriter task stopping" ); -torture_shutdown_absorb ("rcu_torture_fakewriter" ); -while (!kthread_should_stop ()) -schedule_timeout_uninterruptible (1 ); +torture_kthread_stopping ("rcu_torture_fakewriter" );return 0 ; }@@ -891,12 +883,9 @@ rcu_torture_reader(void *arg)schedule ();stutter_wait ("rcu_torture_reader" ); }while (!torture_must_stop ()); -VERBOSE_TOROUT_STRING ("rcu_torture_reader task stopping" ); -torture_shutdown_absorb ("rcu_torture_reader" );if (irqreader && cur_ops->irq_capable)del_timer_sync (&t); -while (!kthread_should_stop ()) -schedule_timeout_uninterruptible (1 ); +torture_kthread_stopping ("rcu_torture_reader" );return 0 ; }@@ -1009,7 +998,7 @@ rcu_torture_stats(void *arg)rcu_torture_stats_print ();torture_shutdown_absorb ("rcu_torture_stats" ); }while (!torture_must_stop ()); -VERBOSE_TOROUT_STRING ("rcu_torture_stats task stopping" ); +torture_kthread_stopping ("rcu_torture_stats" );return 0 ; }@@ -1170,12 +1159,9 @@ static int rcu_torture_barrier_cbs(void *arg)if (atomic_dec_and_test (&barrier_cbs_count))wake_up (&barrier_wq); }while (!torture_must_stop ()); -VERBOSE_TOROUT_STRING ("rcu_torture_barrier_cbs task stopping" ); -torture_shutdown_absorb ("rcu_torture_barrier_cbs" ); -while (!kthread_should_stop ()) -schedule_timeout_interruptible (1 ); cur_ops->cb_barrier ();destroy_rcu_head_on_stack (&rcu); +torture_kthread_stopping ("rcu_torture_barrier_cbs" );return 0 ; }@@ -1206,10 +1192,7 @@ static int rcu_torture_barrier(void *arg) n_barrier_successes++;schedule_timeout_interruptible (HZ /10 ); }while (!torture_must_stop ()); -VERBOSE_TOROUT_STRING ("rcu_torture_barrier task stopping" ); -torture_shutdown_absorb ("rcu_torture_barrier" ); -while (!kthread_should_stop ()) -schedule_timeout_interruptible (1 ); +torture_kthread_stopping ("rcu_torture_barrier" );return 0 ; }kernel/torture.c +22
-4@@ -169,7 +169,7 @@ torture_onoff(void *arg) }schedule_timeout_interruptible (onoff_interval); } -VERBOSE_TOROUT_STRING ("torture_onoff task stopping" ); +torture_kthread_stopping ("torture_onoff" );return 0 ; }@@ -370,7 +370,7 @@ static int torture_shuffle(void *arg)torture_shuffle_tasks ();torture_shutdown_absorb ("torture_shuffle" ); }while (!torture_must_stop ()); -VERBOSE_TOROUT_STRING ("torture_shuffle task stopping" ); +torture_kthread_stopping ("torture_shuffle" );return 0 ; }@@ -465,7 +465,7 @@ static int torture_shutdown(void *arg) jiffies_snap = jiffies; }if (torture_must_stop ()) { -VERBOSE_TOROUT_STRING ("torture_shutdown task stopping" ); +torture_kthread_stopping ("torture_shutdown" );return 0 ; }@@ -583,7 +583,7 @@ static int torture_stutter(void *arg)ACCESS_ONCE (stutter_pause_test) =0 ;torture_shutdown_absorb ("torture_stutter" ); }while (!torture_must_stop ()); -VERBOSE_TOROUT_STRING ("torture_stutter task stopping" ); +torture_kthread_stopping ("torture_stutter" );return 0 ; }@@ -696,3 +696,21 @@ bool torture_must_stop_irq(void)return ACCESS_ONCE (fullstop) !=FULLSTOP_DONTSTOP ; }EXPORT_SYMBOL_GPL (torture_must_stop_irq); + +/* +* Each kthread must wait for kthread_should_stop() before returning from +* its top-level function, otherwise segfaults ensue. This function +* prints a "stopping" message and waits for kthread_should_stop(), and +* should be called from all torture kthreads immediately prior to +* returning. +*/ +void torture_kthread_stopping (char *title) +{ +if (verbose) +pr_alert ("%s" TORTURE_FLAG " %s\n" , torture_type, title); +while (!kthread_should_stop ()) { +torture_shutdown_absorb (title); +schedule_timeout_uninterruptible (1 ); + } +} +EXPORT_SYMBOL_GPL (torture_kthread_stopping);Signature · 1 line
1.8.1.5
Josh Triplett
maintainerRe: [PATCH tip/core/rcu 37/55] rcutorture: Abstract torture_create_kthread()
In reply to Paul E. McKenneyQuoted 7 lines · Paul E. McKenney
From: "Paul E. McKenney" <[email protected]>
Creation of kthreads is not RCU-specific, so this commit abstracts out
torture_create_kthread(), saving a few tens of lines of code in the process.Signed-off-by Paul E. McKenney <[email protected]>
One comment below.
Quoted 10 lines
include/linux/torture.h | 8 +++- kernel/rcu/rcutorture.c | 98 ++++++++++--------------------------------------- kernel/torture.c | 80 +++++++++++++++++----------------------- 3 files changed, 60 insertions(+), 126 deletions(-)include/linux/torture.h +0
-0
include/linux/torture.h line 50
Quoted 5 lines
include/linux/torture.h +1
-1@@ -47,7 +47,7 @@#define VERBOSE_TOROUT_STRING (s) \ do { if (verbose) pr_alert("%s" TORTURE_FLAG " %s\n", torture_type, s); } while (0)#define VERBOSE_TOROUT_ERRSTRING (s) \ - do { if (verbose) pr_alert("%s" TORTURE_FLAG "!!! " s "\n", torture_type); } while (0) + do { if (verbose) pr_alert("%s" TORTURE_FLAG "!!! %s\n", torture_type, s); } while (0)
This change is also unrelated, and should not occur in this commit.
- Josh Triplett
Quoted 307 lines
include/linux/torture.h +6
-0/* Definitions for a non-string torture-test module parameter. */ #define torture_parm (type, name, init, msg) \@@ -89,5 +89,11 @@ bool torture_cleanup(void);bool torture_must_stop (void );bool torture_must_stop_irq (void );void torture_kthread_stopping (char *title); +int _torture_create_kthread (int (*fn)(void *arg),void *arg,char *s,char *m, +char *f,struct task_struct **tp); + +#define torture_create_kthread (n, arg, tp) \ + _torture_create_kthread(n, (arg), #n, "Creating " #n " task", \ + "Failed to create " #n, &(tp))#endif /* __LINUX_TORTURE_H */ kernel/rcu/rcutorture.c +20
-78@@ -1104,19 +1104,9 @@ static int rcu_torture_stall(void *args)/* Spawn CPU-stall kthread, if stall_cpu specified. */ static int __init rcu_torture_stall_init (void ) { -int ret; -if (stall_cpu <=0 )return 0 ; -VERBOSE_TOROUT_STRING ("Creating rcu_torture_stall task" ); - stall_task =kthread_run (rcu_torture_stall,NULL ,"rcu_torture_stall" ); -if (IS_ERR (stall_task)) { - ret =PTR_ERR (stall_task); - stall_task =NULL ; -return ret; - } -torture_shuffle_task_register (stall_task); -return 0 ; +return torture_create_kthread (rcu_torture_stall,NULL , stall_task); }/* Clean up after the CPU-stall kthread, if one was spawned. */ @@ -1225,29 +1215,13 @@ static int rcu_torture_barrier_init(void)return -ENOMEM ;for (i =0 ; i < n_barrier_cbs; i++) {init_waitqueue_head (&barrier_cbs_wq[i]); -VERBOSE_TOROUT_STRING ("Creating rcu_torture_barrier_cbs task" ); - barrier_cbs_tasks[i] =kthread_run (rcu_torture_barrier_cbs, - (void *)(long )i, -"rcu_torture_barrier_cbs" ); -if (IS_ERR (barrier_cbs_tasks[i])) { - ret =PTR_ERR (barrier_cbs_tasks[i]); -VERBOSE_TOROUT_ERRSTRING ("Failed to create rcu_torture_barrier_cbs" ); - barrier_cbs_tasks[i] =NULL ; + ret =torture_create_kthread (rcu_torture_barrier_cbs, + (void *)(long )i, + barrier_cbs_tasks[i]); +if (ret)return ret; - } -torture_shuffle_task_register (barrier_cbs_tasks[i]); } -VERBOSE_TOROUT_STRING ("Creating rcu_torture_barrier task" ); - barrier_task =kthread_run (rcu_torture_barrier,NULL , -"rcu_torture_barrier" ); -if (IS_ERR (barrier_task)) { - ret =PTR_ERR (barrier_task); -VERBOSE_TOROUT_ERRSTRING ("Failed to create rcu_torture_barrier" ); - barrier_task =NULL ; -return ret; - } -torture_shuffle_task_register (barrier_task); -return 0 ; +return torture_create_kthread (rcu_torture_barrier,NULL , barrier_task); }/* Clean up after RCU barrier testing. */ @@ -1515,17 +1489,10 @@ rcu_torture_init(void)/* Start up the kthreads. */ -VERBOSE_TOROUT_STRING ("Creating rcu_torture_writer task" ); - writer_task =kthread_create (rcu_torture_writer,NULL , -"rcu_torture_writer" ); -if (IS_ERR (writer_task)) { - firsterr =PTR_ERR (writer_task); -VERBOSE_TOROUT_ERRSTRING ("Failed to create writer" ); - writer_task =NULL ; + firsterr =torture_create_kthread (rcu_torture_writer,NULL , + writer_task); +if (firsterr) goto unwind; - } -torture_shuffle_task_register (writer_task); -wake_up_process (writer_task); fakewriter_tasks =kzalloc (nfakewriters *sizeof (fakewriter_tasks[0 ]),GFP_KERNEL );if (fakewriter_tasks ==NULL ) {@@ -1534,16 +1501,10 @@ rcu_torture_init(void) goto unwind; }for (i =0 ; i < nfakewriters; i++) { -VERBOSE_TOROUT_STRING ("Creating rcu_torture_fakewriter task" ); - fakewriter_tasks[i] =kthread_run (rcu_torture_fakewriter,NULL , -"rcu_torture_fakewriter" ); -if (IS_ERR (fakewriter_tasks[i])) { - firsterr =PTR_ERR (fakewriter_tasks[i]); -VERBOSE_TOROUT_ERRSTRING ("Failed to create fakewriter" ); - fakewriter_tasks[i] =NULL ; + firsterr =torture_create_kthread (rcu_torture_fakewriter, +NULL , fakewriter_tasks[i]); +if (firsterr) goto unwind; - } -torture_shuffle_task_register (fakewriter_tasks[i]); } reader_tasks =kzalloc (nrealreaders *sizeof (reader_tasks[0 ]),GFP_KERNEL );@@ -1553,28 +1514,16 @@ rcu_torture_init(void) goto unwind; }for (i =0 ; i < nrealreaders; i++) { -VERBOSE_TOROUT_STRING ("Creating rcu_torture_reader task" ); - reader_tasks[i] =kthread_run (rcu_torture_reader,NULL , -"rcu_torture_reader" ); -if (IS_ERR (reader_tasks[i])) { - firsterr =PTR_ERR (reader_tasks[i]); -VERBOSE_TOROUT_ERRSTRING ("Failed to create reader" ); - reader_tasks[i] =NULL ; + firsterr =torture_create_kthread (rcu_torture_reader,NULL , + reader_tasks[i]); +if (firsterr) goto unwind; - } -torture_shuffle_task_register (reader_tasks[i]); }if (stat_interval >0 ) { -VERBOSE_TOROUT_STRING ("Creating rcu_torture_stats task" ); - stats_task =kthread_run (rcu_torture_stats,NULL , -"rcu_torture_stats" ); -if (IS_ERR (stats_task)) { - firsterr =PTR_ERR (stats_task); -VERBOSE_TOROUT_ERRSTRING ("Failed to create stats" ); - stats_task =NULL ; + firsterr =torture_create_kthread (rcu_torture_stats,NULL , + stats_task); +if (firsterr) goto unwind; - } -torture_shuffle_task_register (stats_task); }if (test_no_idle_hz) { firsterr =torture_shuffle_init (shuffle_interval *HZ );@@ -1592,16 +1541,9 @@ rcu_torture_init(void) fqs_duration =0 ;if (fqs_duration) {/* Create the fqs thread */ -VERBOSE_TOROUT_STRING ("Creating rcu_torture_fqs task" ); - fqs_task =kthread_run (rcu_torture_fqs,NULL , -"rcu_torture_fqs" ); -if (IS_ERR (fqs_task)) { - firsterr =PTR_ERR (fqs_task); -VERBOSE_TOROUT_ERRSTRING ("Failed to create fqs" ); - fqs_task =NULL ; +torture_create_kthread (rcu_torture_fqs,NULL , fqs_task); +if (firsterr) goto unwind; - } -torture_shuffle_task_register (fqs_task); }if (test_boost_interval <1 ) test_boost_interval =1 ;kernel/torture.c +33
-47@@ -180,23 +180,16 @@ torture_onoff(void *arg)*/ int torture_onoff_init (long ooholdoff,long oointerval) { -#ifdef CONFIG_HOTPLUG_CPU -int ret; +int ret =0 ; +#ifdef CONFIG_HOTPLUG_CPU onoff_holdoff = ooholdoff; onoff_interval = oointerval;if (onoff_interval <=0 )return 0 ; -VERBOSE_TOROUT_STRING ("Creating torture_onoff task" ); - onoff_task =kthread_run (torture_onoff,NULL ,"torture_onoff" ); -if (IS_ERR (onoff_task)) { - ret =PTR_ERR (onoff_task); - onoff_task =NULL ; -return ret; - } -torture_shuffle_task_register (onoff_task); + ret =torture_create_kthread (torture_onoff,NULL , onoff_task);#endif /* #ifdef CONFIG_HOTPLUG_CPU */ -return 0 ; +return ret; }EXPORT_SYMBOL_GPL (torture_onoff_init);@@ -379,8 +372,6 @@ static int torture_shuffle(void *arg)*/ int torture_shuffle_init (long shuffint) { -int ret; - shuffle_interval = shuffint; shuffle_idle_cpu =-1 ;@@ -391,17 +382,7 @@ int torture_shuffle_init(long shuffint) }/* Create the shuffler thread */ -VERBOSE_TOROUT_STRING ("Creating torture_shuffle task" ); - shuffler_task =kthread_run (torture_shuffle,NULL ,"torture_shuffle" ); -if (IS_ERR (shuffler_task)) { - ret =PTR_ERR (shuffler_task); -free_cpumask_var (shuffle_tmp_mask); -VERBOSE_TOROUT_ERRSTRING ("Failed to create shuffler" ); - shuffler_task =NULL ; -return ret; - } -torture_shuffle_task_register (shuffler_task); -return 0 ; +return torture_create_kthread (torture_shuffle,NULL , shuffler_task); }EXPORT_SYMBOL_GPL (torture_shuffle_init);@@ -483,25 +464,16 @@ static int torture_shutdown(void *arg)*/ int torture_shutdown_init (int ssecs,void (*cleanup)(void )) { -int ret; +int ret =0 ; shutdown_secs = ssecs; torture_shutdown_hook = cleanup;if (shutdown_secs >0 ) { -VERBOSE_TOROUT_STRING ("Creating torture_shutdown task" ); shutdown_time = jiffies + shutdown_secs *HZ ; - shutdown_task =kthread_create (torture_shutdown,NULL , -"torture_shutdown" ); -if (IS_ERR (shutdown_task)) { - ret =PTR_ERR (shutdown_task); -VERBOSE_TOROUT_ERRSTRING ("Failed to create shutdown" ); - shutdown_task =NULL ; -return ret; - } -torture_shuffle_task_register (shutdown_task); -wake_up_process (shutdown_task); + ret =torture_create_kthread (torture_shutdown,NULL , + shutdown_task); } -return 0 ; +return ret; }EXPORT_SYMBOL_GPL (torture_shutdown_init);@@ -595,16 +567,8 @@ int torture_stutter_init(int s)int ret; stutter = s; -VERBOSE_TOROUT_STRING ("Creating torture_stutter task" ); - stutter_task =kthread_run (torture_stutter,NULL ,"torture_stutter" ); -if (IS_ERR (stutter_task)) { - ret =PTR_ERR (stutter_task); -VERBOSE_TOROUT_ERRSTRING ("Failed to create stutter" ); - stutter_task =NULL ; -return ret; - } -torture_shuffle_task_register (stutter_task); -return 0 ; + ret =torture_create_kthread (torture_stutter,NULL , stutter_task); +return ret; }EXPORT_SYMBOL_GPL (torture_stutter_init);@@ -714,3 +678,25 @@ void torture_kthread_stopping(char *title) } }EXPORT_SYMBOL_GPL (torture_kthread_stopping); + +/* +* Create a generic torture kthread that is immediately runnable. If you +* need the kthread to be stopped so that you can do something to it before +* it starts, you will need to open-code your own. +*/ +int _torture_create_kthread (int (*fn)(void *arg),void *arg,char *s,char *m, +char *f,struct task_struct **tp) +{ +int ret =0 ; + +VERBOSE_TOROUT_STRING (m); + *tp =kthread_run (fn, arg, s); +if (IS_ERR (*tp)) { + ret =PTR_ERR (*tp); +VERBOSE_TOROUT_ERRSTRING (f); + *tp =NULL ; + } +torture_shuffle_task_register (*tp); +return ret; +} +EXPORT_SYMBOL_GPL (_torture_create_kthread);Signature · 1 line
1.8.1.5
Quoted 55 lines · Paul E. McKenney
Hello!
This series contains rcutorture changes, including adding a simple locktorture. Creating this locktorture while sharing the rcutorture infrastructure was the main point of this patch, but this effort uncovered a number of shortcomings in rcutorture, which this series also fixes.
1-6. Usability improvements in rcutorture scripting.
7-13. Enable concurrent rcutorture runs on systems with sufficient
numbers of CPUs.14. Print the results directory at the end of the test.
15,17-25,27-28,30,32,37-41,46-48.
Abstract facilities from rcutorture module and scripting for later use by locktorture.16. Don't create a results directory for dryruns.
26. Print date and time of each phase of torturing.
29. Issue a diagnostic if something does a system shutdown while
rcutorture is running.31. Apply
ACCESS_ONCE()to racy fullstop accesses.33. Clean up
rcu_torture_init()error handling.34. Announce kthread creation.
35. Clean up a number of rcutorture shutdown races, unifying the
required shutdown actions into a newtorture_kthread_stopping()function.36. Add a missing return statement in
rcu_torture_barrier_init().42. Create a minimal locktorture module.
43-44. Add an on-purpose buggy RCU implementation to rcutorture to help
test the tests.45. Create a file for
Kconfigparameters that are commmon across all
rcutorture tests.49. Add beginning set of config files for locktorture.
50. Avoid SEGV when cleanup-hooks function pointer is NULL.
51. Add locktorture plugin for
kvm_recheck.sh.52. Rename TREE_RCU-Kconfig.txt to avoid confusing scripts that
look forKconfigfiles, courtesy of Paul Bolle.
Quoted 7 lines
53. Retain output from
kvm-test-1-run.shscript.54. Add an on-purpose buggy lock implementation to locktorture to
help test the tests.55. Save
kvm.shprogress messages to log so that they can be used
for later timing analysis.
I replied with comments on 15, 17, 19, 21, 35, and 37.
This series also appears to be missing patches numbered 12, 16, 18, 26, 38, 39, 43, and 53. (In some cases those patch numbers appear above but the corresponding patches don't appear in subsequent mails; in other cases those numbers appear missing above as well.)
For the remaining patches:
Quoted 66 lines · Josh Triplett
Quoted 55 lines · Paul E. McKenney
Hello!
This series contains rcutorture changes, including adding a simple locktorture. Creating this locktorture while sharing the rcutorture infrastructure was the main point of this patch, but this effort uncovered a number of shortcomings in rcutorture, which this series also fixes.
1-6. Usability improvements in rcutorture scripting.
7-13. Enable concurrent rcutorture runs on systems with sufficient
numbers of CPUs.14. Print the results directory at the end of the test.
15,17-25,27-28,30,32,37-41,46-48.
Abstract facilities from rcutorture module and scripting for later use by locktorture.16. Don't create a results directory for dryruns.
26. Print date and time of each phase of torturing.
29. Issue a diagnostic if something does a system shutdown while
rcutorture is running.31. Apply
ACCESS_ONCE()to racy fullstop accesses.33. Clean up
rcu_torture_init()error handling.34. Announce kthread creation.
35. Clean up a number of rcutorture shutdown races, unifying the
required shutdown actions into a newtorture_kthread_stopping()function.36. Add a missing return statement in
rcu_torture_barrier_init().42. Create a minimal locktorture module.
43-44. Add an on-purpose buggy RCU implementation to rcutorture to help
test the tests.45. Create a file for
Kconfigparameters that are commmon across all
rcutorture tests.49. Add beginning set of config files for locktorture.
50. Avoid SEGV when cleanup-hooks function pointer is NULL.
51. Add locktorture plugin for
kvm_recheck.sh.52. Rename TREE_RCU-Kconfig.txt to avoid confusing scripts that
look forKconfigfiles, courtesy of Paul Bolle.Quoted 7 lines
53. Retain output from
kvm-test-1-run.shscript.54. Add an on-purpose buggy lock implementation to locktorture to
help test the tests.55. Save
kvm.shprogress messages to log so that they can be used
for later timing analysis.I replied with comments on 15, 17, 19, 21, 35, and 37.
Quoted 7 lines
This series also appears to be missing patches numbered 12, 16, 18, 26, 38, 39, 43, and 53. (In some cases those patch numbers appear above but the corresponding patches don't appear in subsequent mails; in other cases those numbers appear missing above as well.)
For the remaining patches:
Reviewed-by Josh Triplett <[email protected]>
It appears that the patches that appeared "missing" showed up after all, but for some reason those mails were delayed.
for those as well.
Re: [PATCH tip/core/rcu 19/55] rcutorture: Abstract TOROUT_STRING() and friends
In reply to Josh TriplettQuoted 10 lines · Josh Triplett
Quoted 6 lines · Paul E. McKenney
From: "Paul E. McKenney" <[email protected]>
These diagnostic macros are not confined to torturing RCU, so this commit makes them available to other torture tests.
Signed-off-by Paul E. McKenney <[email protected]>This removes the do {} while (0) around the first of the macros, without any explanation in the commit message.
checkpatch.pl yelled at me about it. ;-)
Quoted 6 lines
Also, to what extent could these be made redundant with
pr_fmt? if(verbose) seems like it really ought to become a priority level or dynamic debugging (and it's really awful to further propagate macros that reference an out-of-macro variable). Ideally all of these could go away in favor ofpr_fmt, and then the individual calls to them would becomepr_alert,pr_debug,pr_error, or similar.
I don't immediately see how to get the "!!!" to be there or not with pr_fmt(), since the same pr_fmt() would apply to all the macros. I am also not all that excited about including "verbose" or similar into the argument list of all calls to these guys.
Other suggestions? Or am I missing your point?
Thanx, Paul
Quoted 48 lines
- Josh Triplett
Quoted 45 lines
include/linux/torture.h | 8 ++++++++ kernel/rcu/rcutorture.c | 8 -------- 2 files changed, 8 insertions(+), 8 deletions(-)include/linux/torture.h +8
-0@@ -41,6 +41,14 @@module_param (name, type,0444 ); \MODULE_PARM_DESC (name, msg); +#define TORTURE_FLAG "-torture:" +#define TOROUT_STRING (s) \ + pr_alert("%s" TORTURE_FLAG s "\n", torture_type) +#define VERBOSE_TOROUT_STRING (s) \ + do { if (verbose) pr_alert("%s" TORTURE_FLAG s "\n", torture_type); } while (0) +#define VERBOSE_TOROUT_ERRSTRING (s) \ + do { if (verbose) pr_alert("%s" TORTURE_FLAG "!!! " s "\n", torture_type); } while (0) +/* Low-rider random number generator. */ struct torture_random_state {unsigned long trs_state;kernel/rcu/rcutorture.c +0
-8@@ -96,14 +96,6 @@ static char *torture_type = "rcu";module_param (torture_type, charp,0444 );MODULE_PARM_DESC (torture_type,"Type of RCU to torture (rcu, rcu_bh, ...)" ); -#define TORTURE_FLAG "-torture:" -#define TOROUT_STRING (s) \ - do { pr_alert("%s" TORTURE_FLAG s "\n", torture_type); } while (0) -#define VERBOSE_TOROUT_STRING (s) \ - do { if (verbose) pr_alert("%s" TORTURE_FLAG s "\n", torture_type); } while (0) -#define VERBOSE_TOROUT_ERRSTRING (s) \ - do { if (verbose) pr_alert("%s" TORTURE_FLAG "!!! " s "\n", torture_type); } while (0) -static int nrealreaders;static struct task_struct *writer_task;static struct task_struct **fakewriter_tasks;Signature · 1 line
1.8.1.5
Re: [PATCH tip/core/rcu 21/55] rcutorture: Export torture_type and verbose module parameters
In reply to Josh TriplettQuoted 10 lines · Josh Triplett
Quoted 6 lines · Paul E. McKenney
From: "Paul E. McKenney" <[email protected]>
The
torture_typeand verbose module parameters are needed for log messages, so this commit exports them toinclude/linux/torture.h.Signed-off-by Paul E. McKenney <[email protected]>Assuming this doesn't go away (which I really hope it does), this needs to occur *before* the introduction of the macros using these variables.
Yep, it does go away. ;-)
But it bisects as is -- the only user at this point in the series is kernel/rcu/rcutorture.c, which is where the definitions got moved from.
Thanx, Paul
Quoted 47 lines
- Josh Triplett
Quoted 44 lines
include/linux/torture.h | 4 ++++ kernel/rcu/rcutorture.c | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-)include/linux/torture.h +4
-0@@ -49,6 +49,10 @@ extern int fullstop;/* Protect fullstop transitions and spawning of kthreads. */ extern struct mutex fullstop_mutex; +/* Common module parameters. */ +extern char *torture_type; +extern bool verbose; +#define TORTURE_FLAG "-torture:"#define TOROUT_STRING (s) \ pr_alert("%s" TORTURE_FLAG s "\n", torture_type)kernel/rcu/rcutorture.c +6
-2@@ -90,11 +90,15 @@ torture_parm(int, test_boost_interval, 7, "Interval between boost tests, seconds.");torture_parm (bool, test_no_idle_hz, true,"Test support for tickless idle CPUs" ); -torture_parm (bool, verbose, false,"Enable verbose debugging printk()s" ); -static char *torture_type ="rcu" ; +char *torture_type ="rcu" ; +EXPORT_SYMBOL_GPL (torture_type);module_param (torture_type, charp,0444 );MODULE_PARM_DESC (torture_type,"Type of RCU to torture (rcu, rcu_bh, ...)" ); +bool verbose; +EXPORT_SYMBOL_GPL (verbose); +module_param (verbose, bool,0444 ); +MODULE_PARM_DESC (verbose,"Enable verbose debugging printk()s" );static int nrealreaders;static struct task_struct *writer_task;Signature · 1 line
1.8.1.5
Quoted 9 lines · Josh Triplett
Quoted 8 lines · Paul E. McKenney
Hello!
This series contains rcutorture changes, including adding a simple locktorture. Creating this locktorture while sharing the rcutorture infrastructure was the main point of this patch, but this effort uncovered a number of shortcomings in rcutorture, which this series also fixes.
Quoted 4 lines
Quoted 4 lines
1-6. Usability improvements in rcutorture scripting.
7-13. Enable concurrent rcutorture runs on systems with sufficient
numbers of CPUs.
Checking this list first, then will check the patches themselves.
This one contains 12.
Quoted 5 lines
Quoted 5 lines
14. Print the results directory at the end of the test.
15,17-25,27-28,30,32,37-41,46-48.
Abstract facilities from rcutorture module and scripting for later use by locktorture.
18 is here. So is 38 and 39
Quoted 1 line
Quoted 1 line
16. Don't create a results directory for dryruns.
Here is 16.
Quoted 1 line
Quoted 1 line
26. Print date and time of each phase of torturing.
Here is 26.
Quoted 13 lines
Quoted 13 lines
29. Issue a diagnostic if something does a system shutdown while
rcutorture is running.31. Apply
ACCESS_ONCE()to racy fullstop accesses.33. Clean up
rcu_torture_init()error handling.34. Announce kthread creation.
35. Clean up a number of rcutorture shutdown races, unifying the
required shutdown actions into a newtorture_kthread_stopping()function.
Quoted 6 lines
Quoted 6 lines
36. Add a missing return statement in
rcu_torture_barrier_init().42. Create a minimal locktorture module.
43-44. Add an on-purpose buggy RCU implementation to rcutorture to help
test the tests.
Here is 43.
Quoted 5 lines
Quoted 5 lines
45. Create a file for
Kconfigparameters that are commmon across all
rcutorture tests.49. Add beginning set of config files for locktorture.
Quoted 8 lines
Quoted 8 lines
50. Avoid SEGV when cleanup-hooks function pointer is NULL.
51. Add locktorture plugin for
kvm_recheck.sh.52. Rename TREE_RCU-Kconfig.txt to avoid confusing scripts that
look forKconfigfiles, courtesy of Paul Bolle.53. Retain output from
kvm-test-1-run.shscript.
Here is 53.
Quoted 7 lines
Quoted 5 lines
54. Add an on-purpose buggy lock implementation to locktorture to
help test the tests.55. Save
kvm.shprogress messages to log so that they can be used
for later timing analysis.I replied with comments on 15, 17, 19, 21, 35, and 37.
Thank you, will respond/apply.
Quoted 4 lines
This series also appears to be missing patches numbered 12, 16, 18, 26, 38, 39, 43, and 53. (In some cases those patch numbers appear above but the corresponding patches don't appear in subsequent mails; in other cases those numbers appear missing above as well.)
I see them all above, and I received all of them. Here are URLs for them:
12: https://lkml.org/lkml/2014/2/17/616
16: http://www.mail-archive.com/[email protected]/msg590070.html
18: http://www.spinics.net/lists/kernel/msg1689535.html
26: http://comments.gmane.org/gmane.linux.kernel/1649714
38: http://www.spinics.net/lists/kernel/msg1689519.html
39: http://www.spinics.net/lists/kernel/msg1689526.html
43: https://lkml.org/lkml/2014/2/17/617
53: http://www.mail-archive.com/[email protected]/msg590028.html
(along with a very entertaining ad...)
I tried lkml.org first, so you are not the only one missing out on some of them. Hmmm...
I bounced them to you as well, so hopefully they will get there this time. Then again, you were --cc'ed on them to start with, so who knows?
Quoted 2 lines
For the remaining patches:
Reviewed-by Josh Triplett <[email protected]>
Thank you for your review and comments!
Thanx, Paul
Quoted 72 lines · Josh Triplett
Quoted 71 lines · Josh Triplett
Quoted 55 lines · Paul E. McKenney
Hello!
This series contains rcutorture changes, including adding a simple locktorture. Creating this locktorture while sharing the rcutorture infrastructure was the main point of this patch, but this effort uncovered a number of shortcomings in rcutorture, which this series also fixes.
1-6. Usability improvements in rcutorture scripting.
7-13. Enable concurrent rcutorture runs on systems with sufficient
numbers of CPUs.14. Print the results directory at the end of the test.
15,17-25,27-28,30,32,37-41,46-48.
Abstract facilities from rcutorture module and scripting for later use by locktorture.16. Don't create a results directory for dryruns.
26. Print date and time of each phase of torturing.
29. Issue a diagnostic if something does a system shutdown while
rcutorture is running.31. Apply
ACCESS_ONCE()to racy fullstop accesses.33. Clean up
rcu_torture_init()error handling.34. Announce kthread creation.
35. Clean up a number of rcutorture shutdown races, unifying the
required shutdown actions into a newtorture_kthread_stopping()function.36. Add a missing return statement in
rcu_torture_barrier_init().42. Create a minimal locktorture module.
43-44. Add an on-purpose buggy RCU implementation to rcutorture to help
test the tests.45. Create a file for
Kconfigparameters that are commmon across all
rcutorture tests.49. Add beginning set of config files for locktorture.
50. Avoid SEGV when cleanup-hooks function pointer is NULL.
51. Add locktorture plugin for
kvm_recheck.sh.52. Rename TREE_RCU-Kconfig.txt to avoid confusing scripts that
look forKconfigfiles, courtesy of Paul Bolle.Quoted 7 lines
53. Retain output from
kvm-test-1-run.shscript.54. Add an on-purpose buggy lock implementation to locktorture to
help test the tests.55. Save
kvm.shprogress messages to log so that they can be used
for later timing analysis.I replied with comments on 15, 17, 19, 21, 35, and 37.
This series also appears to be missing patches numbered 12, 16, 18, 26, 38, 39, 43, and 53. (In some cases those patch numbers appear above but the corresponding patches don't appear in subsequent mails; in other cases those numbers appear missing above as well.)
Quoted 7 lines
Quoted 2 lines
For the remaining patches:
Reviewed-by Josh Triplett <[email protected]>It appears that the patches that appeared "missing" showed up after all, but for some reason those mails were delayed.
Reviewed-by Josh Triplett <[email protected]>for those as well.
Whew! And thank you again!
Thanx, Paul
Josh Triplett
maintainerRe: [PATCH tip/core/rcu 19/55] rcutorture: Abstract TOROUT_STRING() and friends
In reply to Paul E. McKenneyQuoted 7 lines · Paul E. McKenney
Quoted 6 lines · Josh Triplett
Quoted 5 lines · Paul E. McKenney
From: "Paul E. McKenney" <[email protected]>
These diagnostic macros are not confined to torturing RCU, so this commit makes them available to other torture tests.
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Paul E. McKenney <[email protected]>This removes the do {} while (0) around the first of the macros, without any explanation in the commit message.
checkpatch.pl yelled at me about it. ;-)
That's a fine reason, but the change needs documenting in the commit message.
Quoted 9 lines
Quoted 6 lines
Also, to what extent could these be made redundant with
pr_fmt? if(verbose) seems like it really ought to become a priority level or dynamic debugging (and it's really awful to further propagate macros that reference an out-of-macro variable). Ideally all of these could go away in favor ofpr_fmt, and then the individual calls to them would becomepr_alert,pr_debug,pr_error, or similar.I don't immediately see how to get the "!!!" to be there or not with
pr_fmt(), since the samepr_fmt()would apply to all the macros.
Replace VERBOSE_TOROUT_ERRSTRING with something like pr_emerg, or leave it as pr_alert and drop the priority of the other variations to something less; then instead of "!!!" you have the existing message priority mechanism.
Also, if it helps, note that you can add parameters in pr_fmt, as long as they're the initial parameters and you add corresponding format specifiers before the passed format string. (Many modules do this to add __func__, for instance.)
Quoted 2 lines
I am also not all that excited about including "verbose" or similar into the argument list of all calls to these guys.
verbose could go away entirely in favor of dynamic debug; you could then turn debug on or off for the relevant torture test module instead of setting verbose.
- Josh Triplett
Re: [PATCH tip/core/rcu 19/55] rcutorture: Abstract TOROUT_STRING() and friends
Quoted 25 lines · Josh Triplett
Quoted 7 lines · Paul E. McKenney
Quoted 6 lines · Josh Triplett
Quoted 5 lines · Paul E. McKenney
From: "Paul E. McKenney" <[email protected]>
These diagnostic macros are not confined to torturing RCU, so this commit makes them available to other torture tests.
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Paul E. McKenney <[email protected]>This removes the do {} while (0) around the first of the macros, without any explanation in the commit message.
checkpatch.pl yelled at me about it. ;-)
That's a fine reason, but the change needs documenting in the commit message.
Quoted 7 lines
Quoted 6 lines
Also, to what extent could these be made redundant with
pr_fmt? if(verbose) seems like it really ought to become a priority level or dynamic debugging (and it's really awful to further propagate macros that reference an out-of-macro variable). Ideally all of these could go away in favor ofpr_fmt, and then the individual calls to them would becomepr_alert,pr_debug,pr_error, or similar.
Quoted 7 lines
Quoted 2 lines
I don't immediately see how to get the "!!!" to be there or not with
pr_fmt(), since the samepr_fmt()would apply to all the macros.Replace
VERBOSE_TOROUT_ERRSTRINGwith something likepr_emerg, or leave it aspr_alertand drop the priority of the other variations to something less; then instead of "!!!" you have the existing message priority mechanism.
Is this message-priority mechanism apparent over a serial console? As in can a script reading the serial console output tell what the message priority is?
Quoted 4 lines
Also, if it helps, note that you can add parameters in
pr_fmt, as long as they're the initial parameters and you add corresponding format specifiers before the passed format string. (Many modules do this to add__func__, for instance.)
Agreed, and I do see some uses of this sort.
Quoted 6 lines
Quoted 2 lines
I am also not all that excited about including "verbose" or similar into the argument list of all calls to these guys.
verbose could go away entirely in favor of dynamic debug; you could then turn debug on or off for the relevant torture test module instead of setting verbose.
But I need a pretty fully functional userspace to control the dynamic debug from what I can see. I really would like to avoid relying on having much of any userspace during rcutorture and locktorture testing. The reason is that avoiding a userspace greatly reduces my memory and disk requirements, allowing me to run more instances of rcutorture and locktorture in parallel on smaller systems.
Thanx, Paul
Josh Triplett
maintainerRe: [PATCH tip/core/rcu 19/55] rcutorture: Abstract TOROUT_STRING() and friends
Quoted 29 lines · Paul E. McKenney
Quoted 28 lines · Josh Triplett
Quoted 7 lines · Paul E. McKenney
Quoted 6 lines · Josh Triplett
Quoted 5 lines · Paul E. McKenney
From: "Paul E. McKenney" <[email protected]>
These diagnostic macros are not confined to torturing RCU, so this commit makes them available to other torture tests.
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Paul E. McKenney <[email protected]>This removes the do {} while (0) around the first of the macros, without any explanation in the commit message.
checkpatch.pl yelled at me about it. ;-)
That's a fine reason, but the change needs documenting in the commit message.
Quoted 9 lines
Quoted 6 lines
Also, to what extent could these be made redundant with
pr_fmt? if(verbose) seems like it really ought to become a priority level or dynamic debugging (and it's really awful to further propagate macros that reference an out-of-macro variable). Ideally all of these could go away in favor ofpr_fmt, and then the individual calls to them would becomepr_alert,pr_debug,pr_error, or similar.I don't immediately see how to get the "!!!" to be there or not with
pr_fmt(), since the samepr_fmt()would apply to all the macros.
Quoted 8 lines
Quoted 4 lines
Replace
VERBOSE_TOROUT_ERRSTRINGwith something likepr_emerg, or leave it aspr_alertand drop the priority of the other variations to something less; then instead of "!!!" you have the existing message priority mechanism.Is this message-priority mechanism apparent over a serial console? As in can a script reading the serial console output tell what the message priority is?
Good point. Well, if the use of "verbose" and "torture_type" went away in favor of dynamic debug and pr_fmt, respectively, then having an error-printing macro that just does pr_alert("!!! " ...) doesn't seem so bad.
Quoted 6 lines
Quoted 4 lines
Also, if it helps, note that you can add parameters in
pr_fmt, as long as they're the initial parameters and you add corresponding format specifiers before the passed format string. (Many modules do this to add__func__, for instance.)Agreed, and I do see some uses of this sort.
It should also handle the desired prefix that these macros are adding.
Quoted 7 lines
Quoted 6 lines
Quoted 2 lines
I am also not all that excited about including "verbose" or similar into the argument list of all calls to these guys.
verbose could go away entirely in favor of dynamic debug; you could then turn debug on or off for the relevant torture test module instead of setting verbose.
Quoted 6 lines
But I need a pretty fully functional userspace to control the dynamic debug from what I can see. I really would like to avoid relying on having much of any userspace during rcutorture and locktorture testing. The reason is that avoiding a userspace greatly reduces my memory and disk requirements, allowing me to run more instances of rcutorture and locktorture in parallel on smaller systems.
You can arbitrarily configure dynamic debug from the kernel command line; no userspace required.
- Josh Triplett
Re: [PATCH tip/core/rcu 17/55] rcutorture: Abstract torture_param()
In reply to Josh TriplettQuoted 7 lines · Josh Triplett
Quoted 6 lines · Paul E. McKenney
From: "Paul E. McKenney" <[email protected]>
Create a
torture_param()macro and apply it to rcutorture in order to save a few lines of code. This same macro may be applied to other torture frameworks.
Quoted 5 lines
Quoted 1 line
Signed-off-by Paul E. McKenney <[email protected]>Your commit message says "
torture_param", but your code says "torture_parm". Let's go with the former, please; no need to creat more disemvoweled abbreviations.
Gd pnt, fxd s sggstd.
Quoted 5 lines
Also, this seems rather generally useful. A quick check with "git grep -B2
MODULE_PARM_DESC" turns up numerous instances of the pattern. You might consider adding this as a helperDECLARE_MODULE_PARAM_ROininclude/linux/moduleparam.h(possibly calling a generalized version that takes the mode as another parameter).
Added to the todo list. Another parameter is static vs. not -- I only had one non-static instance, which I left open-coded.
Thanx, Paul
Re: [PATCH tip/core/rcu 15/55] rcutorture: Abstract rcu_torture_random()
In reply to Josh TriplettQuoted 20 lines · Josh Triplett
Quoted 19 lines · Paul E. McKenney
Quoted 17 lines · Josh Triplett
Quoted 7 lines · Paul E. McKenney
From: "Paul E. McKenney" <[email protected]>
Because
rcu_torture_random()will be used by the locking equivalent to rcutorture, pull it out into its own module.Suggested-by Rusty Russell <[email protected]>Signed-off-by Paul E. McKenney <[email protected]>I'd suggest making
CONFIG_TORTURE_TESTa completely invisible option, with no description; it should only be brought in via "select".Also, it doesn't need most of the headers it currently includes.
Have you considered moving it into the existing random generation infrastructure, as something like "
fast_insecure_nonblocking_random"? That seems more generally useful.
Quoted 8 lines
Quoted 4 lines
George Spelvin was also advising me on random-number generation in rcutorture, so I added him on CC. In any case, I would not be adverse to using some other random-number service, as long as it is fast enough. (George suggested some optimizations that I have not yet tried out.)
I suspect the fastest way to find out about any existing generator with the desired properties would be to post this one as a patch to the random number infrastructure and read the resulting replies. :)
;-)
Random-number improvements on todo list.
Thanx, Paul
Re: [PATCH tip/core/rcu 35/55] rcutorture: Fix rcutorture shutdown races
In reply to Josh TriplettQuoted 20 lines · Josh Triplett
Quoted 11 lines · Paul E. McKenney
From: "Paul E. McKenney" <[email protected]>
Not all of the rcutorture kthreads waited for
kthread_should_stop()before returning from their top-level functions, and none of them usedtorture_shutdown_absorb()properly. These problems can result in segfaults and hangs at shutdown time, and some recent changes perturbed timing sufficiently to make them much more probable. This commit therefore creates atorture_kthread_stopping()function that does the proper kthread shutdown dance in one centralized location.Signed-off-by Paul E. McKenney <[email protected]>One comment below.
Quoted 5 lines
include/linux/torture.h | 3 ++- kernel/rcu/rcutorture.c | 39 +++++++++++---------------------------- kernel/torture.c | 26 ++++++++++++++++++++++---- 3 files changed, 35 insertions(+), 33 deletions(-)
Quoted 13 lines
include/linux/torture.h line 48
Quoted 10 lines
include/linux/torture.h +1
-1@@ -45,7 +45,7 @@#define TOROUT_STRING (s) \ pr_alert("%s" TORTURE_FLAG s "\n", torture_type)#define VERBOSE_TOROUT_STRING (s) \ - do { if (verbose) pr_alert("%s" TORTURE_FLAG s "\n", torture_type); } while (0) + do { if (verbose) pr_alert("%s" TORTURE_FLAG " %s\n", torture_type, s); } while (0)This change is completely unrelated to the change described in the commit message. This should not be part of this commit.
Turns out that I left out a hunk applying this in torture_kthread_stopping(). I have added that hunk and updated the commit log explaining why the change to VERBOSE_TOROUT_STRING() is required.
Thanx, Paul
Quoted 182 lines
Quoted 181 lines
include/linux/torture.h +1
-0#define VERBOSE_TOROUT_ERRSTRING (s) \ do { if (verbose) pr_alert("%s" TORTURE_FLAG "!!! " s "\n", torture_type); } while (0)@@ -88,5 +88,6 @@ void torture_init_end(void);bool torture_cleanup (void );bool torture_must_stop (void );bool torture_must_stop_irq (void ); +void torture_kthread_stopping (char *title);#endif /* __LINUX_TORTURE_H */ kernel/rcu/rcutorture.c +11
-28@@ -601,12 +601,13 @@ checkwait: stutter_wait("rcu_torture_boost"); }while (!torture_must_stop ());/* Clean up and exit. */ -VERBOSE_TOROUT_STRING ("rcu_torture_boost task stopping" ); -torture_shutdown_absorb ("rcu_torture_boost" ); -while (!kthread_should_stop () || rbi.inflight) +while (!kthread_should_stop () || rbi.inflight) { +torture_shutdown_absorb ("rcu_torture_boost" );schedule_timeout_uninterruptible (1 ); + }smp_mb ();/* order accesses to ->inflight before stack-frame death. */ destroy_rcu_head_on_stack (&rbi.rcu); +torture_kthread_stopping ("rcu_torture_boost" );return 0 ; }@@ -637,10 +638,7 @@ rcu_torture_fqs(void *arg) }stutter_wait ("rcu_torture_fqs" ); }while (!torture_must_stop ()); -VERBOSE_TOROUT_STRING ("rcu_torture_fqs task stopping" ); -torture_shutdown_absorb ("rcu_torture_fqs" ); -while (!kthread_should_stop ()) -schedule_timeout_uninterruptible (1 ); +torture_kthread_stopping ("rcu_torture_fqs" );return 0 ; }@@ -709,10 +707,7 @@ rcu_torture_writer(void *arg)rcutorture_record_progress (++rcu_torture_current_version);stutter_wait ("rcu_torture_writer" ); }while (!torture_must_stop ()); -VERBOSE_TOROUT_STRING ("rcu_torture_writer task stopping" ); -torture_shutdown_absorb ("rcu_torture_writer" ); -while (!kthread_should_stop ()) -schedule_timeout_uninterruptible (1 ); +torture_kthread_stopping ("rcu_torture_writer" );return 0 ; }@@ -747,10 +742,7 @@ rcu_torture_fakewriter(void *arg)stutter_wait ("rcu_torture_fakewriter" ); }while (!torture_must_stop ()); -VERBOSE_TOROUT_STRING ("rcu_torture_fakewriter task stopping" ); -torture_shutdown_absorb ("rcu_torture_fakewriter" ); -while (!kthread_should_stop ()) -schedule_timeout_uninterruptible (1 ); +torture_kthread_stopping ("rcu_torture_fakewriter" );return 0 ; }@@ -891,12 +883,9 @@ rcu_torture_reader(void *arg)schedule ();stutter_wait ("rcu_torture_reader" ); }while (!torture_must_stop ()); -VERBOSE_TOROUT_STRING ("rcu_torture_reader task stopping" ); -torture_shutdown_absorb ("rcu_torture_reader" );if (irqreader && cur_ops->irq_capable)del_timer_sync (&t); -while (!kthread_should_stop ()) -schedule_timeout_uninterruptible (1 ); +torture_kthread_stopping ("rcu_torture_reader" );return 0 ; }@@ -1009,7 +998,7 @@ rcu_torture_stats(void *arg)rcu_torture_stats_print ();torture_shutdown_absorb ("rcu_torture_stats" ); }while (!torture_must_stop ()); -VERBOSE_TOROUT_STRING ("rcu_torture_stats task stopping" ); +torture_kthread_stopping ("rcu_torture_stats" );return 0 ; }@@ -1170,12 +1159,9 @@ static int rcu_torture_barrier_cbs(void *arg)if (atomic_dec_and_test (&barrier_cbs_count))wake_up (&barrier_wq); }while (!torture_must_stop ()); -VERBOSE_TOROUT_STRING ("rcu_torture_barrier_cbs task stopping" ); -torture_shutdown_absorb ("rcu_torture_barrier_cbs" ); -while (!kthread_should_stop ()) -schedule_timeout_interruptible (1 ); cur_ops->cb_barrier ();destroy_rcu_head_on_stack (&rcu); +torture_kthread_stopping ("rcu_torture_barrier_cbs" );return 0 ; }@@ -1206,10 +1192,7 @@ static int rcu_torture_barrier(void *arg) n_barrier_successes++;schedule_timeout_interruptible (HZ /10 ); }while (!torture_must_stop ()); -VERBOSE_TOROUT_STRING ("rcu_torture_barrier task stopping" ); -torture_shutdown_absorb ("rcu_torture_barrier" ); -while (!kthread_should_stop ()) -schedule_timeout_interruptible (1 ); +torture_kthread_stopping ("rcu_torture_barrier" );return 0 ; }kernel/torture.c +22
-4@@ -169,7 +169,7 @@ torture_onoff(void *arg) }schedule_timeout_interruptible (onoff_interval); } -VERBOSE_TOROUT_STRING ("torture_onoff task stopping" ); +torture_kthread_stopping ("torture_onoff" );return 0 ; }@@ -370,7 +370,7 @@ static int torture_shuffle(void *arg)torture_shuffle_tasks ();torture_shutdown_absorb ("torture_shuffle" ); }while (!torture_must_stop ()); -VERBOSE_TOROUT_STRING ("torture_shuffle task stopping" ); +torture_kthread_stopping ("torture_shuffle" );return 0 ; }@@ -465,7 +465,7 @@ static int torture_shutdown(void *arg) jiffies_snap = jiffies; }if (torture_must_stop ()) { -VERBOSE_TOROUT_STRING ("torture_shutdown task stopping" ); +torture_kthread_stopping ("torture_shutdown" );return 0 ; }@@ -583,7 +583,7 @@ static int torture_stutter(void *arg)ACCESS_ONCE (stutter_pause_test) =0 ;torture_shutdown_absorb ("torture_stutter" ); }while (!torture_must_stop ()); -VERBOSE_TOROUT_STRING ("torture_stutter task stopping" ); +torture_kthread_stopping ("torture_stutter" );return 0 ; }@@ -696,3 +696,21 @@ bool torture_must_stop_irq(void)return ACCESS_ONCE (fullstop) !=FULLSTOP_DONTSTOP ; }EXPORT_SYMBOL_GPL (torture_must_stop_irq); + +/* +* Each kthread must wait for kthread_should_stop() before returning from +* its top-level function, otherwise segfaults ensue. This function +* prints a "stopping" message and waits for kthread_should_stop(), and +* should be called from all torture kthreads immediately prior to +* returning. +*/ +void torture_kthread_stopping (char *title) +{ +if (verbose) +pr_alert ("%s" TORTURE_FLAG " %s\n" , torture_type, title); +while (!kthread_should_stop ()) { +torture_shutdown_absorb (title); +schedule_timeout_uninterruptible (1 ); + } +} +EXPORT_SYMBOL_GPL (torture_kthread_stopping);Signature · 1 line
1.8.1.5
Re: [PATCH tip/core/rcu 37/55] rcutorture: Abstract torture_create_kthread()
In reply to Josh TriplettQuoted 16 lines · Josh Triplett
Quoted 7 lines · Paul E. McKenney
From: "Paul E. McKenney" <[email protected]>
Creation of kthreads is not RCU-specific, so this commit abstracts out
torture_create_kthread(), saving a few tens of lines of code in the process.Signed-off-by Paul E. McKenney <[email protected]>One comment below.
Quoted 5 lines
include/linux/torture.h | 8 +++- kernel/rcu/rcutorture.c | 98 ++++++++++--------------------------------------- kernel/torture.c | 80 +++++++++++++++++----------------------- 3 files changed, 60 insertions(+), 126 deletions(-)
Quoted 12 lines
include/linux/torture.h line 50
Quoted 10 lines
include/linux/torture.h +1
-1@@ -47,7 +47,7 @@#define VERBOSE_TOROUT_STRING (s) \ do { if (verbose) pr_alert("%s" TORTURE_FLAG " %s\n", torture_type, s); } while (0)#define VERBOSE_TOROUT_ERRSTRING (s) \ - do { if (verbose) pr_alert("%s" TORTURE_FLAG "!!! " s "\n", torture_type); } while (0) + do { if (verbose) pr_alert("%s" TORTURE_FLAG "!!! %s\n", torture_type, s); } while (0)This change is also unrelated, and should not occur in this commit.
It is required for the invocation in _torture_create_kthread() below. I have updated the commit log to call this out.
Thanx, Paul
Quoted 310 lines
- Josh Triplett
Quoted 307 lines
include/linux/torture.h +6
-0/* Definitions for a non-string torture-test module parameter. */ #define torture_parm (type, name, init, msg) \@@ -89,5 +89,11 @@ bool torture_cleanup(void);bool torture_must_stop (void );bool torture_must_stop_irq (void );void torture_kthread_stopping (char *title); +int _torture_create_kthread (int (*fn)(void *arg),void *arg,char *s,char *m, +char *f,struct task_struct **tp); + +#define torture_create_kthread (n, arg, tp) \ + _torture_create_kthread(n, (arg), #n, "Creating " #n " task", \ + "Failed to create " #n, &(tp))#endif /* __LINUX_TORTURE_H */ kernel/rcu/rcutorture.c +20
-78@@ -1104,19 +1104,9 @@ static int rcu_torture_stall(void *args)/* Spawn CPU-stall kthread, if stall_cpu specified. */ static int __init rcu_torture_stall_init (void ) { -int ret; -if (stall_cpu <=0 )return 0 ; -VERBOSE_TOROUT_STRING ("Creating rcu_torture_stall task" ); - stall_task =kthread_run (rcu_torture_stall,NULL ,"rcu_torture_stall" ); -if (IS_ERR (stall_task)) { - ret =PTR_ERR (stall_task); - stall_task =NULL ; -return ret; - } -torture_shuffle_task_register (stall_task); -return 0 ; +return torture_create_kthread (rcu_torture_stall,NULL , stall_task); }/* Clean up after the CPU-stall kthread, if one was spawned. */ @@ -1225,29 +1215,13 @@ static int rcu_torture_barrier_init(void)return -ENOMEM ;for (i =0 ; i < n_barrier_cbs; i++) {init_waitqueue_head (&barrier_cbs_wq[i]); -VERBOSE_TOROUT_STRING ("Creating rcu_torture_barrier_cbs task" ); - barrier_cbs_tasks[i] =kthread_run (rcu_torture_barrier_cbs, - (void *)(long )i, -"rcu_torture_barrier_cbs" ); -if (IS_ERR (barrier_cbs_tasks[i])) { - ret =PTR_ERR (barrier_cbs_tasks[i]); -VERBOSE_TOROUT_ERRSTRING ("Failed to create rcu_torture_barrier_cbs" ); - barrier_cbs_tasks[i] =NULL ; + ret =torture_create_kthread (rcu_torture_barrier_cbs, + (void *)(long )i, + barrier_cbs_tasks[i]); +if (ret)return ret; - } -torture_shuffle_task_register (barrier_cbs_tasks[i]); } -VERBOSE_TOROUT_STRING ("Creating rcu_torture_barrier task" ); - barrier_task =kthread_run (rcu_torture_barrier,NULL , -"rcu_torture_barrier" ); -if (IS_ERR (barrier_task)) { - ret =PTR_ERR (barrier_task); -VERBOSE_TOROUT_ERRSTRING ("Failed to create rcu_torture_barrier" ); - barrier_task =NULL ; -return ret; - } -torture_shuffle_task_register (barrier_task); -return 0 ; +return torture_create_kthread (rcu_torture_barrier,NULL , barrier_task); }/* Clean up after RCU barrier testing. */ @@ -1515,17 +1489,10 @@ rcu_torture_init(void)/* Start up the kthreads. */ -VERBOSE_TOROUT_STRING ("Creating rcu_torture_writer task" ); - writer_task =kthread_create (rcu_torture_writer,NULL , -"rcu_torture_writer" ); -if (IS_ERR (writer_task)) { - firsterr =PTR_ERR (writer_task); -VERBOSE_TOROUT_ERRSTRING ("Failed to create writer" ); - writer_task =NULL ; + firsterr =torture_create_kthread (rcu_torture_writer,NULL , + writer_task); +if (firsterr) goto unwind; - } -torture_shuffle_task_register (writer_task); -wake_up_process (writer_task); fakewriter_tasks =kzalloc (nfakewriters *sizeof (fakewriter_tasks[0 ]),GFP_KERNEL );if (fakewriter_tasks ==NULL ) {@@ -1534,16 +1501,10 @@ rcu_torture_init(void) goto unwind; }for (i =0 ; i < nfakewriters; i++) { -VERBOSE_TOROUT_STRING ("Creating rcu_torture_fakewriter task" ); - fakewriter_tasks[i] =kthread_run (rcu_torture_fakewriter,NULL , -"rcu_torture_fakewriter" ); -if (IS_ERR (fakewriter_tasks[i])) { - firsterr =PTR_ERR (fakewriter_tasks[i]); -VERBOSE_TOROUT_ERRSTRING ("Failed to create fakewriter" ); - fakewriter_tasks[i] =NULL ; + firsterr =torture_create_kthread (rcu_torture_fakewriter, +NULL , fakewriter_tasks[i]); +if (firsterr) goto unwind; - } -torture_shuffle_task_register (fakewriter_tasks[i]); } reader_tasks =kzalloc (nrealreaders *sizeof (reader_tasks[0 ]),GFP_KERNEL );@@ -1553,28 +1514,16 @@ rcu_torture_init(void) goto unwind; }for (i =0 ; i < nrealreaders; i++) { -VERBOSE_TOROUT_STRING ("Creating rcu_torture_reader task" ); - reader_tasks[i] =kthread_run (rcu_torture_reader,NULL , -"rcu_torture_reader" ); -if (IS_ERR (reader_tasks[i])) { - firsterr =PTR_ERR (reader_tasks[i]); -VERBOSE_TOROUT_ERRSTRING ("Failed to create reader" ); - reader_tasks[i] =NULL ; + firsterr =torture_create_kthread (rcu_torture_reader,NULL , + reader_tasks[i]); +if (firsterr) goto unwind; - } -torture_shuffle_task_register (reader_tasks[i]); }if (stat_interval >0 ) { -VERBOSE_TOROUT_STRING ("Creating rcu_torture_stats task" ); - stats_task =kthread_run (rcu_torture_stats,NULL , -"rcu_torture_stats" ); -if (IS_ERR (stats_task)) { - firsterr =PTR_ERR (stats_task); -VERBOSE_TOROUT_ERRSTRING ("Failed to create stats" ); - stats_task =NULL ; + firsterr =torture_create_kthread (rcu_torture_stats,NULL , + stats_task); +if (firsterr) goto unwind; - } -torture_shuffle_task_register (stats_task); }if (test_no_idle_hz) { firsterr =torture_shuffle_init (shuffle_interval *HZ );@@ -1592,16 +1541,9 @@ rcu_torture_init(void) fqs_duration =0 ;if (fqs_duration) {/* Create the fqs thread */ -VERBOSE_TOROUT_STRING ("Creating rcu_torture_fqs task" ); - fqs_task =kthread_run (rcu_torture_fqs,NULL , -"rcu_torture_fqs" ); -if (IS_ERR (fqs_task)) { - firsterr =PTR_ERR (fqs_task); -VERBOSE_TOROUT_ERRSTRING ("Failed to create fqs" ); - fqs_task =NULL ; +torture_create_kthread (rcu_torture_fqs,NULL , fqs_task); +if (firsterr) goto unwind; - } -torture_shuffle_task_register (fqs_task); }if (test_boost_interval <1 ) test_boost_interval =1 ;kernel/torture.c +33
-47@@ -180,23 +180,16 @@ torture_onoff(void *arg)*/ int torture_onoff_init (long ooholdoff,long oointerval) { -#ifdef CONFIG_HOTPLUG_CPU -int ret; +int ret =0 ; +#ifdef CONFIG_HOTPLUG_CPU onoff_holdoff = ooholdoff; onoff_interval = oointerval;if (onoff_interval <=0 )return 0 ; -VERBOSE_TOROUT_STRING ("Creating torture_onoff task" ); - onoff_task =kthread_run (torture_onoff,NULL ,"torture_onoff" ); -if (IS_ERR (onoff_task)) { - ret =PTR_ERR (onoff_task); - onoff_task =NULL ; -return ret; - } -torture_shuffle_task_register (onoff_task); + ret =torture_create_kthread (torture_onoff,NULL , onoff_task);#endif /* #ifdef CONFIG_HOTPLUG_CPU */ -return 0 ; +return ret; }EXPORT_SYMBOL_GPL (torture_onoff_init);@@ -379,8 +372,6 @@ static int torture_shuffle(void *arg)*/ int torture_shuffle_init (long shuffint) { -int ret; - shuffle_interval = shuffint; shuffle_idle_cpu =-1 ;@@ -391,17 +382,7 @@ int torture_shuffle_init(long shuffint) }/* Create the shuffler thread */ -VERBOSE_TOROUT_STRING ("Creating torture_shuffle task" ); - shuffler_task =kthread_run (torture_shuffle,NULL ,"torture_shuffle" ); -if (IS_ERR (shuffler_task)) { - ret =PTR_ERR (shuffler_task); -free_cpumask_var (shuffle_tmp_mask); -VERBOSE_TOROUT_ERRSTRING ("Failed to create shuffler" ); - shuffler_task =NULL ; -return ret; - } -torture_shuffle_task_register (shuffler_task); -return 0 ; +return torture_create_kthread (torture_shuffle,NULL , shuffler_task); }EXPORT_SYMBOL_GPL (torture_shuffle_init);@@ -483,25 +464,16 @@ static int torture_shutdown(void *arg)*/ int torture_shutdown_init (int ssecs,void (*cleanup)(void )) { -int ret; +int ret =0 ; shutdown_secs = ssecs; torture_shutdown_hook = cleanup;if (shutdown_secs >0 ) { -VERBOSE_TOROUT_STRING ("Creating torture_shutdown task" ); shutdown_time = jiffies + shutdown_secs *HZ ; - shutdown_task =kthread_create (torture_shutdown,NULL , -"torture_shutdown" ); -if (IS_ERR (shutdown_task)) { - ret =PTR_ERR (shutdown_task); -VERBOSE_TOROUT_ERRSTRING ("Failed to create shutdown" ); - shutdown_task =NULL ; -return ret; - } -torture_shuffle_task_register (shutdown_task); -wake_up_process (shutdown_task); + ret =torture_create_kthread (torture_shutdown,NULL , + shutdown_task); } -return 0 ; +return ret; }EXPORT_SYMBOL_GPL (torture_shutdown_init);@@ -595,16 +567,8 @@ int torture_stutter_init(int s)int ret; stutter = s; -VERBOSE_TOROUT_STRING ("Creating torture_stutter task" ); - stutter_task =kthread_run (torture_stutter,NULL ,"torture_stutter" ); -if (IS_ERR (stutter_task)) { - ret =PTR_ERR (stutter_task); -VERBOSE_TOROUT_ERRSTRING ("Failed to create stutter" ); - stutter_task =NULL ; -return ret; - } -torture_shuffle_task_register (stutter_task); -return 0 ; + ret =torture_create_kthread (torture_stutter,NULL , stutter_task); +return ret; }EXPORT_SYMBOL_GPL (torture_stutter_init);@@ -714,3 +678,25 @@ void torture_kthread_stopping(char *title) } }EXPORT_SYMBOL_GPL (torture_kthread_stopping); + +/* +* Create a generic torture kthread that is immediately runnable. If you +* need the kthread to be stopped so that you can do something to it before +* it starts, you will need to open-code your own. +*/ +int _torture_create_kthread (int (*fn)(void *arg),void *arg,char *s,char *m, +char *f,struct task_struct **tp) +{ +int ret =0 ; + +VERBOSE_TOROUT_STRING (m); + *tp =kthread_run (fn, arg, s); +if (IS_ERR (*tp)) { + ret =PTR_ERR (*tp); +VERBOSE_TOROUT_ERRSTRING (f); + *tp =NULL ; + } +torture_shuffle_task_register (*tp); +return ret; +} +EXPORT_SYMBOL_GPL (_torture_create_kthread);Signature · 1 line
1.8.1.5
[email protected]
maintainerRe: [PATCH tip/core/rcu 17/55] rcutorture: Abstract torture_param()
In reply to Paul E. McKenneyQuoted 8 lines · Paul E. McKenney
Quoted 7 lines · Josh Triplett
Quoted 6 lines · Paul E. McKenney
From: "Paul E. McKenney" <[email protected]>
Create a
torture_param()macro and apply it to rcutorture in order to save a few lines of code. This same macro may be applied to other torture frameworks.
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
Signed-off-by Paul E. McKenney <[email protected]>Your commit message says "
torture_param", but your code says "torture_parm". Let's go with the former, please; no need to creat more disemvoweled abbreviations.Gd pnt, fxd s sggstd.
Thnks!
Quoted 8 lines
Quoted 5 lines
Also, this seems rather generally useful. A quick check with "git grep -B2
MODULE_PARM_DESC" turns up numerous instances of the pattern. You might consider adding this as a helperDECLARE_MODULE_PARAM_ROininclude/linux/moduleparam.h(possibly calling a generalized version that takes the mode as another parameter).Added to the todo list. Another parameter is static vs. not -- I only had one non-static instance, which I left open-coded.
I debated that one. You could leave out the "static" and just write "static DECLARE_MODULE_PARAM_RO", but given that you almost always *want* static for a module parameter...
- Josh Triplett
Re: [PATCH tip/core/rcu 37/55] rcutorture: Abstract torture_create_kthread()
In reply to Paul E. McKenneyQuoted 30 lines · Paul E. McKenney
Quoted 16 lines · Josh Triplett
Quoted 7 lines · Paul E. McKenney
From: "Paul E. McKenney" <[email protected]>
Creation of kthreads is not RCU-specific, so this commit abstracts out
torture_create_kthread(), saving a few tens of lines of code in the process.Signed-off-by Paul E. McKenney <[email protected]>One comment below.
Quoted 5 lines
include/linux/torture.h | 8 +++- kernel/rcu/rcutorture.c | 98 ++++++++++--------------------------------------- kernel/torture.c | 80 +++++++++++++++++----------------------- 3 files changed, 60 insertions(+), 126 deletions(-)Quoted 12 lines
include/linux/torture.h line 50
Quoted 10 lines
include/linux/torture.h +1
-1@@ -47,7 +47,7 @@#define VERBOSE_TOROUT_STRING (s) \ do { if (verbose) pr_alert("%s" TORTURE_FLAG " %s\n", torture_type, s); } while (0)#define VERBOSE_TOROUT_ERRSTRING (s) \ - do { if (verbose) pr_alert("%s" TORTURE_FLAG "!!! " s "\n", torture_type); } while (0) + do { if (verbose) pr_alert("%s" TORTURE_FLAG "!!! %s\n", torture_type, s); } while (0)This change is also unrelated, and should not occur in this commit.
Quoted 2 lines
It is required for the invocation in
_torture_create_kthread()below. I have updated the commit log to call this out.
I suppose it just seemed like both of these changes could occur in a separate commit enhancing the output macros, which would come before the commit using them. But OK.
Quoted 313 lines
Thanx, Paul
Quoted 310 lines
- Josh Triplett
Quoted 307 lines
include/linux/torture.h +6
-0/* Definitions for a non-string torture-test module parameter. */ #define torture_parm (type, name, init, msg) \@@ -89,5 +89,11 @@ bool torture_cleanup(void);bool torture_must_stop (void );bool torture_must_stop_irq (void );void torture_kthread_stopping (char *title); +int _torture_create_kthread (int (*fn)(void *arg),void *arg,char *s,char *m, +char *f,struct task_struct **tp); + +#define torture_create_kthread (n, arg, tp) \ + _torture_create_kthread(n, (arg), #n, "Creating " #n " task", \ + "Failed to create " #n, &(tp))#endif /* __LINUX_TORTURE_H */ kernel/rcu/rcutorture.c +20
-78@@ -1104,19 +1104,9 @@ static int rcu_torture_stall(void *args)/* Spawn CPU-stall kthread, if stall_cpu specified. */ static int __init rcu_torture_stall_init (void ) { -int ret; -if (stall_cpu <=0 )return 0 ; -VERBOSE_TOROUT_STRING ("Creating rcu_torture_stall task" ); - stall_task =kthread_run (rcu_torture_stall,NULL ,"rcu_torture_stall" ); -if (IS_ERR (stall_task)) { - ret =PTR_ERR (stall_task); - stall_task =NULL ; -return ret; - } -torture_shuffle_task_register (stall_task); -return 0 ; +return torture_create_kthread (rcu_torture_stall,NULL , stall_task); }/* Clean up after the CPU-stall kthread, if one was spawned. */ @@ -1225,29 +1215,13 @@ static int rcu_torture_barrier_init(void)return -ENOMEM ;for (i =0 ; i < n_barrier_cbs; i++) {init_waitqueue_head (&barrier_cbs_wq[i]); -VERBOSE_TOROUT_STRING ("Creating rcu_torture_barrier_cbs task" ); - barrier_cbs_tasks[i] =kthread_run (rcu_torture_barrier_cbs, - (void *)(long )i, -"rcu_torture_barrier_cbs" ); -if (IS_ERR (barrier_cbs_tasks[i])) { - ret =PTR_ERR (barrier_cbs_tasks[i]); -VERBOSE_TOROUT_ERRSTRING ("Failed to create rcu_torture_barrier_cbs" ); - barrier_cbs_tasks[i] =NULL ; + ret =torture_create_kthread (rcu_torture_barrier_cbs, + (void *)(long )i, + barrier_cbs_tasks[i]); +if (ret)return ret; - } -torture_shuffle_task_register (barrier_cbs_tasks[i]); } -VERBOSE_TOROUT_STRING ("Creating rcu_torture_barrier task" ); - barrier_task =kthread_run (rcu_torture_barrier,NULL , -"rcu_torture_barrier" ); -if (IS_ERR (barrier_task)) { - ret =PTR_ERR (barrier_task); -VERBOSE_TOROUT_ERRSTRING ("Failed to create rcu_torture_barrier" ); - barrier_task =NULL ; -return ret; - } -torture_shuffle_task_register (barrier_task); -return 0 ; +return torture_create_kthread (rcu_torture_barrier,NULL , barrier_task); }/* Clean up after RCU barrier testing. */ @@ -1515,17 +1489,10 @@ rcu_torture_init(void)/* Start up the kthreads. */ -VERBOSE_TOROUT_STRING ("Creating rcu_torture_writer task" ); - writer_task =kthread_create (rcu_torture_writer,NULL , -"rcu_torture_writer" ); -if (IS_ERR (writer_task)) { - firsterr =PTR_ERR (writer_task); -VERBOSE_TOROUT_ERRSTRING ("Failed to create writer" ); - writer_task =NULL ; + firsterr =torture_create_kthread (rcu_torture_writer,NULL , + writer_task); +if (firsterr) goto unwind; - } -torture_shuffle_task_register (writer_task); -wake_up_process (writer_task); fakewriter_tasks =kzalloc (nfakewriters *sizeof (fakewriter_tasks[0 ]),GFP_KERNEL );if (fakewriter_tasks ==NULL ) {@@ -1534,16 +1501,10 @@ rcu_torture_init(void) goto unwind; }for (i =0 ; i < nfakewriters; i++) { -VERBOSE_TOROUT_STRING ("Creating rcu_torture_fakewriter task" ); - fakewriter_tasks[i] =kthread_run (rcu_torture_fakewriter,NULL , -"rcu_torture_fakewriter" ); -if (IS_ERR (fakewriter_tasks[i])) { - firsterr =PTR_ERR (fakewriter_tasks[i]); -VERBOSE_TOROUT_ERRSTRING ("Failed to create fakewriter" ); - fakewriter_tasks[i] =NULL ; + firsterr =torture_create_kthread (rcu_torture_fakewriter, +NULL , fakewriter_tasks[i]); +if (firsterr) goto unwind; - } -torture_shuffle_task_register (fakewriter_tasks[i]); } reader_tasks =kzalloc (nrealreaders *sizeof (reader_tasks[0 ]),GFP_KERNEL );@@ -1553,28 +1514,16 @@ rcu_torture_init(void) goto unwind; }for (i =0 ; i < nrealreaders; i++) { -VERBOSE_TOROUT_STRING ("Creating rcu_torture_reader task" ); - reader_tasks[i] =kthread_run (rcu_torture_reader,NULL , -"rcu_torture_reader" ); -if (IS_ERR (reader_tasks[i])) { - firsterr =PTR_ERR (reader_tasks[i]); -VERBOSE_TOROUT_ERRSTRING ("Failed to create reader" ); - reader_tasks[i] =NULL ; + firsterr =torture_create_kthread (rcu_torture_reader,NULL , + reader_tasks[i]); +if (firsterr) goto unwind; - } -torture_shuffle_task_register (reader_tasks[i]); }if (stat_interval >0 ) { -VERBOSE_TOROUT_STRING ("Creating rcu_torture_stats task" ); - stats_task =kthread_run (rcu_torture_stats,NULL , -"rcu_torture_stats" ); -if (IS_ERR (stats_task)) { - firsterr =PTR_ERR (stats_task); -VERBOSE_TOROUT_ERRSTRING ("Failed to create stats" ); - stats_task =NULL ; + firsterr =torture_create_kthread (rcu_torture_stats,NULL , + stats_task); +if (firsterr) goto unwind; - } -torture_shuffle_task_register (stats_task); }if (test_no_idle_hz) { firsterr =torture_shuffle_init (shuffle_interval *HZ );@@ -1592,16 +1541,9 @@ rcu_torture_init(void) fqs_duration =0 ;if (fqs_duration) {/* Create the fqs thread */ -VERBOSE_TOROUT_STRING ("Creating rcu_torture_fqs task" ); - fqs_task =kthread_run (rcu_torture_fqs,NULL , -"rcu_torture_fqs" ); -if (IS_ERR (fqs_task)) { - firsterr =PTR_ERR (fqs_task); -VERBOSE_TOROUT_ERRSTRING ("Failed to create fqs" ); - fqs_task =NULL ; +torture_create_kthread (rcu_torture_fqs,NULL , fqs_task); +if (firsterr) goto unwind; - } -torture_shuffle_task_register (fqs_task); }if (test_boost_interval <1 ) test_boost_interval =1 ;kernel/torture.c +33
-47@@ -180,23 +180,16 @@ torture_onoff(void *arg)*/ int torture_onoff_init (long ooholdoff,long oointerval) { -#ifdef CONFIG_HOTPLUG_CPU -int ret; +int ret =0 ; +#ifdef CONFIG_HOTPLUG_CPU onoff_holdoff = ooholdoff; onoff_interval = oointerval;if (onoff_interval <=0 )return 0 ; -VERBOSE_TOROUT_STRING ("Creating torture_onoff task" ); - onoff_task =kthread_run (torture_onoff,NULL ,"torture_onoff" ); -if (IS_ERR (onoff_task)) { - ret =PTR_ERR (onoff_task); - onoff_task =NULL ; -return ret; - } -torture_shuffle_task_register (onoff_task); + ret =torture_create_kthread (torture_onoff,NULL , onoff_task);#endif /* #ifdef CONFIG_HOTPLUG_CPU */ -return 0 ; +return ret; }EXPORT_SYMBOL_GPL (torture_onoff_init);@@ -379,8 +372,6 @@ static int torture_shuffle(void *arg)*/ int torture_shuffle_init (long shuffint) { -int ret; - shuffle_interval = shuffint; shuffle_idle_cpu =-1 ;@@ -391,17 +382,7 @@ int torture_shuffle_init(long shuffint) }/* Create the shuffler thread */ -VERBOSE_TOROUT_STRING ("Creating torture_shuffle task" ); - shuffler_task =kthread_run (torture_shuffle,NULL ,"torture_shuffle" ); -if (IS_ERR (shuffler_task)) { - ret =PTR_ERR (shuffler_task); -free_cpumask_var (shuffle_tmp_mask); -VERBOSE_TOROUT_ERRSTRING ("Failed to create shuffler" ); - shuffler_task =NULL ; -return ret; - } -torture_shuffle_task_register (shuffler_task); -return 0 ; +return torture_create_kthread (torture_shuffle,NULL , shuffler_task); }EXPORT_SYMBOL_GPL (torture_shuffle_init);@@ -483,25 +464,16 @@ static int torture_shutdown(void *arg)*/ int torture_shutdown_init (int ssecs,void (*cleanup)(void )) { -int ret; +int ret =0 ; shutdown_secs = ssecs; torture_shutdown_hook = cleanup;if (shutdown_secs >0 ) { -VERBOSE_TOROUT_STRING ("Creating torture_shutdown task" ); shutdown_time = jiffies + shutdown_secs *HZ ; - shutdown_task =kthread_create (torture_shutdown,NULL , -"torture_shutdown" ); -if (IS_ERR (shutdown_task)) { - ret =PTR_ERR (shutdown_task); -VERBOSE_TOROUT_ERRSTRING ("Failed to create shutdown" ); - shutdown_task =NULL ; -return ret; - } -torture_shuffle_task_register (shutdown_task); -wake_up_process (shutdown_task); + ret =torture_create_kthread (torture_shutdown,NULL , + shutdown_task); } -return 0 ; +return ret; }EXPORT_SYMBOL_GPL (torture_shutdown_init);@@ -595,16 +567,8 @@ int torture_stutter_init(int s)int ret; stutter = s; -VERBOSE_TOROUT_STRING ("Creating torture_stutter task" ); - stutter_task =kthread_run (torture_stutter,NULL ,"torture_stutter" ); -if (IS_ERR (stutter_task)) { - ret =PTR_ERR (stutter_task); -VERBOSE_TOROUT_ERRSTRING ("Failed to create stutter" ); - stutter_task =NULL ; -return ret; - } -torture_shuffle_task_register (stutter_task); -return 0 ; + ret =torture_create_kthread (torture_stutter,NULL , stutter_task); +return ret; }EXPORT_SYMBOL_GPL (torture_stutter_init);@@ -714,3 +678,25 @@ void torture_kthread_stopping(char *title) } }EXPORT_SYMBOL_GPL (torture_kthread_stopping); + +/* +* Create a generic torture kthread that is immediately runnable. If you +* need the kthread to be stopped so that you can do something to it before +* it starts, you will need to open-code your own. +*/ +int _torture_create_kthread (int (*fn)(void *arg),void *arg,char *s,char *m, +char *f,struct task_struct **tp) +{ +int ret =0 ; + +VERBOSE_TOROUT_STRING (m); + *tp =kthread_run (fn, arg, s); +if (IS_ERR (*tp)) { + ret =PTR_ERR (*tp); +VERBOSE_TOROUT_ERRSTRING (f); + *tp =NULL ; + } +torture_shuffle_task_register (*tp); +return ret; +} +EXPORT_SYMBOL_GPL (_torture_create_kthread);Signature · 1 line
1.8.1.5
Re: [PATCH tip/core/rcu 15/55] rcutorture: Abstract rcu_torture_random()
In reply to Josh TriplettQuoted 3 lines · Josh Triplett
I suspect the fastest way to find out about any existing generator with the desired properties would be to post this one as a patch to the random number infrastructure and read the resulting replies. :)
But thank you for not choosing the most irritating alternative simply on the grounds that "it gets a faster response".
Re: [PATCH tip/core/rcu 17/55] rcutorture: Abstract torture_param()
In reply to [email protected]Quoted 25 lines · On Tue, Feb 18, 2014 at 03:53:40PM -0800, [email protected] wrote:
Quoted 8 lines · Paul E. McKenney
Quoted 7 lines · Josh Triplett
Quoted 6 lines · Paul E. McKenney
From: "Paul E. McKenney" <[email protected]>
Create a
torture_param()macro and apply it to rcutorture in order to save a few lines of code. This same macro may be applied to other torture frameworks.Quoted 7 lines
Quoted 5 lines
Quoted 1 line
Signed-off-by Paul E. McKenney <[email protected]>Your commit message says "
torture_param", but your code says "torture_parm". Let's go with the former, please; no need to creat more disemvoweled abbreviations.Gd pnt, fxd s sggstd.
Thnks!
Quoted 6 lines
Quoted 5 lines
Also, this seems rather generally useful. A quick check with "git grep -B2
MODULE_PARM_DESC" turns up numerous instances of the pattern. You might consider adding this as a helperDECLARE_MODULE_PARAM_ROininclude/linux/moduleparam.h(possibly calling a generalized version that takes the mode as another parameter).
Quoted 6 lines
Quoted 2 lines
Added to the todo list. Another parameter is static vs. not -- I only had one non-static instance, which I left open-coded.
I debated that one. You could leave out the "static" and just write "static
DECLARE_MODULE_PARAM_RO", but given that you almost always *want* static for a module parameter...
Indeed, adding a storage-class argument for the benefit of only one parameter didn't seem to make sense.
Thanx, Paul