8 files changed, 157 insertions, 41 deletions

diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c
index 8402b3349dca..57bef4fbfb31 100644
--- a/kernel/locking/locktorture.c
+++ b/kernel/locking/locktorture.c
@@ -21,6 +21,9 @@
  *          Davidlohr Bueso <dave@stgolabs.net>
  *      Based on kernel/rcu/torture.c.
  */
+
+#define pr_fmt(fmt) fmt
+
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/kthread.h>
@@ -57,7 +60,7 @@ torture_param(int, shutdown_secs, 0, "Shutdown time (j), <= zero to disable.");
 torture_param(int, stat_interval, 60,
              "Number of seconds between stats printk()s");
 torture_param(int, stutter, 5, "Number of jiffies to run/halt test, 0=disable");
-torture_param(bool, verbose, true,
+torture_param(int, verbose, 1,
              "Enable verbose debugging printk()s");
 
 static char *torture_type = "spin_lock";
diff --git a/kernel/rcu/rcuperf.c b/kernel/rcu/rcuperf.c
index e232846516b3..df29119b2013 100644
--- a/kernel/rcu/rcuperf.c
+++ b/kernel/rcu/rcuperf.c
@@ -19,6 +19,9 @@
  *
  * Authors: Paul E. McKenney <paulmck@us.ibm.com>
  */
+
+#define pr_fmt(fmt) fmt
+
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -88,7 +91,7 @@ torture_param(int, nreaders, -1, "Number of RCU reader threads");
 torture_param(int, nwriters, -1, "Number of RCU updater threads");
 torture_param(bool, shutdown, !IS_ENABLED(MODULE),
               "Shutdown at end of performance tests.");
-torture_param(bool, verbose, true, "Enable verbose debugging printk()s");
+torture_param(int, verbose, 1, "Enable verbose debugging printk()s");
 torture_param(int, writer_holdoff, 0, "Holdoff (us) between GPs, zero to disable");
 
 static char *perf_type = "rcu";
diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
index 42fcb7f05fac..5604bfac8df4 100644
--- a/kernel/rcu/rcutorture.c
+++ b/kernel/rcu/rcutorture.c
@@ -22,6 +22,9 @@
  *
  * See also:  Documentation/RCU/torture.txt
  */
+
+#define pr_fmt(fmt) fmt
+
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -101,7 +104,7 @@ torture_param(int, test_boost_interval, 7,
              "Interval between boost tests, seconds.");
 torture_param(bool, test_no_idle_hz, true,
              "Test support for tickless idle CPUs");
-torture_param(bool, verbose, true,
+torture_param(int, verbose, 1,
              "Enable verbose debugging printk()s");
 
 static char *torture_type = "rcu";
diff --git a/kernel/rcu/srcutree.c b/kernel/rcu/srcutree.c
index b4123d7a2cec..5a1a9a07b407 100644
--- a/kernel/rcu/srcutree.c
+++ b/kernel/rcu/srcutree.c
@@ -641,6 +641,9 @@ static void srcu_funnel_exp_start(struct srcu_struct *sp, struct srcu_node *snp,
  * period s.  Losers must either ensure that their desired grace-period
  * number is recorded on at least their leaf srcu_node structure, or they
  * must take steps to invoke their own callbacks.
+ *
+ * Note that this function also does the work of srcu_funnel_exp_start(),
+ * in some cases by directly invoking it.
  */
 static void srcu_funnel_gp_start(struct srcu_struct *sp, struct srcu_data *sdp,
                                  unsigned long s, bool do_norm)
@@ -823,17 +826,17 @@ static void srcu_leak_callback(struct rcu_head *rhp)
  * more than one CPU, this means that when "func()" is invoked, each CPU
  * is guaranteed to have executed a full memory barrier since the end of
  * its last corresponding SRCU read-side critical section whose beginning
- * preceded the call to call_rcu().  It also means that each CPU executing
+ * preceded the call to call_srcu().  It also means that each CPU executing
  * an SRCU read-side critical section that continues beyond the start of
- * "func()" must have executed a memory barrier after the call_rcu()
+ * "func()" must have executed a memory barrier after the call_srcu()
  * but before the beginning of that SRCU read-side critical section.
  * Note that these guarantees include CPUs that are offline, idle, or
  * executing in user mode, as well as CPUs that are executing in the kernel.
  *
- * Furthermore, if CPU A invoked call_rcu() and CPU B invoked the
+ * Furthermore, if CPU A invoked call_srcu() and CPU B invoked the
  * resulting SRCU callback function "func()", then both CPU A and CPU
  * B are guaranteed to execute a full memory barrier during the time
- * interval between the call to call_rcu() and the invocation of "func()".
+ * interval between the call to call_srcu() and the invocation of "func()".
  * This guarantee applies even if CPU A and CPU B are the same CPU (but
  * again only if the system has more than one CPU).
  *
@@ -1268,11 +1271,11 @@ void srcu_torture_stats_print(struct srcu_struct *sp, char *tt, char *tf)
                 unsigned long l0, l1;
                 unsigned long u0, u1;
                 long c0, c1;
-                struct srcu_data *counts;
+                struct srcu_data *sdp;
 
-                counts = per_cpu_ptr(sp->sda, cpu);
-                u0 = counts->srcu_unlock_count[!idx];
-                u1 = counts->srcu_unlock_count[idx];
+                sdp = per_cpu_ptr(sp->sda, cpu);
+                u0 = sdp->srcu_unlock_count[!idx];
+                u1 = sdp->srcu_unlock_count[idx];
 
                 /*
                  * Make sure that a lock is always counted if the corresponding
@@ -1280,12 +1283,13 @@ void srcu_torture_stats_print(struct srcu_struct *sp, char *tt, char *tf)
                  */
                 smp_rmb();
 
-                l0 = counts->srcu_lock_count[!idx];
-                l1 = counts->srcu_lock_count[idx];
+                l0 = sdp->srcu_lock_count[!idx];
+                l1 = sdp->srcu_lock_count[idx];
 
                 c0 = l0 - u0;
                 c1 = l1 - u1;
-                pr_cont(" %d(%ld,%ld)", cpu, c0, c1);
+                pr_cont(" %d(%ld,%ld %1p)",
+                        cpu, c0, c1, rcu_segcblist_head(&sdp->srcu_cblist));
                 s0 += c0;
                 s1 += c1;
         }
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index aa7cade1b9f3..a9a4a260ea7d 100644
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -1368,7 +1368,6 @@ static inline void panic_on_rcu_stall(void)
 static void print_other_cpu_stall(struct rcu_state *rsp, unsigned long gpnum)
 {
         int cpu;
-        long delta;
         unsigned long flags;
         unsigned long gpa;
         unsigned long j;
@@ -1381,18 +1380,6 @@ static void print_other_cpu_stall(struct rcu_state *rsp, unsigned long gpnum)
         if (rcu_cpu_stall_suppress)
                 return;
 
-        /* Only let one CPU complain about others per time interval. */
-
-        raw_spin_lock_irqsave_rcu_node(rnp, flags);
-        delta = jiffies - READ_ONCE(rsp->jiffies_stall);
-        if (delta < RCU_STALL_RAT_DELAY || !rcu_gp_in_progress(rsp)) {
-                raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
-                return;
-        }
-        WRITE_ONCE(rsp->jiffies_stall,
-                   jiffies + 3 * rcu_jiffies_till_stall_check() + 3);
-        raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
-
         /*
          * OK, time to rat on our buddy...
          * See Documentation/RCU/stallwarn.txt for info on how to debug
@@ -1441,6 +1428,10 @@ static void print_other_cpu_stall(struct rcu_state *rsp, unsigned long gpnum)
                         sched_show_task(current);
                 }
         }
+        /* Rewrite if needed in case of slow consoles. */
+        if (ULONG_CMP_GE(jiffies, READ_ONCE(rsp->jiffies_stall)))
+                WRITE_ONCE(rsp->jiffies_stall,
+                           jiffies + 3 * rcu_jiffies_till_stall_check() + 3);
 
         rcu_check_gp_kthread_starvation(rsp);
 
@@ -1485,6 +1476,7 @@ static void print_cpu_stall(struct rcu_state *rsp)
         rcu_dump_cpu_stacks(rsp);
 
         raw_spin_lock_irqsave_rcu_node(rnp, flags);
+        /* Rewrite if needed in case of slow consoles. */
         if (ULONG_CMP_GE(jiffies, READ_ONCE(rsp->jiffies_stall)))
                 WRITE_ONCE(rsp->jiffies_stall,
                            jiffies + 3 * rcu_jiffies_till_stall_check() + 3);
@@ -1508,6 +1500,7 @@ static void check_cpu_stall(struct rcu_state *rsp, struct rcu_data *rdp)
         unsigned long gpnum;
         unsigned long gps;
         unsigned long j;
+        unsigned long jn;
         unsigned long js;
         struct rcu_node *rnp;
 
@@ -1546,14 +1539,17 @@ static void check_cpu_stall(struct rcu_state *rsp, struct rcu_data *rdp)
             ULONG_CMP_GE(gps, js))
                 return; /* No stall or GP completed since entering function. */
         rnp = rdp->mynode;
+        jn = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
         if (rcu_gp_in_progress(rsp) &&
-            (READ_ONCE(rnp->qsmask) & rdp->grpmask)) {
+            (READ_ONCE(rnp->qsmask) & rdp->grpmask) &&
+            cmpxchg(&rsp->jiffies_stall, js, jn) == js) {
 
                 /* We haven't checked in, so go dump stack. */
                 print_cpu_stall(rsp);
 
         } else if (rcu_gp_in_progress(rsp) &&
-                   ULONG_CMP_GE(j, js + RCU_STALL_RAT_DELAY)) {
+                   ULONG_CMP_GE(j, js + RCU_STALL_RAT_DELAY) &&
+                   cmpxchg(&rsp->jiffies_stall, js, jn) == js) {
 
                 /* They had a few time units to dump stack, so complain. */
                 print_other_cpu_stall(rsp, gpnum);
@@ -1685,6 +1681,7 @@ static bool rcu_start_this_gp(struct rcu_node *rnp, struct rcu_data *rdp,
         }
         trace_rcu_this_gp(rnp_root, rdp, c, TPS("Startedroot"));
         WRITE_ONCE(rsp->gp_flags, rsp->gp_flags | RCU_GP_FLAG_INIT);
+        rsp->gp_req_activity = jiffies;
         if (!rsp->gp_kthread) {
                 trace_rcu_this_gp(rnp_root, rdp, c, TPS("NoGPkthread"));
                 goto unlock_out;
@@ -2084,7 +2081,8 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
          */
         rcu_for_each_node_breadth_first(rsp, rnp) {
                 raw_spin_lock_irq_rcu_node(rnp);
-                WARN_ON_ONCE(rcu_preempt_blocked_readers_cgp(rnp));
+                if (WARN_ON_ONCE(rcu_preempt_blocked_readers_cgp(rnp)))
+                        dump_blkd_tasks(rnp, 10);
                 WARN_ON_ONCE(rnp->qsmask);
                 WRITE_ONCE(rnp->completed, rsp->gpnum);
                 rdp = this_cpu_ptr(rsp->rda);
@@ -2116,10 +2114,12 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
         /* Advance CBs to reduce false positives below. */
         if (!rcu_accelerate_cbs(rsp, rnp, rdp) && needgp) {
                 WRITE_ONCE(rsp->gp_flags, RCU_GP_FLAG_INIT);
+                rsp->gp_req_activity = jiffies;
                 trace_rcu_grace_period(rsp->name, READ_ONCE(rsp->gpnum),
                                        TPS("newreq"));
+        } else {
+                WRITE_ONCE(rsp->gp_flags, rsp->gp_flags & RCU_GP_FLAG_INIT);
         }
-        WRITE_ONCE(rsp->gp_flags, rsp->gp_flags & RCU_GP_FLAG_INIT);
         raw_spin_unlock_irq_rcu_node(rnp);
 }
 
@@ -2294,6 +2294,7 @@ rcu_report_qs_rnp(unsigned long mask, struct rcu_state *rsp,
                         raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
                         return;
                 }
+                rnp->completedqs = rnp->gpnum;
                 mask = rnp->grpmask;
                 if (rnp->parent == NULL) {
 
@@ -2747,6 +2748,65 @@ static void force_quiescent_state(struct rcu_state *rsp)
 }
 
 /*
+ * This function checks for grace-period requests that fail to motivate
+ * RCU to come out of its idle mode.
+ */
+static void
+rcu_check_gp_start_stall(struct rcu_state *rsp, struct rcu_node *rnp,
+                         struct rcu_data *rdp)
+{
+        unsigned long flags;
+        unsigned long j;
+        struct rcu_node *rnp_root = rcu_get_root(rsp);
+        static atomic_t warned = ATOMIC_INIT(0);
+
+        if (!IS_ENABLED(CONFIG_PROVE_RCU) ||
+            rcu_gp_in_progress(rsp) || !need_any_future_gp(rcu_get_root(rsp)))
+                return;
+        j = jiffies; /* Expensive access, and in common case don't get here. */
+        if (time_before(j, READ_ONCE(rsp->gp_req_activity) + HZ) ||
+            time_before(j, READ_ONCE(rsp->gp_activity) + HZ) ||
+            atomic_read(&warned))
+                return;
+
+        raw_spin_lock_irqsave_rcu_node(rnp, flags);
+        j = jiffies;
+        if (rcu_gp_in_progress(rsp) || !need_any_future_gp(rcu_get_root(rsp)) ||
+            time_before(j, READ_ONCE(rsp->gp_req_activity) + HZ) ||
+            time_before(j, READ_ONCE(rsp->gp_activity) + HZ) ||
+            atomic_read(&warned)) {
+                raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
+                return;
+        }
+        /* Hold onto the leaf lock to make others see warned==1. */
+
+        if (rnp_root != rnp)
+                raw_spin_lock_rcu_node(rnp_root); /* irqs already disabled. */
+        j = jiffies;
+        if (rcu_gp_in_progress(rsp) || !need_any_future_gp(rcu_get_root(rsp)) ||
+            time_before(j, rsp->gp_req_activity + HZ) ||
+            time_before(j, rsp->gp_activity + HZ) ||
+            atomic_xchg(&warned, 1)) {
+                raw_spin_unlock_rcu_node(rnp_root); /* irqs remain disabled. */
+                raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
+                return;
+        }
+        pr_alert("%s: g%lu %d%d%d%d gar:%lu ga:%lu f%#x %s->state:%#lx\n",
+                 __func__, READ_ONCE(rsp->gpnum),
+                 need_future_gp_element(rcu_get_root(rsp), 0),
+                 need_future_gp_element(rcu_get_root(rsp), 1),
+                 need_future_gp_element(rcu_get_root(rsp), 2),
+                 need_future_gp_element(rcu_get_root(rsp), 3),
+                 j - rsp->gp_req_activity, j - rsp->gp_activity,
+                 rsp->gp_flags, rsp->name,
+                 rsp->gp_kthread ? rsp->gp_kthread->state : 0x1ffffL);
+        WARN_ON(1);
+        if (rnp_root != rnp)
+                raw_spin_unlock_rcu_node(rnp_root);
+        raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
+}
+
+/*
  * This does the RCU core processing work for the specified rcu_state
  * and rcu_data structures.  This may be called only from the CPU to
  * whom the rdp belongs.
@@ -2757,7 +2817,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
         unsigned long flags;
         bool needwake;
         struct rcu_data *rdp = raw_cpu_ptr(rsp->rda);
-        struct rcu_node *rnp;
+        struct rcu_node *rnp = rdp->mynode;
 
         WARN_ON_ONCE(!rdp->beenonline);
 
@@ -2771,7 +2831,6 @@ __rcu_process_callbacks(struct rcu_state *rsp)
                 if (rcu_segcblist_restempty(&rdp->cblist, RCU_NEXT_READY_TAIL)) {
                         local_irq_restore(flags);
                 } else {
-                        rnp = rdp->mynode;
                         raw_spin_lock_rcu_node(rnp); /* irqs disabled. */
                         needwake = rcu_accelerate_cbs(rsp, rnp, rdp);
                         raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
@@ -2780,6 +2839,8 @@ __rcu_process_callbacks(struct rcu_state *rsp)
                 }
         }
 
+        rcu_check_gp_start_stall(rsp, rnp, rdp);
+
         /* If there are callbacks ready, invoke them. */
         if (rcu_segcblist_ready_cbs(&rdp->cblist))
                 invoke_rcu_callbacks(rsp, rdp);
@@ -3930,6 +3991,7 @@ static void __init rcu_init_one(struct rcu_state *rsp)
                                                    &rcu_fqs_class[i], fqs[i]);
                         rnp->gpnum = rsp->gpnum;
                         rnp->completed = rsp->completed;
+                        rnp->completedqs = rsp->completed;
                         rnp->qsmask = 0;
                         rnp->qsmaskinit = 0;
                         rnp->grplo = j * cpustride;
diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
index 78e051dffc5b..3c1942174c56 100644
--- a/kernel/rcu/tree.h
+++ b/kernel/rcu/tree.h
@@ -87,6 +87,7 @@ struct rcu_node {
         unsigned long completed; /* Last GP completed for this node. */
                                 /*  This will either be equal to or one */
                                 /*  behind the root rcu_node's gpnum. */
+        unsigned long completedqs; /* All QSes done for this node. */
         unsigned long qsmask;   /* CPUs or groups that need to switch in */
                                 /*  order for current grace period to proceed.*/
                                 /*  In leaf rcu_node, each bit corresponds to */
@@ -373,6 +374,8 @@ struct rcu_state {
                                                 /*  but in jiffies. */
         unsigned long gp_activity;              /* Time of last GP kthread */
                                                 /*  activity in jiffies. */
+        unsigned long gp_req_activity;          /* Time of last GP request */
+                                                /*  in jiffies. */
         unsigned long jiffies_stall;            /* Time at which to check */
                                                 /*  for CPU stalls. */
         unsigned long jiffies_resched;          /* Time at which to resched */
@@ -453,6 +456,7 @@ static void rcu_preempt_check_blocked_tasks(struct rcu_node *rnp);
 static void rcu_preempt_check_callbacks(void);
 void call_rcu(struct rcu_head *head, rcu_callback_t func);
 static void __init __rcu_init_preempt(void);
+static void dump_blkd_tasks(struct rcu_node *rnp, int ncheck);
 static void rcu_initiate_boost(struct rcu_node *rnp, unsigned long flags);
 static void rcu_preempt_boost_start_gp(struct rcu_node *rnp);
 static void invoke_rcu_callbacks_kthread(void);
diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
index 7fd12039e512..e387ea712758 100644
--- a/kernel/rcu/tree_plugin.h
+++ b/kernel/rcu/tree_plugin.h
@@ -260,8 +260,10 @@ static void rcu_preempt_ctxt_queue(struct rcu_node *rnp, struct rcu_data *rdp)
          * ->exp_tasks pointers, respectively, to reference the newly
          * blocked tasks.
          */
-        if (!rnp->gp_tasks && (blkd_state & RCU_GP_BLKD))
+        if (!rnp->gp_tasks && (blkd_state & RCU_GP_BLKD)) {
                 rnp->gp_tasks = &t->rcu_node_entry;
+                WARN_ON_ONCE(rnp->completedqs == rnp->gpnum);
+        }
         if (!rnp->exp_tasks && (blkd_state & RCU_EXP_BLKD))
                 rnp->exp_tasks = &t->rcu_node_entry;
         WARN_ON_ONCE(!(blkd_state & RCU_GP_BLKD) !=
@@ -535,6 +537,8 @@ void rcu_read_unlock_special(struct task_struct *t)
                 WARN_ON_ONCE(rnp != t->rcu_blocked_node);
                 WARN_ON_ONCE(!rcu_is_leaf_node(rnp));
                 empty_norm = !rcu_preempt_blocked_readers_cgp(rnp);
+                WARN_ON_ONCE(rnp->completedqs == rnp->gpnum &&
+                             (!empty_norm || rnp->qsmask));
                 empty_exp = sync_rcu_preempt_exp_done(rnp);
                 smp_mb(); /* ensure expedited fastpath sees end of RCU c-s. */
                 np = rcu_next_node_entry(t, rnp);
@@ -697,7 +701,8 @@ static void rcu_preempt_check_blocked_tasks(struct rcu_node *rnp)
         struct task_struct *t;
 
         RCU_LOCKDEP_WARN(preemptible(), "rcu_preempt_check_blocked_tasks() invoked with preemption enabled!!!\n");
-        WARN_ON_ONCE(rcu_preempt_blocked_readers_cgp(rnp));
+        if (WARN_ON_ONCE(rcu_preempt_blocked_readers_cgp(rnp)))
+                dump_blkd_tasks(rnp, 10);
         if (rcu_preempt_has_tasks(rnp)) {
                 rnp->gp_tasks = rnp->blkd_tasks.next;
                 t = container_of(rnp->gp_tasks, struct task_struct,
@@ -841,6 +846,27 @@ void exit_rcu(void)
         __rcu_read_unlock();
 }
 
+/*
+ * Dump the blocked-tasks state, but limit the list dump to the
+ * specified number of elements.
+ */
+static void dump_blkd_tasks(struct rcu_node *rnp, int ncheck)
+{
+        int i;
+        struct list_head *lhp;
+
+        raw_lockdep_assert_held_rcu_node(rnp);
+        pr_info("%s: grp: %d-%d level: %d ->qamask %#lx ->gp_tasks %p ->boost_tasks %p ->exp_tasks %p &->blkd_tasks: %p offset: %u\n", __func__, rnp->grplo, rnp->grphi, rnp->level, rnp->qsmask, rnp->gp_tasks, rnp->boost_tasks, rnp->exp_tasks, &rnp->blkd_tasks, (unsigned int)offsetof(typeof(*rnp), blkd_tasks));
+        pr_cont("\t->blkd_tasks");
+        i = 0;
+        list_for_each(lhp, &rnp->blkd_tasks) {
+                pr_cont(" %p", lhp);
+                if (++i >= 10)
+                        break;
+        }
+        pr_cont("\n");
+}
+
 #else /* #ifdef CONFIG_PREEMPT_RCU */
 
 static struct rcu_state *const rcu_state_p = &rcu_sched_state;
@@ -949,6 +975,14 @@ void exit_rcu(void)
 {
 }
 
+/*
+ * Dump the guaranteed-empty blocked-tasks state.  Trust but verify.
+ */
+static void dump_blkd_tasks(struct rcu_node *rnp, int ncheck)
+{
+        WARN_ON_ONCE(!list_empty(&rnp->blkd_tasks));
+}
+
 #endif /* #else #ifdef CONFIG_PREEMPT_RCU */
 
 #ifdef CONFIG_RCU_BOOST
diff --git a/kernel/torture.c b/kernel/torture.c
index 3de1efbecd6a..1ac24a826589 100644
--- a/kernel/torture.c
+++ b/kernel/torture.c
@@ -20,6 +20,9 @@
  * Author: Paul E. McKenney <paulmck@us.ibm.com>
  *      Based on kernel/rcu/torture.c.
  */
+
+#define pr_fmt(fmt) fmt
+
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -53,7 +56,7 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Paul E. McKenney <paulmck@us.ibm.com>");
 
 static char *torture_type;
-static bool verbose;
+static int verbose;
 
 /* Mediate rmmod and system shutdown.  Concurrent rmmod & shutdown illegal! */
 #define FULLSTOP_DONTSTOP 0     /* Normal operation. */
@@ -98,7 +101,7 @@ bool torture_offline(int cpu, long *n_offl_attempts, long *n_offl_successes,
         if (!cpu_online(cpu) || !cpu_is_hotpluggable(cpu))
                 return false;
 
-        if (verbose)
+        if (verbose > 1)
                 pr_alert("%s" TORTURE_FLAG
                          "torture_onoff task: offlining %d\n",
                          torture_type, cpu);
@@ -111,7 +114,7 @@ bool torture_offline(int cpu, long *n_offl_attempts, long *n_offl_successes,
                                  "torture_onoff task: offline %d failed: errno %d\n",
                                  torture_type, cpu, ret);
         } else {
-                if (verbose)
+                if (verbose > 1)
                         pr_alert("%s" TORTURE_FLAG
                                  "torture_onoff task: offlined %d\n",
                                  torture_type, cpu);
@@ -147,7 +150,7 @@ bool torture_online(int cpu, long *n_onl_attempts, long *n_onl_successes,
         if (cpu_online(cpu) || !cpu_is_hotpluggable(cpu))
                 return false;
 
-        if (verbose)
+        if (verbose > 1)
                 pr_alert("%s" TORTURE_FLAG
                          "torture_onoff task: onlining %d\n",
                          torture_type, cpu);
@@ -160,7 +163,7 @@ bool torture_online(int cpu, long *n_onl_attempts, long *n_onl_successes,
                                  "torture_onoff task: online %d failed: errno %d\n",
                                  torture_type, cpu, ret);
         } else {
-                if (verbose)
+                if (verbose > 1)
                         pr_alert("%s" TORTURE_FLAG
                                  "torture_onoff task: onlined %d\n",
                                  torture_type, cpu);
@@ -647,7 +650,7 @@ static void torture_stutter_cleanup(void)
  * The runnable parameter points to a flag that controls whether or not
  * the test is currently runnable.  If there is no such flag, pass in NULL.
  */
-bool torture_init_begin(char *ttype, bool v)
+bool torture_init_begin(char *ttype, int v)
 {
         mutex_lock(&fullstop_mutex);
         if (torture_type != NULL) {