PATCH - kernel trace mechanism for KDB

diff -urN -X /home/jim/dontdiff linux.orig/arch/i386/boot/compressed/misc.c linux/arch/i386/boot/compressed/misc.c
@@ -381,3 +381,18 @@
 	if (high_loaded) close_output_buffer_if_we_run_high(mv);
 	return high_loaded;
 }
+
+#ifdef CONFIG_INSTRUMENT_FUNC
+void __cyg_profile_func_enter(void *, void *)
+        __attribute__ ((no_instrument_function));
+void __cyg_profile_func_exit(void *, void *)
+        __attribute__ ((no_instrument_function));                               
+
+void __cyg_profile_func_enter(void *a1, void *a2)
+{
+}
+
+void __cyg_profile_func_exit(void *a1, void *a2)
+{
+}
+#endif

diff -urN -X /home/jim/dontdiff linux.orig/arch/i386/kdb/kdbasupport.c linux/arch/i386/kdb/kdbasupport.c
@@ -1030,6 +1030,8 @@
 }
 
 #ifdef KDB_HAVE_LONGJMP
+int kdba_setjmp(kdb_jmp_buf *jb)
+	__attribute__ ((no_instrument_function));
 int
 kdba_setjmp(kdb_jmp_buf *jb)
 {

@@ -1059,6 +1061,8 @@
 	return 0;
 }
 
+void kdba_longjmp(kdb_jmp_buf *jb, int reason)
+	__attribute__ ((no_instrument_function));
 void
 kdba_longjmp(kdb_jmp_buf *jb, int reason)
 {

diff -urN -X /home/jim/dontdiff linux.orig/drivers/parport/parport_pc.c linux/drivers/parport/parport_pc.c
@@ -256,6 +256,11 @@
 	parport_generic_irq(irq, (struct parport *) dev_id, regs);
 }
 
+/*
+ * Actually it cause problems to have both static inline and a
+ * global version.
+ */
+#if 0
 void parport_pc_write_data(struct parport *p, unsigned char d)
 {
 	outb (d, DATA (p));

@@ -343,6 +348,7 @@
 {
 	__parport_pc_frob_control (p, 0x20, 0x20);
 }
+#endif
 
 void parport_pc_init_state(struct pardevice *dev, struct parport_state *s)
 {

diff -urN -X /home/jim/dontdiff linux.orig/include/asm-i386/current.h linux/include/asm-i386/current.h
@@ -4,6 +4,8 @@
 struct task_struct;
 
 static inline struct task_struct * get_current(void)
+	__attribute__ ((no_instrument_function));
+static inline struct task_struct * get_current(void)
 {
 	struct task_struct *current;
 	__asm__("andl %%esp,%0; ":"=r" (current) : "0" (~8191UL));

601 lines not on this page · raw message

89 lines not on this page · raw message

diff -urN -X /home/jim/dontdiff linux.orig/kdb/kdbmain.c linux/kdb/kdbmain.c
@@ -91,6 +91,13 @@
 kdb_jmp_buf	kdbjmpbuf[NR_CPUS];
 #endif	/* KDB_HAVE_LONGJMP */
 
+#if defined(CONFIG_INSTRUMENT_FUNC)
+/* Hooks to automaticly disable kernel trace on entry to kdb */
+extern void kdb_trc_disable(void);
+extern void kdb_trc_continue(void);
+extern void kdb_trc_init(void);
+#endif /* CONFIG_INSTRUMENT_FUNC */
+
 	/*
 	 * kdb_commands describes the available commands.
 	 */

@@ -1212,6 +1219,11 @@
 	if (!kdb_on)
 		return 0;
 
+#if defined(CONFIG_INSTRUMENT_FUNC)
+	/* disable kernel trace while in kdb */
+	kdb_trc_disable();
+#endif
+
 	KDB_DEBUG_STATE("kdb 1", reason);
 	KDB_STATE_CLEAR(SUPPRESS);
 

@@ -1228,6 +1240,10 @@
 	if ((reason == KDB_REASON_BREAK || reason == KDB_REASON_DEBUG)
 	 && db_result == KDB_DB_NOBPT) {
 		KDB_DEBUG_STATE("kdb 2", reason);
+		/* re-enable kernel trace */
+#if defined(CONFIG_INSTRUMENT_FUNC)
+		kdb_trc_continue();
+#endif
 		return 0;	/* Not one of mine */
 	}
 

@@ -1305,11 +1321,19 @@
 			}
 			if (!recover) {
 				kdb_printf("     Cannot recover, allowing event to proceed\n");
+				/* re-enable kernel trace */
+#if defined(CONFIG_INSTRUMENT_FUNC)
+				kdb_trc_continue();
+#endif
 				return(0);
 			}
 		}
 	} else if (!KDB_IS_RUNNING()) {
 		kdb_printf("kdb: CPU switch without kdb running, I'm confused\n");
+		/* re-enable kernel trace */
+#if defined(CONFIG_INSTRUMENT_FUNC)
+		kdb_trc_continue();
+#endif
 		return(0);
 	}
 

@@ -1434,6 +1458,10 @@
 
 	KDB_STATE_CLEAR(RECURSE);
 	KDB_DEBUG_STATE("kdb 17", reason);
+	/* re-enable kernel trace */
+#if defined(CONFIG_INSTRUMENT_FUNC)
+	kdb_trc_continue();
+#endif
 	return(result != 0);
 }
 

@@ -2711,6 +2739,9 @@
 #endif
 #if defined(CONFIG_MAGIC_SYSRQ)
 	kdb_register_repeat("sr", kdb_sr, "<key>",	"Magic SysRq key", 0, KDB_REPEAT_NONE);
+#endif
+#if defined(CONFIG_INSTRUMENT_FUNC)
+	kdb_trc_init();
 #endif
 }
 

diff -urN -X /home/jim/dontdiff linux.orig/kernel/ksyms.c linux/kernel/ksyms.c
@@ -571,3 +571,21 @@
 
 EXPORT_SYMBOL(tasklist_lock);
 EXPORT_SYMBOL(pidhash);
+
+#ifdef CONFIG_INSTRUMENT_FUNC
+extern void __br_lock_usage_bug(void);
+extern void __this_fixmap_does_not_exist(void);
+extern void __cyg_profile_func_enter(void *, void *);
+extern void __cyg_profile_func_exit(void *, void *);
+extern void __trace_user(void *, void *);
+extern void __trace_stop();
+extern void *trcp;
+
+EXPORT_SYMBOL(__br_lock_usage_bug);
+EXPORT_SYMBOL(__this_fixmap_does_not_exist);
+EXPORT_SYMBOL_NOVERS(__cyg_profile_func_enter);
+EXPORT_SYMBOL_NOVERS(__cyg_profile_func_exit);
+EXPORT_SYMBOL(__trace_user);
+EXPORT_SYMBOL(__trace_stop);
+EXPORT_SYMBOL(trcp);
+#endif