Changeset 40d4c1d in mainline for kernel/arch/amd64/src

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/arch/amd64/src

Files:

• asm_utils.S (modified) (5 diffs)
• boot/boot.S (modified) (1 diff)
• debug/stacktrace.c (added)
• debug/stacktrace_asm.S (added)
• interrupt.c (modified) (2 diffs)
• mm/page.c (modified) (1 diff)
• smp/ap.S (modified) (1 diff)

kernel/arch/amd64/src/asm_utils.S

@@ -27 +27 @@
 #
 
-#define IREGISTER_SPACE 72 
+#define IREGISTER_SPACE 80
 
 #define IOFFSET_RAX     0x0
@@ -38 +38 @@
 #define IOFFSET_R10     0x38
 #define IOFFSET_R11     0x40
+#define IOFFSET_RBP     0x48
 
 #  Mask for interrupts 0 - 31 (bits 0 - 31) where 0 means that int has no error word
@@ -179 +180 @@
         movq %r10, IOFFSET_R10(%rsp)
         movq %r11, IOFFSET_R11(%rsp)
+        movq %rbp, IOFFSET_RBP(%rsp)
 .endm
 
@@ -191 +193 @@
         movq IOFFSET_R10(%rsp), %r10
         movq IOFFSET_R11(%rsp), %r11
+        movq IOFFSET_RBP(%rsp), %rbp
 .endm
 
@@ -235 +238 @@
         cld
 
+        # Stop stack traces here
+        xorq %rbp, %rbp
+
         movq $(\i), %rdi        # %rdi - first parameter
         movq %rsp, %rsi         # %rsi - pointer to istate

kernel/arch/amd64/src/boot/boot.S

@@ -174 +174 @@
         call arch_pre_main
         
+        # create the first stack frame
+        pushq $0
+        movq %rsp, %rbp
+
         call main_bsp
         

kernel/arch/amd64/src/interrupt.c

@@ -53 +53 @@
 #include <ddi/irq.h>
 #include <symtab.h>
+#include <stacktrace.h>
 
 /*
@@ -80 +81 @@
             istate->r10, istate->r11);
         printf("%%rsp=%#llx\n", &istate->stack[0]);
+        
+        stack_trace_istate(istate);
 }
 

kernel/arch/amd64/src/mm/page.c

@@ -203 +203 @@
 {
         if (last_frame + ALIGN_UP(size, PAGE_SIZE) > KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH))
-                panic("Unable to map physical memory %p (%d bytes).", physaddr, size)
+                panic("Unable to map physical memory %p (%d bytes).", physaddr,
+                    size);
         
         uintptr_t virtaddr = PA2KA(last_frame);

kernel/arch/amd64/src/smp/ap.S

@@ -99 +99 @@
 start64:
         movq (ctx), %rsp
+        pushq $0
+        movq %rsp, %rbp
         call main_ap - AP_BOOT_OFFSET + BOOT_OFFSET   # never returns