Merge branches 'rcu/staging-core', 'rcu/staging-docs' and 'rcu/staging-kfree', remote...

diff --cc include/linux/srcutree.h
index 558057b517b74cf5892d85ba95872f15ad42e1ce,a6910805f9c51552ed82ad1241aaeb904a79e27e,558057b517b74cf5892d85ba95872f15ad42e1ce,cd0cdd8142c51e567133f1a1c46baf280f967e22,558057b517b74cf5892d85ba95872f15ad42e1ce,558057b517b74cf5892d85ba95872f15ad42e1ce..8f3f72480e78b0d467167c777592e6472e3485e7
--- 1/include/linux/srcutree.h
--- 2/include/linux/srcutree.h
--- 3/include/linux/srcutree.h
--- 4/include/linux/srcutree.h
--- 5/include/linux/srcutree.h
--- 6/include/linux/srcutree.h
+++ b/include/linux/srcutree.h
@@@@@@@ -89,19 -89,32 -89,19 -87,29 -89,19 -89,19 +87,42 @@@@@@@ struct srcu_usage 
        unsigned long reschedule_jiffies;
        unsigned long reschedule_count;
        struct delayed_work work;
+++ ++  struct srcu_struct *srcu_ssp;
+++ ++};
+++ ++
+++ ++/*
+++ ++ * Per-SRCU-domain structure, similar in function to rcu_state.
+++ ++ */
+++ ++struct srcu_struct {
+++ ++  unsigned int srcu_idx;                  /* Current rdr array element. */
+++ ++  struct srcu_data __percpu *sda;         /* Per-CPU srcu_data array. */
        struct lockdep_map dep_map;
+++ ++  struct srcu_usage *srcu_sup;            /* Update-side data. */
      };
      
- ----/* Values for size state variable (->srcu_size_state). */
- ----#define SRCU_SIZE_SMALL           0
- ----#define SRCU_SIZE_ALLOC           1
- ----#define SRCU_SIZE_WAIT_BARRIER    2
- ----#define SRCU_SIZE_WAIT_CALL       3
- ----#define SRCU_SIZE_WAIT_CBS1       4
- ----#define SRCU_SIZE_WAIT_CBS2       5
- ----#define SRCU_SIZE_WAIT_CBS3       6
- ----#define SRCU_SIZE_WAIT_CBS4       7
- ----#define SRCU_SIZE_BIG             8
+ ++++// Values for size state variable (->srcu_size_state).  Once the state
+ ++++// has been set to SRCU_SIZE_ALLOC, the grace-period code advances through
+ ++++// this state machine one step per grace period until the SRCU_SIZE_BIG state
+ ++++// is reached.  Otherwise, the state machine remains in the SRCU_SIZE_SMALL
+ ++++// state indefinitely.
+ ++++#define SRCU_SIZE_SMALL           0       // No srcu_node combining tree, ->node == NULL
+ ++++#define SRCU_SIZE_ALLOC           1       // An srcu_node tree is being allocated, initialized,
+ ++++                                  //  and then referenced by ->node.  It will not be used.
+ ++++#define SRCU_SIZE_WAIT_BARRIER    2       // The srcu_node tree starts being used by everything
+ ++++                                  //  except call_srcu(), especially by srcu_barrier().
+ ++++                                  //  By the end of this state, all CPUs and threads
+ ++++                                  //  are aware of this tree's existence.
+ ++++#define SRCU_SIZE_WAIT_CALL       3       // The srcu_node tree starts being used by call_srcu().
+ ++++                                  //  By the end of this state, all of the call_srcu()
+ ++++                                  //  invocations that were running on a non-boot CPU
+ ++++                                  //  and using the boot CPU's callback queue will have
+ ++++                                  //  completed.
+ ++++#define SRCU_SIZE_WAIT_CBS1       4       // Don't trust the ->srcu_have_cbs[] grace-period
+ ++++#define SRCU_SIZE_WAIT_CBS2       5       //  sequence elements or the ->srcu_data_have_cbs[]
+ ++++#define SRCU_SIZE_WAIT_CBS3       6       //  CPU-bitmask elements until all four elements of
+ ++++#define SRCU_SIZE_WAIT_CBS4       7       //  each array have been initialized.
+ ++++#define SRCU_SIZE_BIG             8       // The srcu_node combining tree is fully initialized
+ ++++                                  //  and all aspects of it are being put to use.
      
      /* Values for state variable (bottom bits of ->srcu_gp_seq). */
      #define SRCU_STATE_IDLE           0

