Skip to contentSkip to conversation

latency tracer update

PATCH In review Jan Kiszka 2 participants 8 messages Jan 4, 2006 – Jan 7, 2006

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/1 latency tracer update

Hi again,

here comes the first update of the new latency tracer.

 arch/i386/kernel/entry.S      |   27 +++
 arch/i386/kernel/ipipe-root.c |    4
 include/asm-i386/system.h     |   70 +++++++++
 include/linux/ipipe_trace.h   |    3
 kernel/ipipe/Kconfig          |   18 ++
 kernel/ipipe/tracer.c         |  247 +++++++++++++++++++++++-----------
 6 files changed, 288 insertions(+), 81 deletions(-)

The list of changes:

o save ipipe_trace_freeze() (and only this function!) from NMI context
o CONFIG_IPIPE_TRACE_IRQSOFF instrumentation traces the longest hard-IRQs-off phase of the system (regarding limitations see my earlier posting today)
o fixed subtle trace mess-up
o added some "unlikely" to the tracer's hotpath
o added ipipe_trace_{max|frozen}_reset() to the API

To-do
o fix leaking IRQs-off trace
o documentation...

Philippe, I think this should already be merged into Adeos although TRACE_IRQSOFF is not perfect yet.

Jan

/arch/i386/kernel/entry.S renamed from /arch/i386/kernel/entry.S.orig +27 -0
@@ -106,6 +106,29 @@ VM_MASK		= 0x00020000
 				call __ipipe_divert_exception ; \
 				testl %eax,%eax	; \
 				jnz restore_raw
+
+#ifdef CONFIG_IPIPE_TRACE_IRQSOFF
+# ifdef CONFIG_REGPARM
+#  define LOAD_ARG(arg)         movl $arg, %eax
+#  define REMOVE_ARG
+# else  /* !CONFIG_REGPARM */
+#  define LOAD_ARG(arg)         pushl $arg
+#  define REMOVE_ARG            addl $4, %esp
+# endif /* CONFIG_REGPARM */
+# define IPIPE_TRACE_BEGIN(v)   lea 0x24(%esp), %ebp ; \
+                                LOAD_ARG(v) ; \
+                                call ipipe_trace_begin ; \
+                                REMOVE_ARG
+# define IPIPE_TRACE_END(v)     pushl %eax ; \
+                                LOAD_ARG(v) ; \
+                                call ipipe_trace_end ; \
+                                REMOVE_ARG ; \
+                                popl %eax
+#else  /* !CONFIG_IPIPE_TRACE_IRQSOFF */
+# define IPIPE_TRACE_BEGIN(v)
+# define IPIPE_TRACE_END(v)
+#endif /* CONFIG_IPIPE_TRACE_IRQSOFF */
+
 #else  /* !CONFIG_IPIPE */
 #define CLI                     cli
 #define STI                     sti
@@ -474,7 +497,9 @@ vector=vector+1
 	ALIGN
 common_interrupt:
 	SAVE_ALL
+	IPIPE_TRACE_BEGIN(0x80000002); \
 	call __ipipe_handle_irq
+	IPIPE_TRACE_END(0x80000002); \
 	testl %eax,%eax
 	jnz  ret_from_intr
 	RESTORE_REGS
@@ -485,7 +510,9 @@ common_interrupt:
 ENTRY(name)				\
 	pushl $nr-288;	/* nr - (256 + FIRST_EXTERNAL_VECTOR) */ \
 	SAVE_ALL;			\
+	IPIPE_TRACE_BEGIN(0x80000002); \
 	call __ipipe_handle_irq;	\
+	IPIPE_TRACE_END(0x80000002); \
 	testl %eax,%eax;		\
 	jnz  ret_from_intr;		\
 	RESTORE_REGS;			\
/arch/i386/kernel/ipipe-root.c renamed from /arch/i386/kernel/ipipe-root.c.orig +2 -2
@@ -283,7 +283,7 @@ asmlinkage int __ipipe_kpreempt_root(str
 	}
 
 	__ipipe_stall_root();
-	local_irq_enable_hw();
+	local_irq_enable_hw_notrace();
 
 	return 1;		/* Ok, may reschedule now. */
 }
@@ -294,7 +294,7 @@ asmlinkage void __ipipe_unstall_iret_roo
 
 	/* Emulate IRET's handling of the interrupt flag. */
 
