Changeset 40d4c1d in mainline for kernel/generic

Timestamp:

2010-01-08T22:13:34Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

234e39e

Parents:

eb0bc90 (diff), 6d7f9bfe (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge the stack tracing branch.

The merge includes generic and amd64 and ia32 support for kernel stack traces.
The kernel will now print a stack trace for each killed task and also for
each bad trap and panic. The rest of the architectures have dummy support,
i.e. they compile and run, but the kernel cannot print the stack trace.

Location:

kernel/generic

Files:

• include/debug.h (modified) (2 diffs)
• include/interrupt.h (modified) (2 diffs)
• include/panic.h (modified) (1 diff)
• include/stacktrace.h (added)
• include/symtab.h (modified) (1 diff)
• src/debug/stacktrace.c (added)
• src/debug/symtab.c (modified) (4 diffs)

kernel/generic/include/debug.h

@@ -75 +75 @@
 #       define LOG(format, ...) \
                 printf("%s() at %s:%u: " format "\n", __func__, __FILE__, \
-                        __LINE__, ##__VA_ARGS__);
+                    __LINE__, ##__VA_ARGS__);
 #else
 #       define LOG(format, ...)
@@ -92 +92 @@
                 { \
                         printf("%s() at %s:%u: " #fnc "\n", __func__, __FILE__, \
-                        __LINE__); \
+                            __LINE__); \
                         fnc; \
                 }

kernel/generic/include/interrupt.h

@@ -42 +42 @@
 #include <arch.h>
 #include <ddi/irq.h>
+#include <stacktrace.h>
 
 typedef void (* iroutine)(int n, istate_t *istate);
@@ -49 +50 @@
         if (istate_from_uspace(istate)) { \
                 task_t *task = TASK; \
-                printf("Task %s (%" PRIu64 ") killed due to an exception at %p: ", task->name, task->taskid, istate_get_pc(istate)); \
-                printf(fmt "\n", ##__VA_ARGS__); \
+                printf("Task %s (%" PRIu64 ") killed due to an exception at " \
+                    "program counter %p.\n", task->name, task->taskid, istate_get_pc(istate)); \
+                stack_trace_istate(istate); \
+                printf("Kill message: " fmt "\n", ##__VA_ARGS__); \
                 task_kill(task->taskid); \
                 thread_exit(); \

kernel/generic/include/panic.h

@@ -36 +36 @@
 #define KERN_PANIC_H_
 
+#include <stacktrace.h>
+#include <print.h>
+
 #ifdef CONFIG_DEBUG
 #       define panic(format, ...) \
-                panic_printf("Kernel panic in %s() at %s:%u: " format "\n", \
-                __func__, __FILE__, __LINE__, ##__VA_ARGS__);
+                do { \
+                        printf("Kernel panic in %s() at %s:%u.\n", \
+                            __func__, __FILE__, __LINE__); \
+                        stack_trace(); \
+                        panic_printf("Panic message: " format "\n", \
+                            ##__VA_ARGS__);\
+                } while (0)
 #else
 #       define panic(format, ...) \

kernel/generic/include/symtab.h

@@ -45 +45 @@
 };
 
-extern int symtab_name_lookup(unative_t addr, char **name);
-extern char *symtab_fmt_name_lookup(unative_t addr);
-extern int symtab_addr_lookup(const char *name, uintptr_t *addr);
-extern void symtab_print_search(const char *name);
-extern int symtab_compl(char *input, size_t size);
+extern int symtab_name_lookup(uintptr_t, char **, uintptr_t *);
+extern char *symtab_fmt_name_lookup(uintptr_t);
+extern int symtab_addr_lookup(const char *, uintptr_t *);
+extern void symtab_print_search(const char *);
+extern int symtab_compl(char *, size_t);
 
 #ifdef CONFIG_SYMTAB

kernel/generic/src/debug/symtab.c

@@ -46 +46 @@
 /** Get name of a symbol that seems most likely to correspond to address.
  *
- * @param addr Address.
- * @param name Place to store pointer to the symbol name.
+ * @param addr          Address.
+ * @param name          Place to store pointer to the symbol name.
+ * @param offset        Place to store offset from the symbol address.
  *
  * @return Zero on success or negative error code, ENOENT if not found,
@@ -53 +54 @@
  *
  */
-int symtab_name_lookup(unative_t addr, char **name)
+int symtab_name_lookup(uintptr_t addr, char **name, uintptr_t *offset)
 {
 #ifdef CONFIG_SYMTAB
@@ -65 +66 @@
         if (addr >= uint64_t_le2host(symbol_table[i - 1].address_le)) {
                 *name = symbol_table[i - 1].symbol_name;
+                if (offset)
+                        *offset = addr -
+                            uint64_t_le2host(symbol_table[i - 1].address_le);
                 return EOK;
         }
@@ -88 +92 @@
  *
  */
-char *symtab_fmt_name_lookup(unative_t addr)
+char *symtab_fmt_name_lookup(uintptr_t addr)
 {
         char *name;
-        int rc = symtab_name_lookup(addr, &name);
+        int rc = symtab_name_lookup(addr, &name, NULL);
         
         switch (rc) {