Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
[powerpc.git] / kernel / rcutorture.c
index e045021..bcd14e8 100644 (file)
@@ -58,21 +58,21 @@ static int stat_interval;   /* Interval between stats, in seconds. */
 static int verbose;            /* Print more debug info. */
 static int test_no_idle_hz;    /* Test RCU's support for tickless idle CPUs. */
 static int shuffle_interval = 5; /* Interval between shuffles (in sec)*/
-static char *torture_type = "rcu"; /* What to torture: rcu, rcu_bh, srcu. */
+static char *torture_type = "rcu"; /* What RCU implementation to torture. */
 
-module_param(nreaders, int, 0);
+module_param(nreaders, int, 0444);
 MODULE_PARM_DESC(nreaders, "Number of RCU reader threads");
-module_param(nfakewriters, int, 0);
+module_param(nfakewriters, int, 0444);
 MODULE_PARM_DESC(nfakewriters, "Number of RCU fake writer threads");
-module_param(stat_interval, int, 0);
+module_param(stat_interval, int, 0444);
 MODULE_PARM_DESC(stat_interval, "Number of seconds between stats printk()s");
-module_param(verbose, bool, 0);
+module_param(verbose, bool, 0444);
 MODULE_PARM_DESC(verbose, "Enable verbose debugging printk()s");
-module_param(test_no_idle_hz, bool, 0);
+module_param(test_no_idle_hz, bool, 0444);
 MODULE_PARM_DESC(test_no_idle_hz, "Test support for tickless idle CPUs");
-module_param(shuffle_interval, int, 0);
+module_param(shuffle_interval, int, 0444);
 MODULE_PARM_DESC(shuffle_interval, "Number of seconds between shuffles");
-module_param(torture_type, charp, 0);
+module_param(torture_type, charp, 0444);
 MODULE_PARM_DESC(torture_type, "Type of RCU to torture (rcu, rcu_bh, srcu)");
 
 #define TORTURE_FLAG "-torture:"
@@ -117,6 +117,7 @@ static atomic_t n_rcu_torture_alloc_fail;
 static atomic_t n_rcu_torture_free;
 static atomic_t n_rcu_torture_mberror;
 static atomic_t n_rcu_torture_error;
+static struct list_head rcu_torture_removed;
 
 /*
  * Allocate an element from the rcu_tortures pool.
@@ -270,6 +271,45 @@ static struct rcu_torture_ops rcu_ops = {
        .name = "rcu"
 };
 
+static void rcu_sync_torture_deferred_free(struct rcu_torture *p)
+{
+       int i;
+       struct rcu_torture *rp;
+       struct rcu_torture *rp1;
+
+       cur_ops->sync();
+       list_add(&p->rtort_free, &rcu_torture_removed);
+       list_for_each_entry_safe(rp, rp1, &rcu_torture_removed, rtort_free) {
+               i = rp->rtort_pipe_count;
+               if (i > RCU_TORTURE_PIPE_LEN)
+                       i = RCU_TORTURE_PIPE_LEN;
+               atomic_inc(&rcu_torture_wcount[i]);
+               if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
+                       rp->rtort_mbtest = 0;
+                       list_del(&rp->rtort_free);
+                       rcu_torture_free(rp);
+               }
+       }
+}
+
+static void rcu_sync_torture_init(void)
+{
+       INIT_LIST_HEAD(&rcu_torture_removed);
+}
+
+static struct rcu_torture_ops rcu_sync_ops = {
+       .init = rcu_sync_torture_init,
+       .cleanup = NULL,
+       .readlock = rcu_torture_read_lock,
+       .readdelay = rcu_read_delay,
+       .readunlock = rcu_torture_read_unlock,
+       .completed = rcu_torture_completed,
+       .deferredfree = rcu_sync_torture_deferred_free,
+       .sync = synchronize_rcu,
+       .stats = NULL,
+       .name = "rcu_sync"
+};
+
 /*
  * Definitions for rcu_bh torture testing.
  */
@@ -330,17 +370,29 @@ static struct rcu_torture_ops rcu_bh_ops = {
        .name = "rcu_bh"
 };
 
+static struct rcu_torture_ops rcu_bh_sync_ops = {
+       .init = rcu_sync_torture_init,
+       .cleanup = NULL,
+       .readlock = rcu_bh_torture_read_lock,
+       .readdelay = rcu_read_delay,  /* just reuse rcu's version. */
+       .readunlock = rcu_bh_torture_read_unlock,
+       .completed = rcu_bh_torture_completed,
+       .deferredfree = rcu_sync_torture_deferred_free,
+       .sync = rcu_bh_torture_synchronize,
+       .stats = NULL,
+       .name = "rcu_bh_sync"
+};
+
 /*
  * Definitions for srcu torture testing.
  */
 
 static struct srcu_struct srcu_ctl;
