[PATCH 10/23 -v8] mcount tracer add preempt_enable/disable notrace macros

[Steven Rostedt <rostedt@goodmis.org>]

[-- Attachment #1: mcount-preempt-notrace.patch --]
[-- Type: text/plain, Size: 2874 bytes --]

The tracer may need to call preempt_enable and disable functions
for time keeping and such. The trace gets ugly when we see these
functions show up for all traces. To make the output cleaner
this patch adds preempt_enable_notrace and preempt_disable_notrace
to be used by tracer (and debugging) functions.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
---
 include/linux/clocksource.h |    5 +++--
 include/linux/preempt.h     |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

Index: linux-mcount.git/include/linux/clocksource.h
===================================================================
--- linux-mcount.git.orig/include/linux/clocksource.h	2008-01-30 15:09:16.000000000 -0500
+++ linux-mcount.git/include/linux/clocksource.h	2008-01-30 15:11:07.000000000 -0500
@@ -197,7 +197,8 @@ clocksource_get_basecycles(struct clocks
 	int num;
 	cycle_t now, offset;
 
-	preempt_disable();
+	/* This code is used for tracing. */
+	preempt_disable_notrace();
 	num = cs->base_num;
 	/* base_num is shared, and some archs are wacky */
 	smp_read_barrier_depends();
@@ -205,7 +206,7 @@ clocksource_get_basecycles(struct clocks
 	offset = (now - cs->base[num].cycle_base_last);
 	offset &= cs->mask;
 	offset += cs->base[num].cycle_base;
-	preempt_enable();
+	preempt_enable_notrace();
 
 	return offset;
 }
Index: linux-mcount.git/include/linux/preempt.h
===================================================================
--- linux-mcount.git.orig/include/linux/preempt.h	2008-01-30 14:35:50.000000000 -0500
+++ linux-mcount.git/include/linux/preempt.h	2008-01-30 15:11:07.000000000 -0500
@@ -52,6 +52,34 @@ do { \
 	preempt_check_resched(); \
 } while (0)
 
+/* For debugging and tracer internals only! */
+#define add_preempt_count_notrace(val)			\
+	do { preempt_count() += (val); } while (0)
+#define sub_preempt_count_notrace(val)			\
+	do { preempt_count() -= (val); } while (0)
+#define inc_preempt_count_notrace() add_preempt_count_notrace(1)
+#define dec_preempt_count_notrace() sub_preempt_count_notrace(1)
+
+#define preempt_disable_notrace() \
+do { \
+	inc_preempt_count_notrace(); \
+	barrier(); \
+} while (0)
+
+#define preempt_enable_no_resched_notrace() \
+do { \
+	barrier(); \
+	dec_preempt_count_notrace(); \
+} while (0)
+
+/* preempt_check_resched is OK to trace */
+#define preempt_enable_notrace() \
+do { \
+	preempt_enable_no_resched_notrace(); \
+	barrier(); \
+	preempt_check_resched(); \
+} while (0)
+
 #else
 
 #define preempt_disable()		do { } while (0)
@@ -59,6 +87,10 @@ do { \
 #define preempt_enable()		do { } while (0)
 #define preempt_check_resched()		do { } while (0)
 
+#define preempt_disable_notrace()		do { } while (0)
+#define preempt_enable_no_resched_notrace()	do { } while (0)
+#define preempt_enable_notrace()		do { } while (0)
+
 #endif
 
 #ifdef CONFIG_PREEMPT_NOTIFIERS

--