diff options
author | Josh Triplett <josht@us.ibm.com> | 2006-10-04 05:17:16 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 10:55:31 -0400 |
commit | 11a147013e39ff4cb031395cb78a9d307c4799cd (patch) | |
tree | bbacc6c3cb3cc53e6f92da1bd6632f37a056dfeb | |
parent | 20d2e4283a97665a3db78c60dfa342a0c7c1b180 (diff) |
[PATCH] rcu: add rcu_bh_sync torture type to rcutorture
Use the newly-generic synchronous deferred free function to implement torture
testing for rcu_bh using synchronize_rcu_bh rather than the asynchronous
call_rcu_bh.
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.txt | 5 | ||||
-rw-r--r-- | kernel/rcutorture.c | 16 |
2 files changed, 18 insertions, 3 deletions
diff --git a/Documentation/RCU/torture.txt b/Documentation/RCU/torture.txt index 6714b5361158..cc4b1efe5ea8 100644 --- a/Documentation/RCU/torture.txt +++ b/Documentation/RCU/torture.txt | |||
@@ -55,8 +55,9 @@ test_no_idle_hz Whether or not to test the ability of RCU to operate in | |||
55 | 55 | ||
56 | torture_type The type of RCU to test: "rcu" for the rcu_read_lock() API, | 56 | torture_type The type of RCU to test: "rcu" for the rcu_read_lock() API, |
57 | "rcu_sync" for rcu_read_lock() with synchronous reclamation, | 57 | "rcu_sync" for rcu_read_lock() with synchronous reclamation, |
58 | "rcu_bh" for the rcu_read_lock_bh() API, and "srcu" for the | 58 | "rcu_bh" for the rcu_read_lock_bh() API, "rcu_bh_sync" for |
59 | "srcu_read_lock()" API. | 59 | rcu_read_lock_bh() with synchronous reclamation, and "srcu" |
60 | for the "srcu_read_lock()" API. | ||
60 | 61 | ||
61 | verbose Enable debug printk()s. Default is disabled. | 62 | verbose Enable debug printk()s. Default is disabled. |
62 | 63 | ||
diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c index 1c329df60bcc..0f0ff1556b5d 100644 --- a/kernel/rcutorture.c +++ b/kernel/rcutorture.c | |||
@@ -370,6 +370,19 @@ static struct rcu_torture_ops rcu_bh_ops = { | |||
370 | .name = "rcu_bh" | 370 | .name = "rcu_bh" |
371 | }; | 371 | }; |
372 | 372 | ||
373 | static struct rcu_torture_ops rcu_bh_sync_ops = { | ||
374 | .init = rcu_sync_torture_init, | ||
375 | .cleanup = NULL, | ||
376 | .readlock = rcu_bh_torture_read_lock, | ||
377 | .readdelay = rcu_read_delay, /* just reuse rcu's version. */ | ||
378 | .readunlock = rcu_bh_torture_read_unlock, | ||
379 | .completed = rcu_bh_torture_completed, | ||
380 | .deferredfree = rcu_sync_torture_deferred_free, | ||
381 | .sync = rcu_bh_torture_synchronize, | ||
382 | .stats = NULL, | ||
383 | .name = "rcu_bh_sync" | ||
384 | }; | ||
385 | |||
373 | /* | 386 | /* |
374 | * Definitions for srcu torture testing. | 387 | * Definitions for srcu torture testing. |
375 | */ | 388 | */ |
@@ -452,7 +465,8 @@ static struct rcu_torture_ops srcu_ops = { | |||
452 | }; | 465 | }; |
453 | 466 | ||
454 | static struct rcu_torture_ops *torture_ops[] = | 467 | static struct rcu_torture_ops *torture_ops[] = |
455 | { &rcu_ops, &rcu_sync_ops, &rcu_bh_ops, &srcu_ops, NULL }; | 468 | { &rcu_ops, &rcu_sync_ops, &rcu_bh_ops, &rcu_bh_sync_ops, &srcu_ops, |
469 | NULL }; | ||
456 | 470 | ||
457 | /* | 471 | /* |
458 | * RCU torture writer kthread. Repeatedly substitutes a new structure | 472 | * RCU torture writer kthread. Repeatedly substitutes a new structure |