Skip to contentSkip to conversation

Add a tracer to catch execution time of kernel functions

RFC PATCH Superseded Frederic Weisbecker 2 participants 3 messages Nov 7, 2008 – Nov 8, 2008

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

RFC PATCH v2 2/2 Add a tracer to catch execution time of kernel functions

This tracer uses the low level function return ftrace plugin to measure the execution time of the kernel functions.

The first field is the caller of the function, the second is the measured function, and the last one is the execution time in nanoseconds.

---

kernel/trace/Kconfig +13 -0
index fc4febc..f27b46b 100644
@@ -54,6 +54,19 @@ config FUNCTION_TRACER
 	  (the bootup default), then the overhead of the instructions is very
 	  small and not measurable even in micro-benchmarks.
 
+config FTRACE_RETURN
+	bool "Kernel Function return Tracer"
+	depends on !DYNAMIC_FTRACE
+	depends on X86
+	depends on DEBUG_KERNEL
+	select FRAME_POINTER
+	select TRACING
+	help
+	  Enable the kernel to trace a function at its return.
+	  It's first purpose is to trace the duration of functions.
+	  It is totally unstable and ugly at this time and only supports
+	  one function call at a time.
+
 config IRQSOFF_TRACER
 	bool "Interrupts-off Latency Tracer"
 	default n
kernel/trace/Makefile +1 -0
index c8228b1..5cfacd5 100644
@@ -24,5 +24,6 @@ obj-$(CONFIG_NOP_TRACER) += trace_nop.o
 obj-$(CONFIG_STACK_TRACER) += trace_stack.o
 obj-$(CONFIG_MMIOTRACE) += trace_mmiotrace.o
 obj-$(CONFIG_BOOT_TRACER) += trace_boot.o
+obj-$(CONFIG_FTRACE_RETURN) += trace_functions_return.o
 
 libftrace-y := ftrace.o
kernel/trace/ftrace.c +15 -0
index 896c71f..d11e4a2 100644
@@ -1481,3 +1481,18 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,
 	return ret;
 }
 
+#ifdef CONFIG_FTRACE_RETURN
+void (*ftrace_function_return)(struct ftrace_retfunc *) = ftrace_return_stub;
+void register_ftrace_return(void (*func)(struct ftrace_retfunc *))
+{
+	ftrace_function_return = func;
+}
+
+void unregister_ftrace_return(void)
+{
+	ftrace_function_return = ftrace_return_stub;
+}
+#endif
+
+
+
kernel/trace/trace.c +49 -8

81 lines not on this page · raw message

kernel/trace/trace.h +22 -0
index 3422489..ebf1722 100644
@@ -22,6 +22,7 @@ enum trace_type {
 	TRACE_MMIO_RW,
 	TRACE_MMIO_MAP,
 	TRACE_BOOT,
+	TRACE_FN_RET,
 
 	__TRACE_LAST_TYPE
 };
@@ -48,6 +49,15 @@ struct ftrace_entry {
 	unsigned long		ip;
 	unsigned long		parent_ip;
 };
+
+/* Function return entry */
+struct ftrace_ret_entry {
+	struct trace_entry	ent;
+	unsigned long		ip;
+	unsigned long		parent_ip;
+	unsigned long long	calltime;
+	unsigned long long	rettime;
+};
 extern struct tracer boot_tracer;
 extern struct tracer sched_switch_trace; /* Used by the boot tracer */
 
@@ -220,6 +230,7 @@ extern void __ftrace_bad_type(void);
 		IF_ASSIGN(var, ent, struct trace_mmiotrace_map,		\
 			  TRACE_MMIO_MAP);				\
 		IF_ASSIGN(var, ent, struct trace_boot, TRACE_BOOT);	\
+		IF_ASSIGN(var, ent, struct ftrace_ret_entry, TRACE_FN_RET); \
 		__ftrace_bad_type();					\
 	} while (0)
 
@@ -322,6 +333,8 @@ void trace_function(struct trace_array *tr,
 		    unsigned long ip,
 		    unsigned long parent_ip,
 		    unsigned long flags, int pc);
