aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Triplett <josht@us.ibm.com>2006-10-04 05:17:15 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 10:55:31 -0400
commit20d2e4283a97665a3db78c60dfa342a0c7c1b180 (patch)
tree25bb664ab495fe4afcf9b2f85e438a437af0f85c
parente3033736581f125ba5fd6c0760e0d430d54fb5c0 (diff)
[PATCH] rcu: add rcu_sync torture type to rcutorture
Use the newly-generic synchronous deferred free function to implement torture testing for RCU using synchronize_rcu rather than the asynchronous call_rcu. Signed-off-by: Josh Triplett <josh@freedesktop.org> Acked-by: Paul E. McKenney <paulmck@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--Documentation/RCU/torture.txt7
-rw-r--r--kernel/rcutorture.c17
2 files changed, 19 insertions, 5 deletions
diff --git a/Documentation/RCU/torture.txt b/Documentation/RCU/torture.txt
index 2180ef93accc..6714b5361158 100644
--- a/Documentation/RCU/torture.txt
+++ b/Documentation/RCU/torture.txt
@@ -53,9 +53,10 @@ test_no_idle_hz Whether or not to test the ability of RCU to operate in
53 a kernel that disables the scheduling-clock interrupt to 53 a kernel that disables the scheduling-clock interrupt to
54 idle CPUs. Boolean parameter, "1" to test, "0" otherwise. 54 idle CPUs. Boolean parameter, "1" to test, "0" otherwise.
55 55
56torture_type The type of RCU to test: "rcu" for the rcu_read_lock() 56torture_type The type of RCU to test: "rcu" for the rcu_read_lock() API,
57 API, "rcu_bh" for the rcu_read_lock_bh() API, and "srcu" 57 "rcu_sync" for rcu_read_lock() with synchronous reclamation,
58 for the "srcu_read_lock()" API. 58 "rcu_bh" for the rcu_read_lock_bh() API, and "srcu" for the
59 "srcu_read_lock()" API.
59 60
60verbose Enable debug printk()s. Default is disabled. 61verbose Enable debug printk()s. Default is disabled.
61 62
diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c
index 6e2f0a8344c2..1c329df60bcc 100644
--- a/kernel/rcutorture.c
+++ b/kernel/rcutorture.c
@@ -58,7 +58,7 @@ static int stat_interval; /* Interval between stats, in seconds. */
58static int verbose; /* Print more debug info. */ 58static int verbose; /* Print more debug info. */
59static int test_no_idle_hz; /* Test RCU's support for tickless idle CPUs. */ 59static int test_no_idle_hz; /* Test RCU's support for tickless idle CPUs. */
60static int shuffle_interval = 5; /* Interval between shuffles (in sec)*/ 60static int shuffle_interval = 5; /* Interval between shuffles (in sec)*/
61static char *torture_type = "rcu"; /* What to torture: rcu, rcu_bh, srcu. */ 61static char *torture_type = "rcu"; /* What RCU implementation to torture. */
62 62
63module_param(nreaders, int, 0); 63module_param(nreaders, int, 0);
64MODULE_PARM_DESC(nreaders, "Number of RCU reader threads"); 64MODULE_PARM_DESC(nreaders, "Number of RCU reader threads");
@@ -297,6 +297,19 @@ static void rcu_sync_torture_init(void)
297 INIT_LIST_HEAD(&rcu_torture_removed); 297 INIT_LIST_HEAD(&rcu_torture_removed);
298} 298}
299 299
300static struct rcu_torture_ops rcu_sync_ops = {
301 .init = rcu_sync_torture_init,
302 .cleanup = NULL,
303 .readlock = rcu_torture_read_lock,
304 .readdelay = rcu_read_delay,
305 .readunlock = rcu_torture_read_unlock,
306 .completed = rcu_torture_completed,
307 .deferredfree = rcu_sync_torture_deferred_free,
308 .sync = synchronize_rcu,
309 .stats = NULL,
310 .name = "rcu_sync"
311};
312
300/* 313/*
301 * Definitions for rcu_bh torture testing. 314 * Definitions for rcu_bh torture testing.
302 */ 315 */
@@ -439,7 +452,7 @@ static struct rcu_torture_ops srcu_ops = {
439}; 452};
440 453
441static struct rcu_torture_ops *torture_ops[] = 454static struct rcu_torture_ops *torture_ops[] =
442 { &rcu_ops, &rcu_bh_ops, &srcu_ops, NULL }; 455 { &rcu_ops, &rcu_sync_ops, &rcu_bh_ops, &srcu_ops, NULL };
443 456
444/* 457/*
445 * RCU torture writer kthread. Repeatedly substitutes a new structure 458 * RCU torture writer kthread. Repeatedly substitutes a new structure