diff --cc kernel/rcu/rcu.h
Simple merge

diff --cc kernel/rcu/rcuscale.c
Simple merge

diff --cc kernel/rcu/rcutorture.c
index 8e6c023212cb314555514f568a18fb4b6898caad,8e6c023212cb314555514f568a18fb4b6898caad,8e6c023212cb314555514f568a18fb4b6898caad,8e6c023212cb314555514f568a18fb4b6898caad,9efb8258a272c59f99dd368fa74bf4e141bb9a0b,e046d2c6fe105a1c8a706840ff6198757d46f1c4..147551c23baf03e273fcf0380678d8a5e3822a72
--- 1/kernel/rcu/rcutorture.c
--- 2/kernel/rcu/rcutorture.c
--- 3/kernel/rcu/rcutorture.c
--- 4/kernel/rcu/rcutorture.c
--- 5/kernel/rcu/rcutorture.c
--- 6/kernel/rcu/rcutorture.c
+++ b/kernel/rcu/rcutorture.c
@@@@@@@ -119,7 -119,7 -119,7 -119,7 -119,8 -119,8 +119,9 @@@@@@@ torture_param(int, stutter, 5, "Number 
      torture_param(int, test_boost, 1, "Test RCU prio boost: 0=no, 1=maybe, 2=yes.");
      torture_param(int, test_boost_duration, 4, "Duration of each boost test, seconds.");
      torture_param(int, test_boost_interval, 7, "Interval between boost tests, seconds.");
+++++ torture_param(int, test_nmis, 0, "End-test NMI tests, 0 to disable.");
      torture_param(bool, test_no_idle_hz, true, "Test support for tickless idle CPUs");
++++ +torture_param(int, test_srcu_lockdep, 0, "Test specified SRCU deadlock scenario.");
      torture_param(int, verbose, 1, "Enable verbose debugging printk()s");
      
      static char *torture_type = "rcu";

diff --cc kernel/rcu/srcutree.c
Simple merge

diff --cc kernel/rcu/tasks.h
index baf7ec178155a87c2188f16fe22bf80eeba6bba4,bfb5e1549f2b22d510758840df48467c59b5dc93,bfb5e1549f2b22d510758840df48467c59b5dc93,185358c2f08d8e37dad35ea57ea3ed70dfef1f91,bfb5e1549f2b22d510758840df48467c59b5dc93,bfb5e1549f2b22d510758840df48467c59b5dc93..5f4fc8184dd0b5db02ed1cae4c9ec5e260786107
--- 1/kernel/rcu/tasks.h
--- 2/kernel/rcu/tasks.h
--- 3/kernel/rcu/tasks.h
--- 4/kernel/rcu/tasks.h
--- 5/kernel/rcu/tasks.h
--- 6/kernel/rcu/tasks.h
+++ b/kernel/rcu/tasks.h
@@@@@@@ -136,15 -136,9 -136,9 -136,11 -136,9 -136,9 +136,17 @@@@@@@ static struct rcu_tasks rt_name 
        .kname = #rt_name,                                                              \
      }
      
+++ ++#ifdef CONFIG_TASKS_RCU
      /* Track exiting tasks in order to allow them to be waited for. */
      DEFINE_STATIC_SRCU(tasks_rcu_exit_srcu);
+++ ++#endif
 ++ ++
 +++++#ifdef CONFIG_TASKS_RCU
 +++++/* Report delay in synchronize_srcu() completion in rcu_tasks_postscan(). */
 +++++static void tasks_rcu_exit_srcu_stall(struct timer_list *unused);
 +++++static DEFINE_TIMER(tasks_rcu_exit_srcu_stall_timer, tasks_rcu_exit_srcu_stall);
 +++++#endif
   +  
      /* Avoid IPIing CPUs early in the grace period. */
      #define RCU_TASK_IPI_DELAY (IS_ENABLED(CONFIG_TASKS_TRACE_RCU_READ_MB) ? HZ / 2 : 0)
      static int rcu_task_ipi_delay __read_mostly = RCU_TASK_IPI_DELAY;

diff --cc kernel/rcu/tree.c
Simple merge