+void
+trace_function_return(struct ftrace_retfunc *trace);
 
 void tracing_start_cmdline_record(void);
 void tracing_stop_cmdline_record(void);
@@ -391,6 +404,15 @@ extern void *head_page(struct trace_array_cpu *data);
 extern int trace_seq_printf(struct trace_seq *s, const char *fmt, ...);
 extern void trace_seq_print_cont(struct trace_seq *s,
 				 struct trace_iterator *iter);
+
+/*
+ * TRACE_ITER_SYM_MASK masks the options in trace_flags that
+ * control the output of kernel symbols.
+ */
+#define TRACE_ITER_SYM_MASK \
+	(TRACE_ITER_PRINT_PARENT|TRACE_ITER_SYM_OFFSET|TRACE_ITER_SYM_ADDR)
+extern int
+seq_print_ip_sym(struct trace_seq *s, unsigned long ip, unsigned long sym_flags);
 extern ssize_t trace_seq_to_user(struct trace_seq *s, char __user *ubuf,
 				 size_t cnt);
 extern long ns2usecs(cycle_t nsec);
kernel/trace/trace_functions_return.c new file +98 -0

98 lines not on this page · raw message

maintainer
#1 lore raw
Quoted 14 lines · Frederic Weisbecker

This tracer uses the low level function return ftrace plugin to measure the execution time of the kernel functions.

The first field is the caller of the function, the second is the measured function, and the last one is the execution time in nanoseconds.

---

kernel/trace/Kconfig +0 -0
index fc4febc..f27b46b 100644

kernel/trace/Kconfig config FUNCTION_TRACER · line 59

Quoted 6 lines
kernel/trace/Kconfig +3 -0
@@ -54,6 +54,19 @@ config FUNCTION_TRACER
 	  (the bootup default), then the overhead of the instructions is very
 	  small and not measurable even in micro-benchmarks.
 
+config FTRACE_RETURN
+	bool "Kernel Function return Tracer"
+	depends on !DYNAMIC_FTRACE

Why not the DYNAMIC_FTRACE?

You might want to add a HAVE_FTRACE_RETURN and just depend on that as well as DEBUG_KERNEL.

Quoted 29 lines
kernel/trace/Kconfig +10 -0
+	depends on X86
+	depends on DEBUG_KERNEL
+	select FRAME_POINTER
+	select TRACING
+	help
+	  Enable the kernel to trace a function at its return.
+	  It's first purpose is to trace the duration of functions.
+	  It is totally unstable and ugly at this time and only supports
+	  one function call at a time.
+
 config IRQSOFF_TRACER
 	bool "Interrupts-off Latency Tracer"
 	default n
kernel/trace/Makefile +1 -0
index c8228b1..5cfacd5 100644
@@ -24,5 +24,6 @@ obj-$(CONFIG_NOP_TRACER) += trace_nop.o
 obj-$(CONFIG_STACK_TRACER) += trace_stack.o
 obj-$(CONFIG_MMIOTRACE) += trace_mmiotrace.o
 obj-$(CONFIG_BOOT_TRACER) += trace_boot.o
+obj-$(CONFIG_FTRACE_RETURN) += trace_functions_return.o
 
 libftrace-y := ftrace.o
kernel/trace/ftrace.c +0 -0
index 896c71f..d11e4a2 100644

kernel/trace/ftrace.c ftrace_enable_sysctl(struct ctl_table *table, int write, · line 1488

Quoted 8 lines
kernel/trace/ftrace.c +5 -0
@@ -1481,3 +1481,18 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,
 	return ret;
 }
 
+#ifdef CONFIG_FTRACE_RETURN
+void (*ftrace_function_return)(struct ftrace_retfunc *) = ftrace_return_stub;
+void register_ftrace_return(void (*func)(struct ftrace_retfunc *))
+{
+	ftrace_function_return = func;

Might be cool to allow multiple functions like ftrace does. But we can do that after we get the kinks out of the code you already have ;-)