-	local_irq_disable_hw();
+	local_irq_disable_hw_notrace();
 
 	ipipe_load_cpuid();
 
/kernel/ipipe/tracer.c renamed from /kernel/ipipe/tracer.c.orig +174 -73

368 lines not on this page · raw message

/kernel/ipipe/Kconfig renamed from /kernel/ipipe/Kconfig.orig +15 -3
@@ -15,9 +15,21 @@ config IPIPE_STATS
 	  is useful to detect unexpected latency spots.
 
 config IPIPE_TRACE
-	bool "Trace interrupt latencies"
+	bool "Latency Tracing"
 	depends on IPIPE && PROC_FS
 	default n
 	---help---
-	  Activate this option if I-pipe shall trace the longest stalled path
-	  of the domain with the highest priority.
+	  Activate this option if you want to use per-function tracing of
+	  the kernel. The tracer will collect data via instrumentation
+	  features like the one below or with the help of explicite calls
+	  of ipipe_trace_xxx(). See include/linux/ipipe_trace.h for the
+	  in-kernel tracing API. The collected data and runtime control
+	  is available via /proc/ipipe/trace/*.
+
+config IPIPE_TRACE_IRQSOFF
+	bool "Trace IRQs-off times"
+	depends on IPIPE_TRACE
+	default y
+	---help---
+	  Activate this option if I-pipe shall trace the longest path
+	  with hard-IRQs switched off.
/include/linux/ipipe_trace.h renamed from /include/linux/ipipe_trace.h.orig +3 -0
@@ -28,4 +28,7 @@ void ipipe_trace_end(unsigned long v);
 void ipipe_trace_freeze(unsigned long v);
 void ipipe_trace_special(unsigned char special_id, unsigned long v);
 
+void ipipe_trace_max_reset(void);
+void ipipe_trace_frozen_reset(void);
+
 #endif	/* !__LINUX_IPIPE_H */
/include/asm-i386/system.h renamed from /include/asm-i386/system.h.orig +67 -3

85 lines not on this page · raw message

#1 lore raw
Quoted 22 lines · Jan Kiszka

Hi again,

here comes the first update of the new latency tracer.

 arch/i386/kernel/entry.S      |   27 +++
 arch/i386/kernel/ipipe-root.c |    4
 include/asm-i386/system.h     |   70 +++++++++
 include/linux/ipipe_trace.h   |    3
 kernel/ipipe/Kconfig          |   18 ++
 kernel/ipipe/tracer.c         |  247 +++++++++++++++++++++++-----------
 6 files changed, 288 insertions(+), 81 deletions(-)

The list of changes:

o save ipipe_trace_freeze() (and only this function!) from NMI context
o CONFIG_IPIPE_TRACE_IRQSOFF instrumentation traces the longest hard-IRQs-off phase of the system (regarding limitations see my earlier posting today)
o fixed subtle trace mess-up
o added some "unlikely" to the tracer's hotpath
o added ipipe_trace_{max|frozen}_reset() to the API

Quoted 7 lines

To-do
o fix leaking IRQs-off trace
o documentation...

Philippe, I think this should already be merged into Adeos although TRACE_IRQSOFF is not perfect yet.

Ok, it's queued for review. I'm busy right now integrating Dmitry's shared IRQ infrastructure into all supported archs and revalidating Xeno with the shortened interrupt path; once that's done and a first round of patches is rolled out, a second one will follow for x86 with the tracer fixes.

Signature · 1 line
Philippe.
#2 lore raw
In reply to Jan Kiszka
Quoted 5 lines · Jan Kiszka

Hi again,

here comes the first update of the new latency tracer.

 arch/i386/kernel/entry.S      |   27 +++

Is there any good reason to patch the callers of __ipipe_handle_irq instead of instrumenting the callee directly?

Quoted 7 lines
 arch/i386/kernel/ipipe-root.c |    4
 include/asm-i386/system.h     |   70 +++++++++
 include/linux/ipipe_trace.h   |    3
 kernel/ipipe/Kconfig          |   18 ++
 kernel/ipipe/tracer.c         |  247 +++++++++++++++++++++++-----------
 6 files changed, 288 insertions(+), 81 deletions(-)
Signature · 1 line
Philippe.
author
#3 lore raw
Quoted 4 lines · Philippe Gerum
Quoted 2 lines · Jan Kiszka

Hi again,

Quoted 8 lines
Quoted 3 lines