-static struct list_head srcu_removed;
 
 static void srcu_torture_init(void)
 {
        init_srcu_struct(&srcu_ctl);
-       INIT_LIST_HEAD(&srcu_removed);
+       rcu_sync_torture_init();
 }
 
 static void srcu_torture_cleanup(void)
@@ -349,7 +401,7 @@ static void srcu_torture_cleanup(void)
        cleanup_srcu_struct(&srcu_ctl);
 }
 
-static int srcu_torture_read_lock(void)
+static int srcu_torture_read_lock(void) __acquires(&srcu_ctl)
 {
        return srcu_read_lock(&srcu_ctl);
 }
@@ -367,7 +419,7 @@ static void srcu_read_delay(struct rcu_random_state *rrsp)
                schedule_timeout_interruptible(longdelay);
 }
 
-static void srcu_torture_read_unlock(int idx)
+static void srcu_torture_read_unlock(int idx) __releases(&srcu_ctl)
 {
        srcu_read_unlock(&srcu_ctl, idx);
 }
@@ -377,27 +429,6 @@ static int srcu_torture_completed(void)
        return srcu_batches_completed(&srcu_ctl);
 }
 
-static void srcu_torture_deferred_free(struct rcu_torture *p)
-{
-       int i;
-       struct rcu_torture *rp;
-       struct rcu_torture *rp1;
-
-       synchronize_srcu(&srcu_ctl);
-       list_add(&p->rtort_free, &srcu_removed);
-       list_for_each_entry_safe(rp, rp1, &srcu_removed, rtort_free) {
-               i = rp->rtort_pipe_count;
-               if (i > RCU_TORTURE_PIPE_LEN)
-                       i = RCU_TORTURE_PIPE_LEN;
-               atomic_inc(&rcu_torture_wcount[i]);
-               if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
-                       rp->rtort_mbtest = 0;
-                       list_del(&rp->rtort_free);
-                       rcu_torture_free(rp);
-               }
-       }
-}
-
 static void srcu_torture_synchronize(void)
 {
        synchronize_srcu(&srcu_ctl);
@@ -427,14 +458,53 @@ static struct rcu_torture_ops srcu_ops = {
        .readdelay = srcu_read_delay,
        .readunlock = srcu_torture_read_unlock,
        .completed = srcu_torture_completed,
-       .deferredfree = srcu_torture_deferred_free,
+       .deferredfree = rcu_sync_torture_deferred_free,
        .sync = srcu_torture_synchronize,
        .stats = srcu_torture_stats,
        .name = "srcu"
 };
 
+/*
+ * Definitions for sched torture testing.
+ */
+
+static int sched_torture_read_lock(void)
+{
+       preempt_disable();
+       return 0;
+}
+
+static void sched_torture_read_unlock(int idx)
+{
+       preempt_enable();
+}
+
+static int sched_torture_completed(void)
+{
+       return 0;
+}
+
+static void sched_torture_synchronize(void)
+{
+       synchronize_sched();
+}
+
+static struct rcu_torture_ops sched_ops = {
+       .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,
+       .stats = NULL,
+       .name = "sched"
+};
+
 static struct rcu_torture_ops *torture_ops[] =
-       { &rcu_ops, &rcu_bh_ops, &srcu_ops, NULL };
+       { &rcu_ops, &rcu_sync_ops, &rcu_bh_ops, &rcu_bh_sync_ops, &srcu_ops,
+         &sched_ops, NULL };
 
 /*
  * RCU torture writer kthread.  Repeatedly substitutes a new structure
@@ -452,6 +522,7 @@ rcu_torture_writer(void *arg)
 
        VERBOSE_PRINTK_STRING("rcu_torture_writer task started");
        set_user_nice(current, 19);
+       current->flags |= PF_NOFREEZE;
 
        do {
                schedule_timeout_uninterruptible(1);
@@ -491,6 +562,7 @@ rcu_torture_fakewriter(void *arg)
 
        VERBOSE_PRINTK_STRING("rcu_torture_fakewriter task started");
        set_user_nice(current, 19);
+       current->flags |= PF_NOFREEZE;
 
        do {
                schedule_timeout_uninterruptible(1 + rcu_random(&rand)%10);
@@ -521,6 +593,7 @@ rcu_torture_reader(void *arg)
 
        VERBOSE_PRINTK_STRING("rcu_torture_reader task started");
        set_user_nice(current, 19);
+       current->flags |= PF_NOFREEZE;
 
        do {
                idx = cur_ops->readlock();