kernel/trace/ftrace.c ftrace_enable_sysctl(struct ctl_table *table, int write, · line 1493

Quoted 5 lines
kernel/trace/ftrace.c +5 -0
+}
+
+void unregister_ftrace_return(void)
+{
+	ftrace_function_return = ftrace_return_stub;

Again, I think just using ftrace_stub should be fine.

Quoted 10 lines
kernel/trace/ftrace.c +5 -0
+}
+#endif
+
+
+
kernel/trace/trace.c +0 -0
index d55ccfc..6e7f2bb 100644

kernel/trace/trace.c unsigned long nsecs_to_usecs(unsigned long nsecs) · line 252

Quoted 9 lines
kernel/trace/trace.c +0 -6
@@ -244,13 +244,6 @@ unsigned long nsecs_to_usecs(unsigned long nsecs)
 	return nsecs / 1000;
 }
 
-/*
- * TRACE_ITER_SYM_MASK masks the options in trace_flags that
- * control the output of kernel symbols.
- */
-#define TRACE_ITER_SYM_MASK \
-	(TRACE_ITER_PRINT_PARENT|TRACE_ITER_SYM_OFFSET|TRACE_ITER_SYM_ADDR)

Not sure why you moved TRACE_ITER_SYM_MASK. I like it here because it is right next to the trace_options flags.

