Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull RCU updates from Ingo Molnar:
 "Main RCU changes this cycle were:

   - Full-system idle detection.  This is for use by Frederic
     Weisbecker's adaptive-ticks mechanism.  Its purpose is to allow the
     timekeeping CPU to shut off its tick when all other CPUs are idle.

   - Miscellaneous fixes.

   - Improved rcutorture test coverage.

   - Updated RCU documentation"

* 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (30 commits)
  nohz_full: Force RCU's grace-period kthreads onto timekeeping CPU
  nohz_full: Add full-system-idle state machine
  jiffies: Avoid undefined behavior from signed overflow
  rcu: Simplify _rcu_barrier() processing
  rcu: Make rcutorture emit online failures if verbose
  rcu: Remove unused variable from rcu_torture_writer()
  rcu: Sort rcutorture module parameters
  rcu: Increase rcutorture test coverage
  rcu: Add duplicate-callback tests to rcutorture
  doc: Fix memory-barrier control-dependency example
  rcu: Update RTFP documentation
  nohz_full: Add full-system-idle arguments to API
  nohz_full: Add full-system idle states and variables
  nohz_full: Add per-CPU idle-state tracking
  nohz_full: Add rcu_dyntick data for scalable detection of all-idle state
  nohz_full: Add Kconfig parameter for scalable detection of all-idle state
  nohz_full: Add testing information to documentation
  rcu: Eliminate unused APIs intended for adaptive ticks
  rcu: Select IRQ_WORK from TREE_PREEMPT_RCU
  rculist: list_first_or_null_rcu() should use list_entry_rcu()
  ...

7 files changed, 111 insertions, 57 deletions

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 69732d279e8b..83e2c31e8b00 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -122,8 +122,12 @@
 #define TRACE_PRINTKS() VMLINUX_SYMBOL(__start___trace_bprintk_fmt) = .;      \
                          *(__trace_printk_fmt) /* Trace_printk fmt' pointer */ \
                          VMLINUX_SYMBOL(__stop___trace_bprintk_fmt) = .;
+#define TRACEPOINT_STR() VMLINUX_SYMBOL(__start___tracepoint_str) = .;  \
+                         *(__tracepoint_str) /* Trace_printk fmt' pointer */ \
+                         VMLINUX_SYMBOL(__stop___tracepoint_str) = .;
 #else
 #define TRACE_PRINTKS()
+#define TRACEPOINT_STR()
 #endif
 
 #ifdef CONFIG_FTRACE_SYSCALLS
@@ -190,7 +194,8 @@
         VMLINUX_SYMBOL(__stop___verbose) = .;                           \
         LIKELY_PROFILE()                                                \
         BRANCH_PROFILE()                                                \
-        TRACE_PRINTKS()
+        TRACE_PRINTKS()                                                 \
+        TRACEPOINT_STR()
 
 /*
  * Data section helpers
diff --git a/include/linux/debugobjects.h b/include/linux/debugobjects.h
index 0e5f5785d9f2..98ffcbd4888e 100644
--- a/include/linux/debugobjects.h
+++ b/include/linux/debugobjects.h
@@ -63,7 +63,7 @@ struct debug_obj_descr {
 extern void debug_object_init      (void *addr, struct debug_obj_descr *descr);
 extern void
 debug_object_init_on_stack(void *addr, struct debug_obj_descr *descr);
-extern void debug_object_activate  (void *addr, struct debug_obj_descr *descr);
+extern int debug_object_activate  (void *addr, struct debug_obj_descr *descr);
 extern void debug_object_deactivate(void *addr, struct debug_obj_descr *descr);
 extern void debug_object_destroy   (void *addr, struct debug_obj_descr *descr);
 extern void debug_object_free      (void *addr, struct debug_obj_descr *descr);
@@ -85,8 +85,8 @@ static inline void
 debug_object_init      (void *addr, struct debug_obj_descr *descr) { }
 static inline void
 debug_object_init_on_stack(void *addr, struct debug_obj_descr *descr) { }
-static inline void
-debug_object_activate  (void *addr, struct debug_obj_descr *descr) { }
+static inline int
+debug_object_activate  (void *addr, struct debug_obj_descr *descr) { return 0; }
 static inline void
 debug_object_deactivate(void *addr, struct debug_obj_descr *descr) { }
 static inline void
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index 120d57a1c3a5..5eaa746735ff 100644
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -359,6 +359,40 @@ do {									\
                 __trace_printk(ip, fmt, ##args);                        \
 } while (0)
 
+/**
+ * tracepoint_string - register constant persistent string to trace system
+ * @str - a constant persistent string that will be referenced in tracepoints
+ *
+ * If constant strings are being used in tracepoints, it is faster and
+ * more efficient to just save the pointer to the string and reference
+ * that with a printf "%s" instead of saving the string in the ring buffer
+ * and wasting space and time.
+ *
+ * The problem with the above approach is that userspace tools that read
+ * the binary output of the trace buffers do not have access to the string.
+ * Instead they just show the address of the string which is not very
+ * useful to users.
+ *
+ * With tracepoint_string(), the string will be registered to the tracing
+ * system and exported to userspace via the debugfs/tracing/printk_formats
+ * file that maps the string address to the string text. This way userspace
+ * tools that read the binary buffers have a way to map the pointers to
+ * the ASCII strings they represent.
+ *
+ * The @str used must be a constant string and persistent as it would not
+ * make sense to show a string that no longer exists. But it is still fine
+ * to be used with modules, because when modules are unloaded, if they
+ * had tracepoints, the ring buffers are cleared too. As long as the string
+ * does not change during the life of the module, it is fine to use
+ * tracepoint_string() within a module.
+ */
+#define tracepoint_string(str)                                          \
+        ({                                                              \
+                static const char *___tp_str __tracepoint_string = str; \
+                ___tp_str;                                              \
+        })
+#define __tracepoint_string     __attribute__((section("__tracepoint_str")))
+
 #ifdef CONFIG_PERF_EVENTS
 struct perf_event;
 
diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
index 97ba4e78a37e..d235e88cfd7c 100644
--- a/include/linux/jiffies.h
+++ b/include/linux/jiffies.h
@@ -101,13 +101,13 @@ static inline u64 get_jiffies_64(void)
 #define time_after(a,b)         \
         (typecheck(unsigned long, a) && \
          typecheck(unsigned long, b) && \
-         ((long)(b) - (long)(a) < 0))
+         ((long)((b) - (a)) < 0))
 #define time_before(a,b)        time_after(b,a)
 
 #define time_after_eq(a,b)      \
         (typecheck(unsigned long, a) && \
          typecheck(unsigned long, b) && \
-         ((long)(a) - (long)(b) >= 0))
+         ((long)((a) - (b)) >= 0))
 #define time_before_eq(a,b)     time_after_eq(b,a)
 
 /*
@@ -130,13 +130,13 @@ static inline u64 get_jiffies_64(void)
 #define time_after64(a,b)       \
         (typecheck(__u64, a) && \
          typecheck(__u64, b) && \
-         ((__s64)(b) - (__s64)(a) < 0))
+         ((__s64)((b) - (a)) < 0))
 #define time_before64(a,b)      time_after64(b,a)
 
 #define time_after_eq64(a,b)    \
         (typecheck(__u64, a) && \
          typecheck(__u64, b) && \
-         ((__s64)(a) - (__s64)(b) >= 0))
+         ((__s64)((a) - (b)) >= 0))
 #define time_before_eq64(a,b)   time_after_eq64(b,a)
 
 #define time_in_range64(a, b, c) \
diff --git a/include/linux/rculist.h b/include/linux/rculist.h
index f4b1001a4676..4106721c4e5e 100644
--- a/include/linux/rculist.h
+++ b/include/linux/rculist.h
@@ -267,8 +267,9 @@ static inline void list_splice_init_rcu(struct list_head *list,
  */
 #define list_first_or_null_rcu(ptr, type, member) \
         ({struct list_head *__ptr = (ptr); \
-          struct list_head __rcu *__next = list_next_rcu(__ptr); \
-          likely(__ptr != __next) ? container_of(__next, type, member) : NULL; \
+          struct list_head *__next = ACCESS_ONCE(__ptr->next); \
+          likely(__ptr != __next) ? \
+                list_entry_rcu(__next, type, member) : NULL; \
         })
 
 /**
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
index 4b14bdc911d7..f1f1bc39346b 100644
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
@@ -52,7 +52,7 @@ extern int rcutorture_runnable; /* for sysctl */
 #if defined(CONFIG_TREE_RCU) || defined(CONFIG_TREE_PREEMPT_RCU)
 extern void rcutorture_record_test_transition(void);
 extern void rcutorture_record_progress(unsigned long vernum);
