Changeset 73471 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Aug 3, 2018 12:11:07 PM (6 years ago)

Author:

vboxsync

Message:

VMM,DBGF: Improved unwinding of ring-0 assertion stacks, making the new unwind info stuff deal correctly with ring-0 pointers and such. bugref:3897

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• VMMR0JmpA-amd64.asm (modified) (6 diffs)
• VMMR0JmpA-x86.asm (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/VMMR0JmpA-amd64.asm

@@ -19 +19 @@
 ;* Header Files                                                                *
 ;*******************************************************************************
+%define RT_ASM_WITH_SEH64
 %include "VBox/asmdefs.mac"
 %include "VMMInternal.mac"
@@ -62 +63 @@
     ;
     push    rbp
+    SEH64_PUSH_xBP
     mov     rbp, rsp
+    SEH64_SET_FRAME_xBP 0
  %ifdef ASM_CALL64_MSC
     sub     rsp, 30h + STACK_FUZZ_SIZE  ; (10h is used by resume (??), 20h for callee spill area)
+    SEH64_ALLOCATE_STACK 30h + STACK_FUZZ_SIZE
+SEH64_END_PROLOGUE
     mov     r11, rdx                    ; pfn
     mov     rdx, rcx                    ; pJmpBuf;
  %else
     sub     rsp, 10h + STACK_FUZZ_SIZE  ; (10h is used by resume (??))
+    SEH64_ALLOCATE_STACK 10h + STACK_FUZZ_SIZE
+SEH64_END_PROLOGUE
     mov     r8, rdx                     ; pvUser1 (save it like MSC)
     mov     r9, rcx                     ; pvUser2 (save it like MSC)
@@ -302 +309 @@
     ;
     push    rbp
+    SEH64_PUSH_xBP
     mov     rbp, rsp
+    SEH64_SET_FRAME_xBP 0
     push    r15
+    SEH64_PUSH_GREG r15
     push    r14
+    SEH64_PUSH_GREG r14
     push    r13
+    SEH64_PUSH_GREG r13
     push    r12
+    SEH64_PUSH_GREG r12
 %ifdef ASM_CALL64_MSC
     push    rdi
+    SEH64_PUSH_GREG rdi
     push    rsi
+    SEH64_PUSH_GREG rsi
 %endif
     push    rbx
+    SEH64_PUSH_GREG rbx
     pushf
+    SEH64_ALLOCATE_STACK 8
 %ifdef RT_OS_WINDOWS
     sub     rsp, 0a0h
+    SEH64_ALLOCATE_STACK 0a0h
     movdqa  [rsp + 000h], xmm6
     movdqa  [rsp + 010h], xmm7
@@ -328 +346 @@
 %ifdef VBOX_STRICT
     push    RESUME_MAGIC
-%endif
+    SEH64_ALLOCATE_STACK 8
+%endif
+SEH64_END_PROLOGUE
 
     ;
@@ -373 +393 @@
 
  %endif ; !VMM_R0_SWITCH_STACK
+
+    ; Save a PC and return PC here to assist unwinding.
+.unwind_point:
+    lea     rcx, [.unwind_point wrt RIP]
+    mov     [xDX + VMMR0JMPBUF.SavedEipForUnwind], rcx
+    mov     rcx, [xDX + VMMR0JMPBUF.rbp]
+    lea     rcx, [rcx + 8]
+    mov     [xDX + VMMR0JMPBUF.UnwindRetPcLocation], rcx
+    mov     rcx, [rcx]
+    mov     [xDX + VMMR0JMPBUF.UnwindRetPcValue], rcx
 
     ; Save RSP & RBP to enable stack dumps
@@ -452 +482 @@
 ; @cproto VMMR0DECL(void) vmmR0LoggerWrapper(const char *pszFormat, ...)
 ;
-EXPORTEDNAME vmmR0LoggerWrapper
+BEGINPROC_EXPORTED vmmR0LoggerWrapper
+SEH64_END_PROLOGUE
     int3
     int3

trunk/src/VBox/VMM/VMMR0/VMMR0JmpA-x86.asm

@@ -334 +334 @@
 %endif ; !VMM_R0_SWITCH_STACK
 
+    ; Save a PC here to assist unwinding.
+.unwind_point:
+    mov     dword [xDX + VMMR0JMPBUF.SavedEipForUnwind], .unwind_point
+    mov     ecx, [xDX + VMMR0JMPBUF.ebp]
+    lea     ecx, [ecx + 4]
+    mov     [xDX + VMMR0JMPBUF.UnwindRetPcLocation], ecx
+
     ; Save ESP & EBP to enable stack dumps
     mov     ecx, ebp
@@ -353 +360 @@
     mov     ebp, [xDX + VMMR0JMPBUF.ebp]
     mov     ecx, [xDX + VMMR0JMPBUF.eip]
+    mov     [xDX + VMMR0JMPBUF.UnwindRetPcValue], ecx
     mov     esp, [xDX + VMMR0JMPBUF.esp]
     push    dword [xDX + VMMR0JMPBUF.eflags]