Quoted 46 lines
kernel/trace/trace.c +31 -1
-
 /* These must match the bit postions in trace_iterator_flags */
 static const char *trace_options[] = {
 	"print-parent",
@@ -813,6 +806,33 @@ trace_function(struct trace_array *tr, struct trace_array_cpu *data,
 	ring_buffer_unlock_commit(tr->buffer, event, irq_flags);
 }
 
+static void __trace_function_return(struct trace_array *tr,
+							 struct trace_array_cpu *data,
+							 struct ftrace_retfunc *trace,
+							 unsigned long flags,
+							 int pc)
+{
+	struct ring_buffer_event *event;
+	struct ftrace_ret_entry *entry;
+	unsigned long irq_flags;
+
+	if (unlikely(local_read(&__get_cpu_var(ftrace_cpu_disabled))))
+		return;
+
+	event = ring_buffer_lock_reserve(global_trace.buffer, sizeof(*entry),
+					 &irq_flags);
+	if (!event)
+		return;
+	entry	= ring_buffer_event_data(event);
+	tracing_generic_entry_update(&entry->ent, flags, pc);
+	entry->ent.type			= TRACE_FN_RET;
+	entry->ip			= trace->func;
+	entry->parent_ip	= trace->ret;
+	entry->rettime		= trace->rettime;
+	entry->calltime		= trace->calltime;
+	ring_buffer_unlock_commit(global_trace.buffer, event, irq_flags);
+}
+
 void
 ftrace(struct trace_array *tr, struct trace_array_cpu *data,
        unsigned long ip, unsigned long parent_ip, unsigned long flags,
@@ -1039,6 +1059,27 @@ function_trace_call(unsigned long ip, unsigned long parent_ip)
 	raw_local_irq_restore(flags);
 }
 
+void trace_function_return(struct ftrace_retfunc *trace)
+{
+	struct trace_array *tr = &global_trace;
+	struct trace_array_cpu *data;

kernel/trace/trace.c function_trace_call(unsigned long ip, unsigned long parent_ip) · line 1075

Quoted 10 lines
kernel/trace/trace.c +10 -0
+	unsigned long flags;
+	long disabled;
+	int cpu;
+	int pc;
+
+	raw_local_irq_save(flags);
+	cpu = raw_smp_processor_id();
+	data = tr->data[cpu];
+	disabled = atomic_inc_return(&data->disabled);
+	if (likely(disabled)) {

You need a test of disabled == 1, otherwise it is always true ;-)

Quoted 166 lines
kernel/trace/trace.c +8 -1
+		pc = preempt_count();
+		__trace_function_return(tr, data, trace, flags, pc);
+	}
+	atomic_dec(&data->disabled);
+	raw_local_irq_restore(flags);
+}
+
 static struct ftrace_ops trace_ops __read_mostly =
 {
 	.func = function_trace_call,
@@ -1286,7 +1327,7 @@ seq_print_sym_offset(struct trace_seq *s, const char *fmt,
 # define IP_FMT "%016lx"
 #endif
 
-static int
+int
 seq_print_ip_sym(struct trace_seq *s, unsigned long ip, unsigned long sym_flags)
 {
 	int ret;
kernel/trace/trace.h +22 -0
index 3422489..ebf1722 100644
@@ -22,6 +22,7 @@ enum trace_type {
 	TRACE_MMIO_RW,
 	TRACE_MMIO_MAP,
 	TRACE_BOOT,
+	TRACE_FN_RET,
 
 	__TRACE_LAST_TYPE
 };
@@ -48,6 +49,15 @@ struct ftrace_entry {
 	unsigned long		ip;
 	unsigned long		parent_ip;
 };
+
+/* Function return entry */
+struct ftrace_ret_entry {
+	struct trace_entry	ent;
+	unsigned long		ip;
+	unsigned long		parent_ip;
+	unsigned long long	calltime;
+	unsigned long long	rettime;
+};
 extern struct tracer boot_tracer;
 extern struct tracer sched_switch_trace; /* Used by the boot tracer */
 
@@ -220,6 +230,7 @@ extern void __ftrace_bad_type(void);
 		IF_ASSIGN(var, ent, struct trace_mmiotrace_map,		\
 			  TRACE_MMIO_MAP);				\
 		IF_ASSIGN(var, ent, struct trace_boot, TRACE_BOOT);	\
+		IF_ASSIGN(var, ent, struct ftrace_ret_entry, TRACE_FN_RET); \
 		__ftrace_bad_type();					\
 	} while (0)
 
@@ -322,6 +333,8 @@ void trace_function(struct trace_array *tr,
 		    unsigned long ip,
 		    unsigned long parent_ip,
 		    unsigned long flags, int pc);
+void
+trace_function_return(struct ftrace_retfunc *trace);
 
 void tracing_start_cmdline_record(void);
 void tracing_stop_cmdline_record(void);
@@ -391,6 +404,15 @@ extern void *head_page(struct trace_array_cpu *data);
 extern int trace_seq_printf(struct trace_seq *s, const char *fmt, ...);
 extern void trace_seq_print_cont(struct trace_seq *s,
 				 struct trace_iterator *iter);
+
+/*
+ * TRACE_ITER_SYM_MASK masks the options in trace_flags that
+ * control the output of kernel symbols.
+ */
+#define TRACE_ITER_SYM_MASK \
+	(TRACE_ITER_PRINT_PARENT|TRACE_ITER_SYM_OFFSET|TRACE_ITER_SYM_ADDR)
+extern int
+seq_print_ip_sym(struct trace_seq *s, unsigned long ip, unsigned long sym_flags);
 extern ssize_t trace_seq_to_user(struct trace_seq *s, char __user *ubuf,
 				 size_t cnt);
 extern long ns2usecs(cycle_t nsec);
kernel/trace/trace_functions_return.c new file +80 -0
new file mode 100644
index 0000000..b62491d
@@ -0,0 +1,98 @@
+/*
+ * 
+ * Function return tracer.
+ * Copyright (c) 2008 Frederic Weisbecker <[email protected]>
+ * Mostly borrowed from function tracer which 
+ * is Copyright (c) Steven Rostedt <[email protected]>
+ *
+ */
+#include <linux/debugfs.h>
+#include <linux/uaccess.h>
+#include <linux/ftrace.h>
+#include <linux/fs.h>
+
+#include "trace.h"
+
+struct trace_array *ret_trace;
+
+
+
+static void start_return_trace(struct trace_array *tr)
+{
+	register_ftrace_return(&trace_function_return);
+}
+
+static void stop_return_trace(struct trace_array *tr)
+{
+	unregister_ftrace_return();
+}
+
+static void return_trace_init(struct trace_array *tr)
+{
+	int cpu;
+	for_each_online_cpu(cpu)
+		tracing_reset(tr, cpu);
+	ret_trace = tr;
+
+	if (tr->ctrl)
+		start_return_trace(tr);
+}
+
+static void return_trace_reset(struct trace_array *tr)
+{
+	if (tr->ctrl)
+		stop_return_trace(tr);
+}
+
+static void return_trace_ctrl_update(struct trace_array *tr)
+{
+	if (tr->ctrl)
+		start_return_trace(tr);
+	else
+		stop_return_trace(tr);
+}
+
+typedef void (*func_t)(void);
+
+static enum print_line_t
+print_return(struct trace_iterator *iter)
+{
+	struct trace_seq *s = &iter->seq;
+	struct trace_entry *entry = iter->ent;
+	struct ftrace_ret_entry *field;
+	int ret;
+
+	if (entry->type == TRACE_FN_RET) {
+		trace_assign_type(field, entry);
+		ret = trace_seq_printf(s, "%pF -> ", (func_t)field->parent_ip);
+		if (!ret)
+			return TRACE_TYPE_PARTIAL_LINE;
+		ret = seq_print_ip_sym(s, field->ip,
+					trace_flags & TRACE_ITER_SYM_MASK);
+		if (!ret)
+			return TRACE_TYPE_PARTIAL_LINE;
+		ret = trace_seq_printf(s, " (%llu ns)\n",
+					field->rettime - field->calltime);
+		if (!ret)
+			return TRACE_TYPE_PARTIAL_LINE;
+		else
+			return TRACE_TYPE_HANDLED;
+	}

kernel/trace/trace_functions_return.c line 90

Quoted 10 lines
kernel/trace/trace_functions_return.c new file +10 -0
+	return TRACE_TYPE_UNHANDLED;
+}
+
+static struct tracer return_trace __read_mostly =
+{
+	.name	     = "return",
+	.init	     = return_trace_init,
+	.reset	     = return_trace_reset,
+	.ctrl_update = return_trace_ctrl_update,
+	.print_line = print_return

Can you just add the case statement in the trace.c code to call your print function. Otherwise, all we get is your output. It would be nice to let all tracers use this.

-- Steve

Quoted 10 lines
kernel/trace/trace_functions_return.c new file +8 -0
+};
+
+static __init int init_return_trace(void)
+{
+	return register_tracer(&return_trace);
+}
+
+device_initcall(init_return_trace);
#2 lore raw

2008/11/7 Steven Rostedt <[email protected]>:

Quoted 20 lines · Frederic Weisbecker
Quoted 18 lines

This tracer uses the low level function return ftrace plugin to measure the execution time of the kernel functions.

The first field is the caller of the function, the second is the measured function, and the last one is the execution time in nanoseconds.

---

kernel/trace/Kconfig +0 -0
index fc4febc..f27b46b 100644
@@ -54,6 +54,19 @@ config FUNCTION_TRACER
        (the bootup default), then the overhead of the instructions is very
        small and not measurable even in micro-benchmarks.
 
Quoted 5 lines

kernel/trace/Kconfig config FUNCTION_TRACER · line 59

Quoted 3 lines
kernel/trace/Kconfig +3 -0
+config FTRACE_RETURN
+     bool "Kernel Function return Tracer"
+     depends on !DYNAMIC_FTRACE

Why not the DYNAMIC_FTRACE?

Hm. Perhaps I misunderstand DYNAMIC_TRACE but AFAIK, it modifies the code to add a direct call to the function tracer.
I should adapt it to add a call to prepare_ftrace_return. I just did not work on it yet but on the current state I can't use it with return tracing.

Quoted 2 lines

You might want to add a HAVE_FTRACE_RETURN and just depend on that as well as DEBUG_KERNEL.

Right.

Quoted 32 lines
Quoted 32 lines
kernel/trace/Kconfig +10 -0
+     depends on X86
+     depends on DEBUG_KERNEL
+     select FRAME_POINTER
+     select TRACING
+     help
+       Enable the kernel to trace a function at its return.
+       It's first purpose is to trace the duration of functions.
+       It is totally unstable and ugly at this time and only supports
+       one function call at a time.
+
 config IRQSOFF_TRACER
      bool "Interrupts-off Latency Tracer"
      default n
kernel/trace/Makefile +1 -0
index c8228b1..5cfacd5 100644
@@ -24,5 +24,6 @@ obj-$(CONFIG_NOP_TRACER) += trace_nop.o
 obj-$(CONFIG_STACK_TRACER) += trace_stack.o
 obj-$(CONFIG_MMIOTRACE) += trace_mmiotrace.o
 obj-$(CONFIG_BOOT_TRACER) += trace_boot.o
+obj-$(CONFIG_FTRACE_RETURN) += trace_functions_return.o
 
 libftrace-y := ftrace.o
kernel/trace/ftrace.c +0 -0
index 896c71f..d11e4a2 100644
@@ -1481,3 +1481,18 @@ ftrace_enable_sysctl(struct ctl_table *table, int write,
      return ret;
 }
 
Quoted 8 lines

kernel/trace/ftrace.c ftrace_enable_sysctl(struct ctl_table *table, int write, · line 1488

Quoted 5 lines
kernel/trace/ftrace.c +5 -0
+#ifdef CONFIG_FTRACE_RETURN
+void (*ftrace_function_return)(struct ftrace_retfunc *) = ftrace_return_stub;
+void register_ftrace_return(void (*func)(struct ftrace_retfunc *))
+{
+     ftrace_function_return = func;

Might be cool to allow multiple functions like ftrace does. But we can do that after we get the kinks out of the code you already have ;-)

I thought about it too. And as you said, I reserve it when the current things will be proper :-)

Quoted 22 lines

kernel/trace/ftrace.c ftrace_enable_sysctl(struct ctl_table *table, int write, · line 1493

Quoted 5 lines
kernel/trace/ftrace.c +5 -0
+}
+
+void unregister_ftrace_return(void)
+{
+     ftrace_function_return = ftrace_return_stub;

Again, I think just using ftrace_stub should be fine.

Quoted 13 lines
kernel/trace/ftrace.c +5 -0
+}
+#endif
+
+
+
kernel/trace/trace.c +0 -0
index d55ccfc..6e7f2bb 100644
@@ -244,13 +244,6 @@ unsigned long nsecs_to_usecs(unsigned long nsecs)
      return nsecs / 1000;
 }
 
Quoted 9 lines

kernel/trace/trace.c unsigned long nsecs_to_usecs(unsigned long nsecs) · line 252

Quoted 6 lines
kernel/trace/trace.c +0 -6
-/*
- * TRACE_ITER_SYM_MASK masks the options in trace_flags that
- * control the output of kernel symbols.
- */
-#define TRACE_ITER_SYM_MASK \
-     (TRACE_ITER_PRINT_PARENT|TRACE_ITER_SYM_OFFSET|TRACE_ITER_SYM_ADDR)

Not sure why you moved TRACE_ITER_SYM_MASK. I like it here because it is right next to the trace_options flags.

Because I use it with seq_ip_print_sym on the return tracer.

Quoted 42 lines
Quoted 42 lines
kernel/trace/trace.c +27 -1
-
 /* These must match the bit postions in trace_iterator_flags */
 static const char *trace_options[] = {
      "print-parent",
@@ -813,6 +806,33 @@ trace_function(struct trace_array *tr, struct trace_array_cpu *data,
      ring_buffer_unlock_commit(tr->buffer, event, irq_flags);
 }
 
+static void __trace_function_return(struct trace_array *tr,
+                                                      struct trace_array_cpu *data,
+                                                      struct ftrace_retfunc *trace,
+                                                      unsigned long flags,
+                                                      int pc)
+{
+     struct ring_buffer_event *event;
+     struct ftrace_ret_entry *entry;
+     unsigned long irq_flags;
+
+     if (unlikely(local_read(&__get_cpu_var(ftrace_cpu_disabled))))
+             return;
+
+     event = ring_buffer_lock_reserve(global_trace.buffer, sizeof(*entry),
+                                      &irq_flags);
+     if (!event)
+             return;
+     entry   = ring_buffer_event_data(event);
+     tracing_generic_entry_update(&entry->ent, flags, pc);
+     entry->ent.type                 = TRACE_FN_RET;
+     entry->ip                       = trace->func;
+     entry->parent_ip        = trace->ret;
+     entry->rettime          = trace->rettime;
+     entry->calltime         = trace->calltime;
+     ring_buffer_unlock_commit(global_trace.buffer, event, irq_flags);
+}
+
 void
 ftrace(struct trace_array *tr, struct trace_array_cpu *data,
        unsigned long ip, unsigned long parent_ip, unsigned long flags,
@@ -1039,6 +1059,27 @@ function_trace_call(unsigned long ip, unsigned long parent_ip)
      raw_local_irq_restore(flags);
 }
 
Quoted 16 lines
Quoted 4 lines
kernel/trace/trace.c +4 -0
+void trace_function_return(struct ftrace_retfunc *trace)
+{
+     struct trace_array *tr = &global_trace;
+     struct trace_array_cpu *data;

kernel/trace/trace.c function_trace_call(unsigned long ip, unsigned long parent_ip) · line 1075

Quoted 10 lines
kernel/trace/trace.c +10 -0
+     unsigned long flags;
+     long disabled;
+     int cpu;
+     int pc;
+
+     raw_local_irq_save(flags);
+     cpu = raw_smp_processor_id();
+     data = tr->data[cpu];
+     disabled = atomic_inc_return(&data->disabled);
+     if (likely(disabled)) {

You need a test of disabled == 1, otherwise it is always true ;-)

Oops.

Quoted 172 lines
Quoted 172 lines
kernel/trace/trace.c +8 -1
+             pc = preempt_count();
+             __trace_function_return(tr, data, trace, flags, pc);
+     }
+     atomic_dec(&data->disabled);
+     raw_local_irq_restore(flags);
+}
+
 static struct ftrace_ops trace_ops __read_mostly =
 {
      .func = function_trace_call,
@@ -1286,7 +1327,7 @@ seq_print_sym_offset(struct trace_seq *s, const char *fmt,
 # define IP_FMT "%016lx"
 #endif
 
-static int
+int
 seq_print_ip_sym(struct trace_seq *s, unsigned long ip, unsigned long sym_flags)
 {
      int ret;
kernel/trace/trace.h +22 -0
index 3422489..ebf1722 100644
@@ -22,6 +22,7 @@ enum trace_type {
      TRACE_MMIO_RW,
      TRACE_MMIO_MAP,
      TRACE_BOOT,
+     TRACE_FN_RET,
 
      __TRACE_LAST_TYPE
 };
@@ -48,6 +49,15 @@ struct ftrace_entry {
      unsigned long           ip;
      unsigned long           parent_ip;
 };
+
+/* Function return entry */
+struct ftrace_ret_entry {
+     struct trace_entry      ent;
+     unsigned long           ip;
+     unsigned long           parent_ip;
+     unsigned long long      calltime;
+     unsigned long long      rettime;
+};
 extern struct tracer boot_tracer;
 extern struct tracer sched_switch_trace; /* Used by the boot tracer */
 
@@ -220,6 +230,7 @@ extern void __ftrace_bad_type(void);
              IF_ASSIGN(var, ent, struct trace_mmiotrace_map,         \
                        TRACE_MMIO_MAP);                              \
              IF_ASSIGN(var, ent, struct trace_boot, TRACE_BOOT);     \
+             IF_ASSIGN(var, ent, struct ftrace_ret_entry, TRACE_FN_RET); \
              __ftrace_bad_type();                                    \
      } while (0)
 
@@ -322,6 +333,8 @@ void trace_function(struct trace_array *tr,
                  unsigned long ip,
                  unsigned long parent_ip,
                  unsigned long flags, int pc);
+void
+trace_function_return(struct ftrace_retfunc *trace);
 
 void tracing_start_cmdline_record(void);
 void tracing_stop_cmdline_record(void);
@@ -391,6 +404,15 @@ extern void *head_page(struct trace_array_cpu *data);
 extern int trace_seq_printf(struct trace_seq *s, const char *fmt, ...);
 extern void trace_seq_print_cont(struct trace_seq *s,
                               struct trace_iterator *iter);
+
+/*
+ * TRACE_ITER_SYM_MASK masks the options in trace_flags that
+ * control the output of kernel symbols.
+ */
+#define TRACE_ITER_SYM_MASK \
+     (TRACE_ITER_PRINT_PARENT|TRACE_ITER_SYM_OFFSET|TRACE_ITER_SYM_ADDR)
+extern int
+seq_print_ip_sym(struct trace_seq *s, unsigned long ip, unsigned long sym_flags);
 extern ssize_t trace_seq_to_user(struct trace_seq *s, char __user *ubuf,
                               size_t cnt);
 extern long ns2usecs(cycle_t nsec);
kernel/trace/trace_functions_return.c new file +86 -0
new file mode 100644
index 0000000..b62491d
@@ -0,0 +1,98 @@
+/*
+ *
+ * Function return tracer.
+ * Copyright (c) 2008 Frederic Weisbecker <[email protected]>
+ * Mostly borrowed from function tracer which
+ * is Copyright (c) Steven Rostedt <[email protected]>
+ *
+ */
+#include <linux/debugfs.h>
+#include <linux/uaccess.h>
+#include <linux/ftrace.h>
+#include <linux/fs.h>
+
+#include "trace.h"
+
+struct trace_array *ret_trace;
+
+
+
+static void start_return_trace(struct trace_array *tr)
+{
+     register_ftrace_return(&trace_function_return);
+}
+
+static void stop_return_trace(struct trace_array *tr)
+{
+     unregister_ftrace_return();
+}
+
+static void return_trace_init(struct trace_array *tr)
+{
+     int cpu;
+     for_each_online_cpu(cpu)
+             tracing_reset(tr, cpu);
+     ret_trace = tr;
+
+     if (tr->ctrl)
+             start_return_trace(tr);
+}
+
+static void return_trace_reset(struct trace_array *tr)
+{
+     if (tr->ctrl)
+             stop_return_trace(tr);
+}
+
+static void return_trace_ctrl_update(struct trace_array *tr)
+{
+     if (tr->ctrl)
+             start_return_trace(tr);
+     else
+             stop_return_trace(tr);
+}
+
+typedef void (*func_t)(void);
+
+static enum print_line_t
+print_return(struct trace_iterator *iter)
+{
+     struct trace_seq *s = &iter->seq;
+     struct trace_entry *entry = iter->ent;
+     struct ftrace_ret_entry *field;
+     int ret;
+
+     if (entry->type == TRACE_FN_RET) {
+             trace_assign_type(field, entry);
+             ret = trace_seq_printf(s, "%pF -> ", (func_t)field->parent_ip);
+             if (!ret)
+                     return TRACE_TYPE_PARTIAL_LINE;
+             ret = seq_print_ip_sym(s, field->ip,
+                                     trace_flags & TRACE_ITER_SYM_MASK);
+             if (!ret)
+                     return TRACE_TYPE_PARTIAL_LINE;
+             ret = trace_seq_printf(s, " (%llu ns)\n",
+                                     field->rettime - field->calltime);
+             if (!ret)
+                     return TRACE_TYPE_PARTIAL_LINE;
+             else
+                     return TRACE_TYPE_HANDLED;
+     }
+     return TRACE_TYPE_UNHANDLED;
+}
+
+static struct tracer return_trace __read_mostly =
+{
+     .name        = "return",
Quoted 8 lines

kernel/trace/trace_functions_return.c line 90

Quoted 4 lines
kernel/trace/trace_functions_return.c new file +4 -0
+     .init        = return_trace_init,
+     .reset       = return_trace_reset,
+     .ctrl_update = return_trace_ctrl_update,
+     .print_line = print_return

Can you just add the case statement in the trace.c code to call your print function. Otherwise, all we get is your output. It would be nice to let all tracers use this.

Ok.
Thanks. I will apply these things for V3.