-extern void do_trace_rcu_torture_read(char *rcutorturename,
+extern void do_trace_rcu_torture_read(const char *rcutorturename,
                                       struct rcu_head *rhp,
                                       unsigned long secs,
                                       unsigned long c_old,
@@ -65,7 +65,7 @@ static inline void rcutorture_record_progress(unsigned long vernum)
 {
 }
 #ifdef CONFIG_RCU_TRACE
-extern void do_trace_rcu_torture_read(char *rcutorturename,
+extern void do_trace_rcu_torture_read(const char *rcutorturename,
                                       struct rcu_head *rhp,
                                       unsigned long secs,
                                       unsigned long c_old,
@@ -229,13 +229,9 @@ extern void rcu_irq_exit(void);
 #ifdef CONFIG_RCU_USER_QS
 extern void rcu_user_enter(void);
 extern void rcu_user_exit(void);
-extern void rcu_user_enter_after_irq(void);
-extern void rcu_user_exit_after_irq(void);
 #else
 static inline void rcu_user_enter(void) { }
 static inline void rcu_user_exit(void) { }
-static inline void rcu_user_enter_after_irq(void) { }
-static inline void rcu_user_exit_after_irq(void) { }
 static inline void rcu_user_hooks_switch(struct task_struct *prev,
                                          struct task_struct *next) { }
 #endif /* CONFIG_RCU_USER_QS */
@@ -1015,4 +1011,22 @@ static inline bool rcu_is_nocb_cpu(int cpu) { return false; }
 #endif /* #else #ifdef CONFIG_RCU_NOCB_CPU */
 
 
+/* Only for use by adaptive-ticks code. */
+#ifdef CONFIG_NO_HZ_FULL_SYSIDLE
+extern bool rcu_sys_is_idle(void);
+extern void rcu_sysidle_force_exit(void);
+#else /* #ifdef CONFIG_NO_HZ_FULL_SYSIDLE */
+
+static inline bool rcu_sys_is_idle(void)
+{
+        return false;
+}
+
+static inline void rcu_sysidle_force_exit(void)
+{
+}
+
+#endif /* #else #ifdef CONFIG_NO_HZ_FULL_SYSIDLE */
+
+
 #endif /* __LINUX_RCUPDATE_H */
diff --git a/include/trace/events/rcu.h b/include/trace/events/rcu.h
index 59ebcc89f148..ee2376cfaab3 100644
--- a/include/trace/events/rcu.h
+++ b/include/trace/events/rcu.h
@@ -19,12 +19,12 @@
  */
 TRACE_EVENT(rcu_utilization,
 
-        TP_PROTO(char *s),
+        TP_PROTO(const char *s),
 
         TP_ARGS(s),
 
         TP_STRUCT__entry(
-                __field(char *, s)
+                __field(const char *, s)
         ),
 
         TP_fast_assign(
@@ -51,14 +51,14 @@ TRACE_EVENT(rcu_utilization,
  */
 TRACE_EVENT(rcu_grace_period,
 
-        TP_PROTO(char *rcuname, unsigned long gpnum, char *gpevent),
+        TP_PROTO(const char *rcuname, unsigned long gpnum, const char *gpevent),
 
         TP_ARGS(rcuname, gpnum, gpevent),
 
         TP_STRUCT__entry(
-                __field(char *, rcuname)
+                __field(const char *, rcuname)
                 __field(unsigned long, gpnum)
-                __field(char *, gpevent)
+                __field(const char *, gpevent)
         ),
 
         TP_fast_assign(
@@ -89,21 +89,21 @@ TRACE_EVENT(rcu_grace_period,
  */
 TRACE_EVENT(rcu_future_grace_period,
 
-        TP_PROTO(char *rcuname, unsigned long gpnum, unsigned long completed,
+        TP_PROTO(const char *rcuname, unsigned long gpnum, unsigned long completed,
                  unsigned long c, u8 level, int grplo, int grphi,
-                 char *gpevent),
+                 const char *gpevent),
 
         TP_ARGS(rcuname, gpnum, completed, c, level, grplo, grphi, gpevent),
 
         TP_STRUCT__entry(
-                __field(char *, rcuname)
+                __field(const char *, rcuname)
                 __field(unsigned long, gpnum)
                 __field(unsigned long, completed)
                 __field(unsigned long, c)
                 __field(u8, level)
                 __field(int, grplo)
                 __field(int, grphi)
-                __field(char *, gpevent)
+                __field(const char *, gpevent)
         ),
 
         TP_fast_assign(
@@ -132,13 +132,13 @@ TRACE_EVENT(rcu_future_grace_period,
  */
 TRACE_EVENT(rcu_grace_period_init,
 
-        TP_PROTO(char *rcuname, unsigned long gpnum, u8 level,
+        TP_PROTO(const char *rcuname, unsigned long gpnum, u8 level,
                  int grplo, int grphi, unsigned long qsmask),
 
         TP_ARGS(rcuname, gpnum, level, grplo, grphi, qsmask),
 
         TP_STRUCT__entry(
-                __field(char *, rcuname)
+                __field(const char *, rcuname)
                 __field(unsigned long, gpnum)
                 __field(u8, level)
                 __field(int, grplo)
@@ -168,12 +168,12 @@ TRACE_EVENT(rcu_grace_period_init,
  */
 TRACE_EVENT(rcu_preempt_task,
 
-        TP_PROTO(char *rcuname, int pid, unsigned long gpnum),
+        TP_PROTO(const char *rcuname, int pid, unsigned long gpnum),
 
         TP_ARGS(rcuname, pid, gpnum),
 
         TP_STRUCT__entry(
-                __field(char *, rcuname)
+                __field(const char *, rcuname)
                 __field(unsigned long, gpnum)
                 __field(int, pid)
         ),
@@ -195,12 +195,12 @@ TRACE_EVENT(rcu_preempt_task,
  */
 TRACE_EVENT(rcu_unlock_preempted_task,
 
-        TP_PROTO(char *rcuname, unsigned long gpnum, int pid),
+        TP_PROTO(const char *rcuname, unsigned long gpnum, int pid),
 
         TP_ARGS(rcuname, gpnum, pid),
 
         TP_STRUCT__entry(
-                __field(char *, rcuname)
+                __field(const char *, rcuname)
                 __field(unsigned long, gpnum)
                 __field(int, pid)
         ),
@@ -224,14 +224,14 @@ TRACE_EVENT(rcu_unlock_preempted_task,
  */
 TRACE_EVENT(rcu_quiescent_state_report,
 
-        TP_PROTO(char *rcuname, unsigned long gpnum,
+        TP_PROTO(const char *rcuname, unsigned long gpnum,
                  unsigned long mask, unsigned long qsmask,
                  u8 level, int grplo, int grphi, int gp_tasks),
 
         TP_ARGS(rcuname, gpnum, mask, qsmask, level, grplo, grphi, gp_tasks),
 
         TP_STRUCT__entry(
-                __field(char *, rcuname)
+                __field(const char *, rcuname)
                 __field(unsigned long, gpnum)
                 __field(unsigned long, mask)
                 __field(unsigned long, qsmask)
@@ -268,15 +268,15 @@ TRACE_EVENT(rcu_quiescent_state_report,
  */
 TRACE_EVENT(rcu_fqs,
 
-        TP_PROTO(char *rcuname, unsigned long gpnum, int cpu, char *qsevent),
+        TP_PROTO(const char *rcuname, unsigned long gpnum, int cpu, const char *qsevent),
 
         TP_ARGS(rcuname, gpnum, cpu, qsevent),
 
         TP_STRUCT__entry(
-                __field(char *, rcuname)
+                __field(const char *, rcuname)
                 __field(unsigned long, gpnum)
                 __field(int, cpu)
-                __field(char *, qsevent)
+                __field(const char *, qsevent)
         ),
 
         TP_fast_assign(
@@ -308,12 +308,12 @@ TRACE_EVENT(rcu_fqs,
  */
 TRACE_EVENT(rcu_dyntick,
 
-        TP_PROTO(char *polarity, long long oldnesting, long long newnesting),
+        TP_PROTO(const char *polarity, long long oldnesting, long long newnesting),
 
         TP_ARGS(polarity, oldnesting, newnesting),
 
         TP_STRUCT__entry(
-                __field(char *, polarity)
+                __field(const char *, polarity)
                 __field(long long, oldnesting)
                 __field(long long, newnesting)
         ),
@@ -352,12 +352,12 @@ TRACE_EVENT(rcu_dyntick,
  */
 TRACE_EVENT(rcu_prep_idle,
 
-        TP_PROTO(char *reason),
+        TP_PROTO(const char *reason),
 
         TP_ARGS(reason),
 
         TP_STRUCT__entry(
-                __field(char *, reason)
+                __field(const char *, reason)
         ),
 
         TP_fast_assign(
@@ -376,13 +376,13 @@ TRACE_EVENT(rcu_prep_idle,
  */
 TRACE_EVENT(rcu_callback,
 
-        TP_PROTO(char *rcuname, struct rcu_head *rhp, long qlen_lazy,
+        TP_PROTO(const char *rcuname, struct rcu_head *rhp, long qlen_lazy,
                  long qlen),
 
         TP_ARGS(rcuname, rhp, qlen_lazy, qlen),
 
         TP_STRUCT__entry(
-                __field(char *, rcuname)
+                __field(const char *, rcuname)
                 __field(void *, rhp)
                 __field(void *, func)
                 __field(long, qlen_lazy)
@@ -412,13 +412,13 @@ TRACE_EVENT(rcu_callback,
  */
 TRACE_EVENT(rcu_kfree_callback,
 
-        TP_PROTO(char *rcuname, struct rcu_head *rhp, unsigned long offset,
+        TP_PROTO(const char *rcuname, struct rcu_head *rhp, unsigned long offset,
                  long qlen_lazy, long qlen),
 
         TP_ARGS(rcuname, rhp, offset, qlen_lazy, qlen),
 
         TP_STRUCT__entry(
-                __field(char *, rcuname)
+                __field(const char *, rcuname)
                 __field(void *, rhp)
                 __field(unsigned long, offset)
                 __field(long, qlen_lazy)
@@ -447,12 +447,12 @@ TRACE_EVENT(rcu_kfree_callback,
  */
 TRACE_EVENT(rcu_batch_start,
 
-        TP_PROTO(char *rcuname, long qlen_lazy, long qlen, long blimit),
+        TP_PROTO(const char *rcuname, long qlen_lazy, long qlen, long blimit),
 
         TP_ARGS(rcuname, qlen_lazy, qlen, blimit),
 
         TP_STRUCT__entry(
-                __field(char *, rcuname)
+                __field(const char *, rcuname)
                 __field(long, qlen_lazy)
                 __field(long, qlen)
                 __field(long, blimit)
@@ -477,12 +477,12 @@ TRACE_EVENT(rcu_batch_start,
  */
 TRACE_EVENT(rcu_invoke_callback,
 
-        TP_PROTO(char *rcuname, struct rcu_head *rhp),
+        TP_PROTO(const char *rcuname, struct rcu_head *rhp),
 
         TP_ARGS(rcuname, rhp),
 
         TP_STRUCT__entry(
-                __field(char *, rcuname)
+                __field(const char *, rcuname)
                 __field(void *, rhp)
                 __field(void *, func)
         ),
@@ -506,12 +506,12 @@ TRACE_EVENT(rcu_invoke_callback,
  */
 TRACE_EVENT(rcu_invoke_kfree_callback,
 
-        TP_PROTO(char *rcuname, struct rcu_head *rhp, unsigned long offset),
+        TP_PROTO(const char *rcuname, struct rcu_head *rhp, unsigned long offset),
 
         TP_ARGS(rcuname, rhp, offset),
 
         TP_STRUCT__entry(
-                __field(char *, rcuname)
+                __field(const char *, rcuname)
                 __field(void *, rhp)
                 __field(unsigned long, offset)
         ),
@@ -539,13 +539,13 @@ TRACE_EVENT(rcu_invoke_kfree_callback,
  */
 TRACE_EVENT(rcu_batch_end,
 
-        TP_PROTO(char *rcuname, int callbacks_invoked,
+        TP_PROTO(const char *rcuname, int callbacks_invoked,
                  bool cb, bool nr, bool iit, bool risk),
 
         TP_ARGS(rcuname, callbacks_invoked, cb, nr, iit, risk),
 
         TP_STRUCT__entry(
-                __field(char *, rcuname)
+                __field(const char *, rcuname)
                 __field(int, callbacks_invoked)
                 __field(bool, cb)
                 __field(bool, nr)
@@ -577,13 +577,13 @@ TRACE_EVENT(rcu_batch_end,
  */
 TRACE_EVENT(rcu_torture_read,
 
-        TP_PROTO(char *rcutorturename, struct rcu_head *rhp,
+        TP_PROTO(const char *rcutorturename, struct rcu_head *rhp,
                  unsigned long secs, unsigned long c_old, unsigned long c),
 
         TP_ARGS(rcutorturename, rhp, secs, c_old, c),
 
         TP_STRUCT__entry(
-                __field(char *, rcutorturename)
+                __field(const char *, rcutorturename)
                 __field(struct rcu_head *, rhp)
                 __field(unsigned long, secs)
                 __field(unsigned long, c_old)
@@ -623,13 +623,13 @@ TRACE_EVENT(rcu_torture_read,
  */
 TRACE_EVENT(rcu_barrier,
 
-        TP_PROTO(char *rcuname, char *s, int cpu, int cnt, unsigned long done),
+        TP_PROTO(const char *rcuname, const char *s, int cpu, int cnt, unsigned long done),
 
         TP_ARGS(rcuname, s, cpu, cnt, done),
 
         TP_STRUCT__entry(
-                __field(char *, rcuname)
-                __field(char *, s)
+                __field(const char *, rcuname)
+                __field(const char *, s)
                 __field(int, cpu)
                 __field(int, cnt)
                 __field(unsigned long, done)