here comes the first update of the new latency tracer.

 arch/i386/kernel/entry.S      |   27 +++

Is there any good reason to patch the callers of __ipipe_handle_irq instead of instrumenting the callee directly?

To capture the invocation delay of __ipipe_handle_irq itself.

Quoted 9 lines
Quoted 7 lines
 arch/i386/kernel/ipipe-root.c |    4
 include/asm-i386/system.h     |   70 +++++++++
 include/linux/ipipe_trace.h   |    3
 kernel/ipipe/Kconfig          |   18 ++
 kernel/ipipe/tracer.c         |  247 +++++++++++++++++++++++-----------
 6 files changed, 288 insertions(+), 81 deletions(-)

Meanwhile I found a solution for the described unterminated trace (put an explicite trace_end at the end of __ipipe_unstall_iret_root), included the irq number in the begin/end report, and stumbled over some other remaining unterminated trace on a different machine. So, no need to hurry with the merge (not the review! ;) ), I will publish a second revision first.

Jan

author
#4 lore raw
Quoted 8 lines · Jan Kiszka

...
Meanwhile I found a solution for the described unterminated trace (put an explicite trace_end at the end of __ipipe_unstall_iret_root), included the irq number in the begin/end report, and stumbled over some other remaining unterminated trace on a different machine. So, no need to hurry with the merge (not the review! ;) ), I will publish a second revision first.

And here comes this revision finally. Should apply (almost) cleanly against latest ipipe versions. Additionally to the changes of the first revision this one addresses the following topics:

o fix trace overrun handling
o report IRQ number to tracer on IRQ entry/exit
o fix virtually leaking IRQs-off in __ipipe_unstall_iret_root()
o fix another potential NMI race
o really trace the maximum IRQs-off time, not the maximum time of consecutive IRQs-off times (that scenario will soon be addressed instead in the latency benchmark tool => reset&freeze the maximum latency from the user's point of view)
o remove the ipipe_trace_special reporting in local_irq_xxx trace points (cleans up the traces inside IRQ-off paths)

The tracer has undergone a significant number of tests now and it really looks like it is stable. I will now have to fix/improve some minor issues on the Xenomai side regarding tracing.

Jan

arch/i386/kernel/entry.S renamed from arch/i386/kernel/entry.S.orig +31 -0
@@ -106,6 +106,33 @@ VM_MASK		= 0x00020000
 				call __ipipe_divert_exception ; \
 				testl %eax,%eax	; \
 				jnz restore_raw
+
+#ifdef CONFIG_IPIPE_TRACE_IRQSOFF
+# ifdef CONFIG_REGPARM
+#  define LOAD_ARG
+#  define REMOVE_ARG
+# else  /* !CONFIG_REGPARM */
+#  define LOAD_ARG      pushl %eax
+#  define REMOVE_ARG    addl $4, %esp
+# endif /* CONFIG_REGPARM */
+# define IPIPE_TRACE_IRQ_ENTER \
+	lea EIP-4(%esp), %ebp; \
+	movl ORIG_EAX(%esp), %eax; \
+	LOAD_ARG; \
+	call ipipe_trace_begin; \
+	REMOVE_ARG
+# define IPIPE_TRACE_IRQ_EXIT \
+	pushl %eax; \
+	movl ORIG_EAX+4(%esp), %eax; \
+	LOAD_ARG; \
+	call ipipe_trace_end; \
+	REMOVE_ARG; \
+	popl %eax
+#else  /* !CONFIG_IPIPE_TRACE_IRQSOFF */
+# define IPIPE_TRACE_IRQ_ENTER
+# define IPIPE_TRACE_IRQ_EXIT
+#endif /* CONFIG_IPIPE_TRACE_IRQSOFF */
+
 #else  /* !CONFIG_IPIPE */
 #define CLI                     cli
 #define STI                     sti
@@ -474,7 +501,9 @@ vector=vector+1
 	ALIGN
 common_interrupt:
 	SAVE_ALL
+	IPIPE_TRACE_IRQ_ENTER; \
 	call __ipipe_handle_irq
+	IPIPE_TRACE_IRQ_EXIT; \
 	testl %eax,%eax
 	jnz  ret_from_intr
 	RESTORE_REGS
@@ -485,7 +514,9 @@ common_interrupt:
 ENTRY(name)				\
 	pushl $nr-288;	/* nr - (256 + FIRST_EXTERNAL_VECTOR) */ \
 	SAVE_ALL;			\
+	IPIPE_TRACE_IRQ_ENTER; \
 	call __ipipe_handle_irq;	\
+	IPIPE_TRACE_IRQ_EXIT; \
 	testl %eax,%eax;		\
 	jnz  ret_from_intr;		\
 	RESTORE_REGS;			\
arch/i386/kernel/ipipe-root.c renamed from arch/i386/kernel/ipipe-root.c.orig +4 -1
@@ -283,7 +283,7 @@ asmlinkage int __ipipe_kpreempt_root(str
 	}
 
 	__ipipe_stall_root();
-	local_irq_enable_hw();
+	local_irq_enable_hw_notrace();
 
 	return 1;		/* Ok, may reschedule now. */
 }
