Skip to contentSkip to conversation

tracing: Minor fixes for v5.3-rc2

GIT PULL Merged Steven Rostedt 2 participants 2 messages Jul 31, 2019

Subsystems (2)
lore
Share & tools
lore

Steven Rostedt

author maintainer
#0 lore raw

Linus,

Two minor fixes:

- Fix trace event header include guards, as several did not match the #define to the #ifdef

- Remove a redundant test to ftrace_graph_notrace_addr() that was accidentally added.

Please pull the latest trace-v5.3-rc2 tree, which can be found at:

git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
trace-v5.3-rc2

Tag SHA1: 720001864d680862b4e2b218a1f6e61e5a1f0d38 Head SHA1: 6c77221df96177da0520847ce91e33f539fb8b2d

Changbin Du (1):
fgraph: Remove redundant ftrace_graph_notrace_addr() test

Masahiro Yamada (1):
tracing: Fix header include guards in trace event headers

----

 include/trace/events/dma_fence.h     |  2 +-
 include/trace/events/napi.h          |  4 ++--
 include/trace/events/qdisc.h         |  4 ++--
 include/trace/events/tegra_apb_dma.h |  4 ++--
 kernel/trace/trace_functions_graph.c | 17 +++++++----------
 5 files changed, 14 insertions(+), 17 deletions(-)

---------------------------

include/trace/events/dma_fence.h +1 -1
index 2212adda8f77..64e92d56c6a8 100644
@@ -2,7 +2,7 @@
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM dma_fence
 
-#if !defined(_TRACE_FENCE_H) || defined(TRACE_HEADER_MULTI_READ)
+#if !defined(_TRACE_DMA_FENCE_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_DMA_FENCE_H
 
 #include <linux/tracepoint.h>
include/trace/events/napi.h +2 -2
index f3a12566bed0..6678cf8b235b 100644
@@ -3,7 +3,7 @@
 #define TRACE_SYSTEM napi
 
 #if !defined(_TRACE_NAPI_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_NAPI_H_
+#define _TRACE_NAPI_H
 
 #include <linux/netdevice.h>
 #include <linux/tracepoint.h>
@@ -38,7 +38,7 @@ TRACE_EVENT(napi_poll,
 
 #undef NO_DEV
 
-#endif /* _TRACE_NAPI_H_ */
+#endif /* _TRACE_NAPI_H */
 
 /* This part must be outside protection */
 #include <trace/define_trace.h>
include/trace/events/qdisc.h +2 -2
index 60d0d8bd336d..0d1a9ebf55ba 100644
@@ -2,7 +2,7 @@
 #define TRACE_SYSTEM qdisc
 
 #if !defined(_TRACE_QDISC_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_QDISC_H_
+#define _TRACE_QDISC_H
 
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
@@ -44,7 +44,7 @@ TRACE_EVENT(qdisc_dequeue,
 		  __entry->txq_state, __entry->packets, __entry->skbaddr )
 );
 
-#endif /* _TRACE_QDISC_H_ */
+#endif /* _TRACE_QDISC_H */
 
 /* This part must be outside protection */
 #include <trace/define_trace.h>
include/trace/events/tegra_apb_dma.h +2 -2
index 0818f6286110..971cd02d2daf 100644
@@ -1,5 +1,5 @@
 #if !defined(_TRACE_TEGRA_APB_DMA_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_TEGRA_APM_DMA_H
+#define _TRACE_TEGRA_APB_DMA_H
 
 #include <linux/tracepoint.h>
 #include <linux/dmaengine.h>
@@ -55,7 +55,7 @@ TRACE_EVENT(tegra_dma_isr,
 	TP_printk("%s: irq %d\n",  __get_str(chan), __entry->irq)
 );
 
-#endif /*  _TRACE_TEGRADMA_H */
+#endif /* _TRACE_TEGRA_APB_DMA_H */
 
 /* This part must be outside protection */
 #include <trace/define_trace.h>
kernel/trace/trace_functions_graph.c +7 -10
index 69ebf3c2f1b5..78af97163147 100644
@@ -137,6 +137,13 @@ int trace_graph_entry(struct ftrace_graph_ent *trace)
 	if (trace_recursion_test(TRACE_GRAPH_NOTRACE_BIT))
 		return 0;
 
+	/*
+	 * Do not trace a function if it's filtered by set_graph_notrace.
+	 * Make the index of ret stack negative to indicate that it should
+	 * ignore further functions.  But it needs its own ret stack entry
+	 * to recover the original index in order to continue tracing after
+	 * returning from the function.
+	 */
 	if (ftrace_graph_notrace_addr(trace->func)) {
 		trace_recursion_set(TRACE_GRAPH_NOTRACE_BIT);
 		/*
@@ -155,16 +162,6 @@ int trace_graph_entry(struct ftrace_graph_ent *trace)
 	if (ftrace_graph_ignore_irqs())
 		return 0;
 
-	/*
-	 * Do not trace a function if it's filtered by set_graph_notrace.
-	 * Make the index of ret stack negative to indicate that it should
-	 * ignore further functions.  But it needs its own ret stack entry
-	 * to recover the original index in order to continue tracing after
-	 * returning from the function.
-	 */
-	if (ftrace_graph_notrace_addr(trace->func))
-		return 1;
-
 	/*
 	 * Stop here if tracing_threshold is set. We only write function return
 	 * events to the ring buffer.
merge bot Merged
#1 lore raw
The pull request you sent on Wed, 31 Jul 2019 11:05:17 -0400:

The pull request you sent on Wed, 31 Jul 2019 11:05:17 -0400:

Quoted 1 line

git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git trace-v5.3-rc2

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/d2eee9fca172d0d010ef3060cdc971e0b079b87f

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker