Merge branches 'doc.2019.12.10a', 'exp.2019.12.09a', 'fixes.2020.01.24a', 'kfree_rcu...

[mirror_ubuntu-jammy-kernel.git] / include / trace / events / rcu.h

diff --git a/include/trace/events/rcu.h b/include/trace/events/rcu.h
index 66122602bd0859781bde38302ea6e208e17c3201..5e49b06e810445f2d07e1144f7d176a7cf0697c2 100644 (file)
--- a/include/trace/events/rcu.h
+++ b/include/trace/events/rcu.h
@@ -41,7 +41,7 @@ TRACE_EVENT(rcu_utilization,
        TP_printk("%s", __entry->s)
 );
 
-#if defined(CONFIG_TREE_RCU) || defined(CONFIG_PREEMPT_RCU)
+#if defined(CONFIG_TREE_RCU)
 
 /*
  * Tracepoint for grace-period events.  Takes a string identifying the
@@ -432,7 +432,7 @@ TRACE_EVENT_RCU(rcu_fqs,
                  __entry->cpu, __entry->qsevent)
 );
 
-#endif /* #if defined(CONFIG_TREE_RCU) || defined(CONFIG_PREEMPT_RCU) */
+#endif /* #if defined(CONFIG_TREE_RCU) */
 
 /*
  * Tracepoint for dyntick-idle entry/exit events.  These take a string
@@ -449,7 +449,7 @@ TRACE_EVENT_RCU(rcu_fqs,
  */
 TRACE_EVENT_RCU(rcu_dyntick,
 
-       TP_PROTO(const char *polarity, long oldnesting, long newnesting, atomic_t dynticks),
+       TP_PROTO(const char *polarity, long oldnesting, long newnesting, int dynticks),
 
        TP_ARGS(polarity, oldnesting, newnesting, dynticks),
 
@@ -464,7 +464,7 @@ TRACE_EVENT_RCU(rcu_dyntick,
                __entry->polarity = polarity;
                __entry->oldnesting = oldnesting;
                __entry->newnesting = newnesting;
-               __entry->dynticks = atomic_read(&dynticks);
+               __entry->dynticks = dynticks;
        ),
 
        TP_printk("%s %lx %lx %#3x", __entry->polarity,
@@ -481,16 +481,14 @@ TRACE_EVENT_RCU(rcu_dyntick,
  */
 TRACE_EVENT_RCU(rcu_callback,
 
-       TP_PROTO(const char *rcuname, struct rcu_head *rhp, long qlen_lazy,
-                long qlen),
+       TP_PROTO(const char *rcuname, struct rcu_head *rhp, long qlen),
 
-       TP_ARGS(rcuname, rhp, qlen_lazy, qlen),
+       TP_ARGS(rcuname, rhp, qlen),
 
        TP_STRUCT__entry(
                __field(const char *, rcuname)
                __field(void *, rhp)
                __field(void *, func)
-               __field(long, qlen_lazy)
                __field(long, qlen)
        ),
 
@@ -498,13 +496,12 @@ TRACE_EVENT_RCU(rcu_callback,
                __entry->rcuname = rcuname;
                __entry->rhp = rhp;
                __entry->func = rhp->func;
-               __entry->qlen_lazy = qlen_lazy;
                __entry->qlen = qlen;
        ),
 
-       TP_printk("%s rhp=%p func=%ps %ld/%ld",
+       TP_printk("%s rhp=%p func=%ps %ld",
                  __entry->rcuname, __entry->rhp, __entry->func,
-                 __entry->qlen_lazy, __entry->qlen)
+                 __entry->qlen)
 );
 
 /*
@@ -518,15 +515,14 @@ TRACE_EVENT_RCU(rcu_callback,
 TRACE_EVENT_RCU(rcu_kfree_callback,
 
        TP_PROTO(const char *rcuname, struct rcu_head *rhp, unsigned long offset,
-                long qlen_lazy, long qlen),
+                long qlen),
 
-       TP_ARGS(rcuname, rhp, offset, qlen_lazy, qlen),
+       TP_ARGS(rcuname, rhp, offset, qlen),
 
        TP_STRUCT__entry(
                __field(const char *, rcuname)
                __field(void *, rhp)
                __field(unsigned long, offset)
-               __field(long, qlen_lazy)
                __field(long, qlen)
        ),
 
@@ -534,13 +530,12 @@ TRACE_EVENT_RCU(rcu_kfree_callback,
                __entry->rcuname = rcuname;
                __entry->rhp = rhp;
                __entry->offset = offset;
-               __entry->qlen_lazy = qlen_lazy;
                __entry->qlen = qlen;
        ),
 
-       TP_printk("%s rhp=%p func=%ld %ld/%ld",
+       TP_printk("%s rhp=%p func=%ld %ld",
                  __entry->rcuname, __entry->rhp, __entry->offset,
-                 __entry->qlen_lazy, __entry->qlen)
+                 __entry->qlen)
 );
 
 /*
@@ -552,27 +547,24 @@ TRACE_EVENT_RCU(rcu_kfree_callback,
  */
 TRACE_EVENT_RCU(rcu_batch_start,
 
-       TP_PROTO(const char *rcuname, long qlen_lazy, long qlen, long blimit),
+       TP_PROTO(const char *rcuname, long qlen, long blimit),
 
-       TP_ARGS(rcuname, qlen_lazy, qlen, blimit),
+       TP_ARGS(rcuname, qlen, blimit),
 
        TP_STRUCT__entry(
                __field(const char *, rcuname)
-               __field(long, qlen_lazy)
                __field(long, qlen)
                __field(long, blimit)
        ),
 
        TP_fast_assign(
                __entry->rcuname = rcuname;
-               __entry->qlen_lazy = qlen_lazy;
                __entry->qlen = qlen;
                __entry->blimit = blimit;
        ),
 
-       TP_printk("%s CBs=%ld/%ld bl=%ld",
-                 __entry->rcuname, __entry->qlen_lazy, __entry->qlen,
-                 __entry->blimit)
+       TP_printk("%s CBs=%ld bl=%ld",
+                 __entry->rcuname, __entry->qlen, __entry->blimit)
 );
 
 /*