@@ -320,6 +320,9 @@ asmlinkage void __ipipe_unstall_iret_roo
 		     irq_pending_hi & IPIPE_IRQMASK_VIRT) != 0)
 			__ipipe_sync_stage(IPIPE_IRQMASK_VIRT);
 	}
+#ifdef CONFIG_IPIPE_TRACE_IRQSOFF
+	ipipe_trace_end(0x8000000D);
+#endif /* CONFIG_IPIPE_TRACE_IRQSOFF */
 }
 
 asmlinkage int __ipipe_syscall_root(struct pt_regs regs)
kernel/ipipe/tracer.c renamed from kernel/ipipe/tracer.c.orig +193 -75

393 lines not on this page · raw message

kernel/ipipe/Kconfig renamed from kernel/ipipe/Kconfig.orig +15 -3
@@ -15,9 +15,21 @@ config IPIPE_STATS
 	  is useful to detect unexpected latency spots.
 
 config IPIPE_TRACE
-	bool "Trace interrupt latencies"
+	bool "Latency Tracing"
 	depends on IPIPE && PROC_FS
 	default n
 	---help---
-	  Activate this option if I-pipe shall trace the longest stalled path
-	  of the domain with the highest priority.
+	  Activate this option if you want to use per-function tracing of
+	  the kernel. The tracer will collect data via instrumentation
+	  features like the one below or with the help of explicite calls
+	  of ipipe_trace_xxx(). See include/linux/ipipe_trace.h for the
+	  in-kernel tracing API. The collected data and runtime control
+	  is available via /proc/ipipe/trace/*.
+
+config IPIPE_TRACE_IRQSOFF
+	bool "Trace IRQs-off times"
+	depends on IPIPE_TRACE
+	default y
+	---help---
+	  Activate this option if I-pipe shall trace the longest path
+	  with hard-IRQs switched off.
include/linux/ipipe_trace.h renamed from include/linux/ipipe_trace.h.orig +3 -0
@@ -28,4 +28,7 @@ void ipipe_trace_end(unsigned long v);
 void ipipe_trace_freeze(unsigned long v);
 void ipipe_trace_special(unsigned char special_id, unsigned long v);
 
+void ipipe_trace_max_reset(void);
+void ipipe_trace_frozen_reset(void);
+
 #endif	/* !__LINUX_IPIPE_H */
include/asm-i386/system.h renamed from include/asm-i386/system.h.orig +61 -3

79 lines not on this page · raw message

#7 lore raw
In reply to Jan Kiszka
Quoted 12 lines · Jan Kiszka
Quoted 10 lines · Philippe Gerum
Quoted 5 lines · Jan Kiszka

Hi again,

here comes the first update of the new latency tracer.

arch/i386/kernel/entry.S | 27 +++

Quoted 7 lines
Quoted 3 lines

Is there any good reason to patch the callers of __ipipe_handle_irq instead of instrumenting the callee directly?

To capture the invocation delay of __ipipe_handle_irq itself.

Ok.

Quoted 11 lines
Quoted 10 lines
Quoted 8 lines
arch/i386/kernel/ipipe-root.c |    4
include/asm-i386/system.h     |   70 +++++++++
include/linux/ipipe_trace.h   |    3
kernel/ipipe/Kconfig          |   18 ++
kernel/ipipe/tracer.c         |  247 +++++++++++++++++++++++-----------
6 files changed, 288 insertions(+), 81 deletions(-)
Quoted 3 lines

Meanwhile I found a solution for the described unterminated trace (put an explicite trace_end at the end of __ipipe_unstall_iret_root),

