leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rcu: add call_rcu_sched() and friends to rcutorture

Browse Source 
Add entry to rcu_torture_ops allowing the correct barrier function to
be used upon exit from rcutorture.  Also add torture options for the
new call_rcu_sched() API.

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Paul E. McKenney 2008-05-12 21:21:05 +02:00 committed by Ingo Molnar
parent 70f12f848d
commit 2326974df2
1 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
kernel/rcutorture.c
View File

@ -192,6 +192,7 @@ struct rcu_torture_ops {
int (*completed)(void); int (*completed)(void);
void (*deferredfree)(struct rcu_torture *p); void (*deferredfree)(struct rcu_torture *p);
void (*sync)(void); void (*sync)(void);
void (*cb_barrier)(void);
int (*stats)(char *page); int (*stats)(char *page);
char *name; char *name;
}; };
@ -265,6 +266,7 @@ static struct rcu_torture_ops rcu_ops = {
.completed = rcu_torture_completed, .completed = rcu_torture_completed,
.deferredfree = rcu_torture_deferred_free, .deferredfree = rcu_torture_deferred_free,
.sync = synchronize_rcu, .sync = synchronize_rcu,
.cb_barrier = rcu_barrier,
.stats = NULL, .stats = NULL,
.name = "rcu" .name = "rcu"
}; };
@ -304,6 +306,7 @@ static struct rcu_torture_ops rcu_sync_ops = {
.completed = rcu_torture_completed, .completed = rcu_torture_completed,
.deferredfree = rcu_sync_torture_deferred_free, .deferredfree = rcu_sync_torture_deferred_free,
.sync = synchronize_rcu, .sync = synchronize_rcu,
.cb_barrier = NULL,
.stats = NULL, .stats = NULL,
.name = "rcu_sync" .name = "rcu_sync"
}; };
@ -364,6 +367,7 @@ static struct rcu_torture_ops rcu_bh_ops = {
.completed = rcu_bh_torture_completed, .completed = rcu_bh_torture_completed,
.deferredfree = rcu_bh_torture_deferred_free, .deferredfree = rcu_bh_torture_deferred_free,
.sync = rcu_bh_torture_synchronize, .sync = rcu_bh_torture_synchronize,
.cb_barrier = rcu_barrier_bh,
.stats = NULL, .stats = NULL,
.name = "rcu_bh" .name = "rcu_bh"
}; };
@ -377,6 +381,7 @@ static struct rcu_torture_ops rcu_bh_sync_ops = {
.completed = rcu_bh_torture_completed, .completed = rcu_bh_torture_completed,
.deferredfree = rcu_sync_torture_deferred_free, .deferredfree = rcu_sync_torture_deferred_free,
.sync = rcu_bh_torture_synchronize, .sync = rcu_bh_torture_synchronize,
.cb_barrier = NULL,
.stats = NULL, .stats = NULL,
.name = "rcu_bh_sync" .name = "rcu_bh_sync"
}; };
@ -458,6 +463,7 @@ static struct rcu_torture_ops srcu_ops = {
.completed = srcu_torture_completed, .completed = srcu_torture_completed,
.deferredfree = rcu_sync_torture_deferred_free, .deferredfree = rcu_sync_torture_deferred_free,
.sync = srcu_torture_synchronize, .sync = srcu_torture_synchronize,
.cb_barrier = NULL,
.stats = srcu_torture_stats, .stats = srcu_torture_stats,
.name = "srcu" .name = "srcu"
}; };
@ -482,6 +488,11 @@ static int sched_torture_completed(void)
return 0; return 0;
} }
static void rcu_sched_torture_deferred_free(struct rcu_torture *p)
{
call_rcu_sched(&p->rtort_rcu, rcu_torture_cb);
}
static void sched_torture_synchronize(void) static void sched_torture_synchronize(void)
{ {
synchronize_sched(); synchronize_sched();
@ -494,12 +505,27 @@ static struct rcu_torture_ops sched_ops = {
.readdelay = rcu_read_delay, /* just reuse rcu's version. */ .readdelay = rcu_read_delay, /* just reuse rcu's version. */
.readunlock = sched_torture_read_unlock, .readunlock = sched_torture_read_unlock,
.completed = sched_torture_completed, .completed = sched_torture_completed,
.deferredfree = rcu_sync_torture_deferred_free, .deferredfree = rcu_sched_torture_deferred_free,
.sync = sched_torture_synchronize, .sync = sched_torture_synchronize,
.cb_barrier = rcu_barrier_sched,
.stats = NULL, .stats = NULL,
.name = "sched" .name = "sched"
}; };
static struct rcu_torture_ops sched_ops_sync = {
.init = rcu_sync_torture_init,
.cleanup = NULL,
.readlock = sched_torture_read_lock,
.readdelay = rcu_read_delay, /* just reuse rcu's version. */
.readunlock = sched_torture_read_unlock,
.completed = sched_torture_completed,
.deferredfree = rcu_sync_torture_deferred_free,
.sync = sched_torture_synchronize,
.cb_barrier = NULL,
.stats = NULL,
.name = "sched_sync"
};
/* /*
* RCU torture writer kthread. Repeatedly substitutes a new structure * RCU torture writer kthread. Repeatedly substitutes a new structure
* for that pointed to by rcu_torture_current, freeing the old structure * for that pointed to by rcu_torture_current, freeing the old structure
@ -848,7 +874,9 @@ rcu_torture_cleanup(void)
stats_task = NULL; stats_task = NULL;
/* Wait for all RCU callbacks to fire. */ /* Wait for all RCU callbacks to fire. */
rcu_barrier();
if (cur_ops->cb_barrier != NULL)
cur_ops->cb_barrier();
rcu_torture_stats_print(); /* -After- the stats thread is stopped! */ rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
@ -868,7 +896,7 @@ rcu_torture_init(void)
int firsterr = 0; int firsterr = 0;
static struct rcu_torture_ops *torture_ops[] = static struct rcu_torture_ops *torture_ops[] =
{ &rcu_ops, &rcu_sync_ops, &rcu_bh_ops, &rcu_bh_sync_ops, { &rcu_ops, &rcu_sync_ops, &rcu_bh_ops, &rcu_bh_sync_ops,
&srcu_ops, &sched_ops, }; &srcu_ops, &sched_ops, &sched_ops_sync, };
/* Process args and tell the world that the torturer is on the job. */ /* Process args and tell the world that the torturer is on the job. */
for (i = 0; i < ARRAY_SIZE(torture_ops); i++) { for (i = 0; i < ARRAY_SIZE(torture_ops); i++) {