Changeset 12000 in vbox

Timestamp:

Sep 2, 2008 5:20:08 PM (16 years ago)

Author:

vboxsync

Message:

supdrv: Prototyped the fix for the PspGetSetContextInternal / RtlVirtualUnwind crashes on Vista64. (disabled)

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• Makefile.kmk (modified) (1 diff)
• SUPDrv.c (modified) (3 diffs)
• SUPDrvInternal.h (modified) (1 diff)
• win/SUPDrvA-win.asm (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/Makefile.kmk

@@ -216 +216 @@
  VBoxDrv_DEFS        += VBOX_WITH_IDT_PATCHING
 endif
+#VBoxDrv_DEFS         += SUPDRV_WITH_UNWIND_HACK - post 2.0, need to wrap more APIs and entry functions.
 VBoxDrv_SDKS          = W2K3DDK WINPSDKINCS
 VBoxDrv_INCS         := $(PATH_SUB_CURRENT)

trunk/src/VBox/HostDrivers/Support/SUPDrv.c

@@ -184 +184 @@
     { "RTSemEventMultiReset",                   (void *)RTSemEventMultiReset },
     { "RTSemEventMultiWait",                    (void *)RTSemEventMultiWait },
+#ifdef SUPDRV_WITH_UNWIND_HACK
+    { "RTSemEventMultiWaitNoResume",            (void *)supdrvNtWrapRTSemEventMultiWaitNoResume },
+#else
     { "RTSemEventMultiWaitNoResume",            (void *)RTSemEventMultiWaitNoResume },
+#endif
     { "RTSemEventMultiDestroy",                 (void *)RTSemEventMultiDestroy },
     { "RTSpinlockCreate",                       (void *)RTSpinlockCreate },
@@ -1116 +1120 @@
                 /* execute */
                 if (RT_LIKELY(pDevExt->pfnVMMR0EntryEx))
+#ifdef SUPDRV_WITH_UNWIND_HACK
+                    pReq->Hdr.rc = supdrvNtWrapVMMR0EntryEx((PFNRT)pDevExt->pfnVMMR0EntryEx, pReq->u.In.pVMR0, pReq->u.In.uOperation, NULL, pReq->u.In.u64Arg, pSession);
+#else
                     pReq->Hdr.rc = pDevExt->pfnVMMR0EntryEx(pReq->u.In.pVMR0, pReq->u.In.uOperation, NULL, pReq->u.In.u64Arg, pSession);
+#endif
                 else
                     pReq->Hdr.rc = VERR_WRONG_ORDER;
@@ -1130 +1138 @@
                 /* execute */
                 if (RT_LIKELY(pDevExt->pfnVMMR0EntryEx))
+#ifdef SUPDRV_WITH_UNWIND_HACK
+                    pReq->Hdr.rc = supdrvNtWrapVMMR0EntryEx((PFNRT)pDevExt->pfnVMMR0EntryEx, pReq->u.In.pVMR0, pReq->u.In.uOperation, pVMMReq, pReq->u.In.u64Arg, pSession);
+#else
                     pReq->Hdr.rc = pDevExt->pfnVMMR0EntryEx(pReq->u.In.pVMR0, pReq->u.In.uOperation, pVMMReq, pReq->u.In.u64Arg, pSession);
+#endif
                 else
                     pReq->Hdr.rc = VERR_WRONG_ORDER;

trunk/src/VBox/HostDrivers/Support/SUPDrvInternal.h

@@ -670 +670 @@
 bool VBOXCALL   supdrvOSGetForcedAsyncTscMode(PSUPDRVDEVEXT pDevExt);
 
+#ifdef SUPDRV_WITH_UNWIND_HACK
+DECLASM(int) supdrvNtWrapVMMR0EntryEx(PFNRT pfnVMMR0EntryEx, PVM pVM, unsigned uOperation, PSUPVMMR0REQHDR pReq, uint64_t u64Arg, PSUPDRVSESSION pSession);
+DECLASM(int) supdrvNtWrapRTSemEventMultiWaitNoResume(RTSEMEVENTMULTI EventMultiSem, unsigned cMillies);
+#endif
+
 
 /*******************************************************************************

trunk/src/VBox/HostDrivers/Support/win/SUPDrvA-win.asm

@@ -52 +52 @@
 ENDPROC SUPR0Printf
 
+
+%ifdef SUPDRV_WITH_UNWIND_HACK
+ %if 0 ; def RT_ARCH_AMD64
+;;
+; @cproto DECLASM(int) supdrvNtWrapVMMR0EntryEx(PFNRT pfnVMMR0EntryEx, PVM pVM, unsigned uOperation, PSUPVMMR0REQHDR pReq, uint64_t u64Arg, PSUPDRVSESSION pSession);
+;
+; @param    pfnVMMR0EntryEx     rcx
+; @param    pVM                 rdx
+; @param    uOperation          r8
+; @param    pReq                r9
+; @param    u64Arg              [rsp + 28h] / [rbp + 30h]
+; @param    pSession            [rsp + 30h] / [rbp + 38h]
+;
+BEGINPROC supdrvNtWrapVMMR0EntryEx
+[proc_frame supdrvNtWrapVMMR0EntryEx]
+        push    rbp
+        [pushreg rbp]
+        mov     rbp, rsp
+        [setframe rbp,0]
+        sub     rsp, 80h
+        [allocstack 0x80]
+        ;; @todo save more regs?
+[endprolog]
+
+        ;
+        ; Create a stack marker with the rbp. The marker is 32 byte big.
+        ; This is 32-byte aligned and 32 byte in size.
+        ;
+        lea     r10, [rbp - 30h]
+        and     r10, ~1fh               ; 32-byte align it.
+        mov     dword [r10    ], 0x20080901
+        mov     dword [r10 + 4], 0x20080902
+        mov     qword [r10 + 8], rbp
+        mov     dword [r10 +16], 0x20080903
+        mov     dword [r10 +20], 0x20080904
+        mov     qword [r10 +24], rbp
+
+        ;
+        ; Forward the call.
+        ;
+        mov     rax, rcx
+        mov     rcx, rdx
+        mov     rdx, r8
+        mov     r8, r9
+        mov     r9, [rbp + 30h]
+        mov     r11, [rbp + 38h]
+        mov     [rsp + 20h], r11
+        call    rax
+
+        ;
+        ; Trash the stack marker.
+        ;
+        lea     r10, [rbp - 30h]
+        and     r10, ~1fh               ; 32-byte align it.
+        mov     qword [r10    ], rax
+        mov     qword [r10 + 8], rax
+        mov     qword [r10 +16], rax
+        mov     qword [r10 +24], rax
+
+        leave
+        ret
+[endproc_frame supdrvNtWrapVMMR0EntryEx]
+ENDPROC   supdrvNtWrapVMMR0EntryEx
+
+
+extern RTSemEventMultiWaitNoResume
+
+;;
+; @cproto DECLASM(int) supdrvNtWrapRTSemEventMultiWaitNoResume(RTSEMEVENTMULTI EventMultiSem, unsigned cMillies);
+;
+; @param    EventMultiSem       rcx
+; @param    cMillies            rdx
+;
+BEGINPROC supdrvNtWrapRTSemEventMultiWaitNoResume
+[proc_frame supdrvNtWrapRTSemEventMultiWaitNoResume]
+        push    rbp
+        [pushreg rbp]
+        mov     rbp, rsp
+        [setframe rbp,0]
+        sub     rsp, 40h
+        [allocstack 0x40]
+        mov     [rbp - 8h], rdi
+        [savereg rdi, 0x38]
+        ;; @todo save more?
+        ;mov     [rbp - 10h], rsi
+        ;[savereg rsi, 0x30]
+[endprolog]
+
+        ;
+        ; Find the stack marker with the rbp of the entry frame.
+        ; Search a maximum of 4096 bytes.
+        ;
+        mov     rax, rbp
+        and     rax, ~1fh               ; 32-byte align it.
+        mov     r10, 1000h / 20h
+.again:
+        dec     r10
+        jz      .not_found
+        add     rax, 20h
+
+        cmp     dword [rax], 0x20080901
+        jne     .again
+        cmp     dword [rax + 4], 0x20080902
+        jne     .again
+        cmp     dword [rax + 16], 0x20080903
+        jne     .again
+        cmp     dword [rax + 20], 0x20080904
+        jne     .again
+        mov     r11, [rax + 8]
+        cmp     r11, [rax + 24]
+        jne     .again
+
+        ; found it, change rbp.
+        mov     rdi, rbp
+        mov     rbp, r11
+
+        ;
+        ; Forward the call.
+        ;
+.resume:
+        call    RTSemEventMultiWaitNoResume
+
+        ;
+        ; Restore rbp and any saved registers before returning.
+        ;
+        mov     rbp, rdi
+        ;mov     rsi, [rbp - 10h]
+        mov     rdi, [rbp - 8h]
+        leave
+        ret
+
+.not_found:
+        int3
+        mov     rdi, rbp
+        jmp     .resume
+[endproc_frame supdrvNtWrapRTSemEventMultiWaitNoResume]
+ENDPROC   supdrvNtWrapRTSemEventMultiWaitNoResume
+
+ %endif ; RT_ARCH_AMD64
+%endif ; SUPDRV_WITH_UNWIND_HACK
+