Yeah, sorry for the delay in answering. That's indeed the way to do it.

included the irq number in the begin/end report, and stumbled over some

Quoted 13 lines

other remaining unterminated trace on a different machine. So, no need to hurry with the merge (not the review! ;) ), I will publish a second revision first.

Jan

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

_______________________________________________
Adeos-main mailing list
[email protected]
https://mail.gna.org/listinfo/adeos-main

Signature · 1 line
Philippe.
author
#5 lore raw
In reply to Jan Kiszka
Quoted 16 lines · Jan Kiszka
Quoted 8 lines · Jan Kiszka

...
Meanwhile I found a solution for the described unterminated trace (put an explicite trace_end at the end of __ipipe_unstall_iret_root), included the irq number in the begin/end report, and stumbled over some other remaining unterminated trace on a different machine. So, no need to hurry with the merge (not the review! ;) ), I will publish a second revision first.

And here comes this revision finally. Should apply (almost) cleanly against latest ipipe versions. Additionally to the changes of the first revision this one addresses the following topics:

Quoted 8 lines

o fix trace overrun handling
o report IRQ number to tracer on IRQ entry/exit
o fix virtually leaking IRQs-off in __ipipe_unstall_iret_root()
o fix another potential NMI race
o really trace the maximum IRQs-off time, not the maximum time of consecutive IRQs-off times (that scenario will soon be addressed instead in the latency benchmark tool => reset&freeze the maximum latency from the user's point of view)

...and it turned out that the existing functions were no sufficient for this. So here comes an add-on patch to update3:

o allow ipipe_trace_{frozen|max}_reset from every context (well, at least give it a try and just fail on locked traces)
o mark border between valid and invalid trace points
o show invalid points border

Apply order:

ipipe_tracer.update3
ipipe_tracer.update3-1

The front-end to the first change, a modified latency+timerbench will get committed to Xenomai soon. It already works nicely, automatically creating a freeze of the maximum latency turn the benchmark perceives.

Jan

kernel/ipipe/tracer.c renamed from kernel/ipipe/tracer.c.orig +33 -15
@@ -134,10 +134,14 @@ __ipipe_migrate_pre_trace(struct ipipe_t
 	int i;
 
 	new_tp->trace_pos = pre_trace+1;
+
 	for (i = new_tp->trace_pos; i > 0; i--)
 		memcpy(&new_tp->point[WRAP_POINT_NO(new_tp->trace_pos-i)],
 		       &old_tp->point[WRAP_POINT_NO(old_pos-i)],
 		       sizeof(struct ipipe_trace_point));
+
+	/* mark the end (i.e. the point before point[0]) invalid */
+	new_tp->point[IPIPE_TRACE_POINTS-1].eip = 0;
 }
 
 static notrace struct ipipe_trace_path *
@@ -436,21 +440,23 @@ void notrace ipipe_trace_special(unsigne
 }
 EXPORT_SYMBOL(ipipe_trace_special);
 
-void ipipe_trace_max_reset(void)
+int ipipe_trace_max_reset(void)
 {
 	int cpu_id;
 	unsigned long flags;
 	struct ipipe_trace_path *path;
+	int ret = 0;
 
-	/* only allowed from root domain (we sync with /proc routines) */
-	if (ipipe_current_domain != ipipe_root_domain)
-		return;
-
-	down(&out_mutex);
 	flags = __ipipe_global_path_lock();
 
 	for_each_cpu(cpu_id) {
 		path = &trace_paths[cpu_id][max_path[cpu_id]];
+
+		if (path->dump_lock) {
+			ret = -EBUSY;
+			break;
+		}
+
 		path->begin     = -1;
 		path->end       = -1;
 		path->trace_pos = 0;
@@ -458,25 +464,28 @@ void ipipe_trace_max_reset(void)
 	}
 
 	__ipipe_global_path_unlock(flags);
-	up(&out_mutex);
+
+	return ret;
 }
 EXPORT_SYMBOL(ipipe_trace_max_reset);
 
-void ipipe_trace_frozen_reset(void)
+int ipipe_trace_frozen_reset(void)
 {
 	int cpu_id;
 	unsigned long flags;
 	struct ipipe_trace_path *path;
+	int ret = 0;
 
-	/* only allowed from root domain (we sync with /proc routines) */
-	if (ipipe_current_domain != ipipe_root_domain)
-		return;
-
-	down(&out_mutex);
 	flags = __ipipe_global_path_lock();
 
 	for_each_cpu(cpu_id) {
 		path = &trace_paths[cpu_id][frozen_path[cpu_id]];
+
+		if (path->dump_lock) {
+			ret = -EBUSY;
+			break;
+		}
+
 		path->begin = -1;
 		path->end = -1;
 		path->trace_pos = 0;
@@ -484,7 +493,8 @@ void ipipe_trace_frozen_reset(void)
 	}
 
 	__ipipe_global_path_unlock(flags);
-	up(&out_mutex);
+
+	return ret;
 }
 EXPORT_SYMBOL(ipipe_trace_frozen_reset);
 
@@ -684,8 +694,10 @@ static int __ipipe_prtrace_show(struct s
 	unsigned long long abs_delta;
 	struct ipipe_trace_point *point = p;
 
-	if (!point->eip)
+	if (!point->eip) {
+		seq_puts(m, "-<invalid>-\n");
 		return 0;
+	}
 
 	/* ipipe_tsc2us works on unsigned => handle sign separately */
 	delta = point->timestamp -
@@ -749,7 +761,10 @@ static ssize_t
 __ipipe_max_reset(struct file *file, const char __user *pbuffer,
                   size_t count, loff_t *data)
 {
+	down(&out_mutex);
 	ipipe_trace_max_reset();
+	up(&out_mutex);
+
 	return count;
 }
 
@@ -841,7 +856,10 @@ static ssize_t
 __ipipe_frozen_reset(struct file *file, const char __user *pbuffer,
                      size_t count, loff_t *data)
 {
+	down(&out_mutex);
 	ipipe_trace_frozen_reset();
+	up(&out_mutex);
+
 	return count;
 }
 
include/linux/ipipe_trace.h renamed from include/linux/ipipe_trace.h.orig +2 -2
@@ -28,7 +28,7 @@ void ipipe_trace_end(unsigned long v);
 void ipipe_trace_freeze(unsigned long v);
 void ipipe_trace_special(unsigned char special_id, unsigned long v);
 
-void ipipe_trace_max_reset(void);
-void ipipe_trace_frozen_reset(void);
+int ipipe_trace_max_reset(void);
+int ipipe_trace_frozen_reset(void);
 
 #endif	/* !__LINUX_IPIPE_H */
#6 lore raw
Quoted 37 lines · Jan Kiszka
Quoted 17 lines · Jan Kiszka
Quoted 8 lines · Jan Kiszka

...
Meanwhile I found a solution for the described unterminated trace (put an explicite trace_end at the end of __ipipe_unstall_iret_root), included the irq number in the begin/end report, and stumbled over some other remaining unterminated trace on a different machine. So, no need to hurry with the merge (not the review! ;) ), I will publish a second revision first.

And here comes this revision finally. Should apply (almost) cleanly against latest ipipe versions. Additionally to the changes of the first revision this one addresses the following topics:

Quoted 8 lines

o fix trace overrun handling
o report IRQ number to tracer on IRQ entry/exit
o fix virtually leaking IRQs-off in __ipipe_unstall_iret_root()
o fix another potential NMI race
o really trace the maximum IRQs-off time, not the maximum time of consecutive IRQs-off times (that scenario will soon be addressed instead in the latency benchmark tool => reset&freeze the maximum latency from the user's point of view)

...and it turned out that the existing functions were no sufficient for this. So here comes an add-on patch to update3:

o allow ipipe_trace_{frozen|max}_reset from every context (well, at least give it a try and just fail on locked traces)
o mark border between valid and invalid trace points
o show invalid points border

Quoted 5 lines

Apply order:

ipipe_tracer.update3
ipipe_tracer.update3-1

Merged in 1.1-03, with the appropriate tracer patch. Thanks.

Quoted 148 lines

The front-end to the first change, a modified latency+timerbench will get committed to Xenomai soon. It already works nicely, automatically creating a freeze of the maximum latency turn the benchmark perceives.

Jan

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

kernel/ipipe/tracer.c renamed from kernel/ipipe/tracer.c.orig +33 -15
@@ -134,10 +134,14 @@ __ipipe_migrate_pre_trace(struct ipipe_t
 	int i;
 
 	new_tp->trace_pos = pre_trace+1;
+
 	for (i = new_tp->trace_pos; i > 0; i--)
 		memcpy(&new_tp->point[WRAP_POINT_NO(new_tp->trace_pos-i)],
 		       &old_tp->point[WRAP_POINT_NO(old_pos-i)],
 		       sizeof(struct ipipe_trace_point));
+
+	/* mark the end (i.e. the point before point[0]) invalid */
+	new_tp->point[IPIPE_TRACE_POINTS-1].eip = 0;
 }
 
 static notrace struct ipipe_trace_path *
@@ -436,21 +440,23 @@ void notrace ipipe_trace_special(unsigne
 }
 EXPORT_SYMBOL(ipipe_trace_special);
 
-void ipipe_trace_max_reset(void)
+int ipipe_trace_max_reset(void)
 {
 	int cpu_id;
 	unsigned long flags;
 	struct ipipe_trace_path *path;
+	int ret = 0;
 
-	/* only allowed from root domain (we sync with /proc routines) */
-	if (ipipe_current_domain != ipipe_root_domain)
-		return;
-
-	down(&out_mutex);
 	flags = __ipipe_global_path_lock();
 
 	for_each_cpu(cpu_id) {
 		path = &trace_paths[cpu_id][max_path[cpu_id]];
+
+		if (path->dump_lock) {
+			ret = -EBUSY;
+			break;
+		}
+
 		path->begin     = -1;
 		path->end       = -1;
 		path->trace_pos = 0;
@@ -458,25 +464,28 @@ void ipipe_trace_max_reset(void)
 	}
 
 	__ipipe_global_path_unlock(flags);
-	up(&out_mutex);
+
+	return ret;
 }
 EXPORT_SYMBOL(ipipe_trace_max_reset);
 
-void ipipe_trace_frozen_reset(void)
+int ipipe_trace_frozen_reset(void)
 {
 	int cpu_id;
 	unsigned long flags;
 	struct ipipe_trace_path *path;
+	int ret = 0;
 
-	/* only allowed from root domain (we sync with /proc routines) */
-	if (ipipe_current_domain != ipipe_root_domain)
-		return;
-
-	down(&out_mutex);
 	flags = __ipipe_global_path_lock();
 
 	for_each_cpu(cpu_id) {
 		path = &trace_paths[cpu_id][frozen_path[cpu_id]];
+
+		if (path->dump_lock) {
+			ret = -EBUSY;
+			break;
+		}
+
 		path->begin = -1;
 		path->end = -1;
 		path->trace_pos = 0;
@@ -484,7 +493,8 @@ void ipipe_trace_frozen_reset(void)
 	}
 
 	__ipipe_global_path_unlock(flags);
-	up(&out_mutex);
+
+	return ret;
 }
 EXPORT_SYMBOL(ipipe_trace_frozen_reset);
 
@@ -684,8 +694,10 @@ static int __ipipe_prtrace_show(struct s
 	unsigned long long abs_delta;
 	struct ipipe_trace_point *point = p;
 
-	if (!point->eip)
+	if (!point->eip) {
+		seq_puts(m, "-<invalid>-\n");
 		return 0;
+	}
 
 	/* ipipe_tsc2us works on unsigned => handle sign separately */
 	delta = point->timestamp -
@@ -749,7 +761,10 @@ static ssize_t
 __ipipe_max_reset(struct file *file, const char __user *pbuffer,
                   size_t count, loff_t *data)
 {
+	down(&out_mutex);
 	ipipe_trace_max_reset();
+	up(&out_mutex);
+
 	return count;
 }
 
@@ -841,7 +856,10 @@ static ssize_t
 __ipipe_frozen_reset(struct file *file, const char __user *pbuffer,
                      size_t count, loff_t *data)
 {
+	down(&out_mutex);
 	ipipe_trace_frozen_reset();
+	up(&out_mutex);
+
 	return count;
 }
 
include/linux/ipipe_trace.h renamed from include/linux/ipipe_trace.h.orig +2 -2
@@ -28,7 +28,7 @@ void ipipe_trace_end(unsigned long v);
 void ipipe_trace_freeze(unsigned long v);
 void ipipe_trace_special(unsigned char special_id, unsigned long v);
 
-void ipipe_trace_max_reset(void);
-void ipipe_trace_frozen_reset(void);
+int ipipe_trace_max_reset(void);
+int ipipe_trace_frozen_reset(void);
 
 #endif	/* !__LINUX_IPIPE_H */
Signature · 1 line
Philippe.