Changeset 4979

Timestamp:

09/22/07 02:04:09 (1 year ago)

Author:

vboxsync

Message:

New ring-0 assertion avoidance, now for all platforms.

Files:

• trunk/include/iprt/assert.h (modified) (3 diffs)
• trunk/src/VBox/VMM/VMM.cpp (modified) (4 diffs)
• trunk/src/VBox/VMM/VMMInternal.h (modified) (1 diff)
• trunk/src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (11 diffs)
• trunk/src/VBox/VMM/VMMR0/VMMR0A.asm (modified) (3 diffs)

trunk/include/iprt/assert.h

@@ -109 +109 @@
-#  define AssertCompileMemberAlignment(type, member, align) \
-    AssertCompile(!(RT_OFFSETOF(type, member) & ((align) - 1)))
- 
+
-#else
-# define AssertCompileMemberAlignment(type, member, align) \
-    AssertCompile(!(RT_OFFSETOF(type, member) & ((align) - 1)))
- 
+
-
-
@@ -491 +491 @@
-#ifdef __GNUC__
-# ifndef __L4ENV__
-do {
+  do { RTAssertDoBreakpoint();
-# else
-do {
+  do { RTAssertDoBreakpoint();
-# endif
-#elif defined(_MSC_VER)
-__debugbreak(
+do { RTAssertDoBreakpoint(); __debugbreak(); } while (0
-#else
-# error "Unknown compiler"
@@ -1174 +1174 @@
-
-/**
- 
- 
+
+
- * The generic implementation will return true.
- 
+
- * @returns true if the breakpoint should be hit, false if it should be ignored.
- * @remark  The RTDECL() makes this a bit difficult to override on windows. Sorry.
- */
-RTDECL(bool)    RTAssertDoBreakpoint(void);
-
-
-/** The last assert message, 1st part. */

trunk/src/VBox/VMM/VMM.cpp

@@ -641 +641 @@
-        if (VBOX_FAILURE(rc) || (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST))
-            break;
-break; // remove this when we do setjmp for all ring-0 stuff.
+/* Resume R0 */
-    }
-
@@ -647 +647 @@
-    {
-        LogRel(("R0 init failed, rc=%Vra\n", rc));
-rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST
+VBOX_SUCCESS(rc)
-            rc = VERR_INTERNAL_ERROR;
-    }
@@ -758 +758 @@
-        if (VBOX_FAILURE(rc) || (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST))
-            break;
-break; // remove this when we do setjmp for all ring-0 stuff.
+/* Resume R0 */
-    }
-    if (VBOX_FAILURE(rc) || (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST))
-    {
-        LogRel(("VMMR3Term: R0 term failed, rc=%Vra. (warning)\n", rc));
-rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST
+VBOX_SUCCESS(rc)
-            rc = VERR_INTERNAL_ERROR;
-    }
@@ -2257 +2257 @@
-        /*
-         * Signal a ring 0 hypervisor assertion.
+         * Cancel the longjmp operation that's in progress.
-         */
-        case VMMCALLHOST_VM_R0_HYPER_ASSERTION:
+            pVM->vmm.s.CallHostR0JmpBuf.fInRing3Call = false;
+#ifdef RT_ARCH_X86
+            pVM->vmm.s.CallHostR0JmpBuf.eip = 0;
+#else
+            pVM->vmm.s.CallHostR0JmpBuf.rip = 0;
+#endif
-            return VINF_EM_DBG_HYPER_ASSERTION;
-

trunk/src/VBox/VMM/VMMInternal.h

@@ -404 +404 @@
-
-/**
+ * Callback function for vmmR0CallHostSetJmpEx.
+ *
+ * @returns VBox status code.
+ * @param   pvUser      The user argument.
+ */
+typedef DECLCALLBACK(int) FNVMMR0SETJMPEX(void *pvUser);
+/** Pointer to FNVMMR0SETJMP(). */
+typedef FNVMMR0SETJMPEX *PFNVMMR0SETJMPEX;
+
+/**
+ * Same as vmmR0CallHostSetJmp except for the function signature.
+ *
+ * @returns VINF_SUCCESS on success or whatever is passed to vmmR0CallHostLongJmp.
+ * @param   pJmpBuf     The jmp_buf to set.
+ * @param   pfn         The function to be called when not resuming..
+ * @param   pvUser      The argument of that function.
+ */
+DECLASM(int)    vmmR0CallHostSetJmpEx(PVMMR0JMPBUF pJmpBuf, PFNVMMR0SETJMPEX pfn, void *pvUser);
+
+
+/**
- * Worker for VMMR0CallHost.
- * This will save the stack and registers.

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -54 +54 @@
-__END_DECLS
-
-
-/** @def DEBUG_NO_RING0_ASSERTIONS
- * Define this if you don't wish to BSOD on debug assertions in
- * the VMMR0.r0 code. If would of course be nice to have this
- * feature enabled by default of course, but it's not currently
- * safe when more than one VM is running or when using internal
- * networking. */
-#if defined(DEBUG_sandervl) /*|| defined(DEBUG_bird)*/
-# define DEBUG_NO_RING0_ASSERTIONS
-#endif
-#ifdef DEBUG_NO_RING0_ASSERTIONS
-static PVM g_pVMAssert = 0;
-#endif
-
-/*******************************************************************************
@@ -616 +603 @@
-            if (VBOX_SUCCESS(rc))
-            {
-#ifdef DEBUG_NO_RING0_ASSERTIONS
-                g_pVMAssert = pVM;
-#endif
-                rc = vmmR0CallHostSetJmp(&pVM->vmm.s.CallHostR0JmpBuf, HWACCMR0RunGuestCode, pVM); /* this may resume code. */
-#ifdef DEBUG_NO_RING0_ASSERTIONS
-                g_pVMAssert = NULL;
-#endif
-                int rc2 = HWACCMR0Disable(pVM);
-                AssertRC(rc2);
@@ -655 +636 @@
-
-/**
-
+
+
- *
- * @returns VBox status code.
@@ -664 +646 @@
- * @remarks Assume called with interrupts _enabled_.
- */
-VMMR0DECL(int) VMMR0EntryEx
+static int vmmR0EntryExWorker
-{
-    switch (enmOperation)
@@ -672 +654 @@
-         */
-        case VMMR0_DO_VMMR0_INIT:
-
-
-
-
+
-
-        /*
@@ -681 +660 @@
-         */
-        case VMMR0_DO_VMMR0_TERM:
-
-
-
-
+
-
-        /*
@@ -833 +809 @@
-
-
+/**
+ * Argument for vmmR0EntryExWrapper containing the argument s ofr VMMR0EntryEx.
+ */
+typedef struct VMMR0ENTRYEXARGS
+{
+    PVM                 pVM;
+    VMMR0OPERATION      enmOperation;
+    PSUPVMMR0REQHDR     pReq;
+    uint64_t            u64Arg;
+} VMMR0ENTRYEXARGS;
+/** Pointer to a vmmR0EntryExWrapper argument package. */
+typedef VMMR0ENTRYEXARGS *PVMMR0ENTRYEXARGS;
+
+/**
+ * This is just a longjmp wrapper function for VMMR0EntryEx calls.
+ *
+ * @returns VBox status code.
+ * @param   pvArgs      The argument package
+ */
+static int vmmR0EntryExWrapper(void *pvArgs)
+{
+    return vmmR0EntryExWorker(((PVMMR0ENTRYEXARGS)pvArgs)->pVM,
+                              ((PVMMR0ENTRYEXARGS)pvArgs)->enmOperation,
+                              ((PVMMR0ENTRYEXARGS)pvArgs)->pReq,
+                              ((PVMMR0ENTRYEXARGS)pvArgs)->u64Arg);
+}
+
+
+/**
+ * The Ring 0 entry point, called by the support library (SUP).
+ *
+ * @returns VBox status code.
+ * @param   pVM             The VM to operate on.
+ * @param   enmOperation    Which operation to execute.
+ * @param   pReq            This points to a SUPVMMR0REQHDR packet. Optional.
+ * @param   u64Arg          Some simple constant argument.
+ * @remarks Assume called with interrupts _enabled_.
+ */
+VMMR0DECL(int) VMMR0EntryEx(PVM pVM, VMMR0OPERATION enmOperation, PSUPVMMR0REQHDR pReq, uint64_t u64Arg)
+{
+    /*
+     * Requests that should only happen on the EMT thread will be
+     * wrapped in a setjmp so we can assert without causing trouble.
+     */
+    if (    VALID_PTR(pVM)
+        &&  pVM->pVMR0)
+    {
+        switch (enmOperation)
+        {
+            case VMMR0_DO_VMMR0_INIT:
+            case VMMR0_DO_VMMR0_TERM:
+            {
+                VMMR0ENTRYEXARGS Args;
+                Args.pVM = pVM;
+                Args.enmOperation = enmOperation;
+                Args.pReq = pReq;
+                Args.u64Arg = u64Arg;
+                return vmmR0CallHostSetJmpEx(&pVM->vmm.s.CallHostR0JmpBuf, vmmR0EntryExWrapper, &Args);
+            }
+
+            default:
+                break;
+        }
+    }
+    return vmmR0EntryExWorker(pVM, enmOperation, pReq, u64Arg);
+}
+
-
-
@@ -883 +926 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -906 +956 @@
-# define LOG_GROUP LOG_GROUP_EM
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-DECLEXPORT(void) RTCALL AssertMsg1(const char *pszExpr, unsigned uLine, const char *pszFile, const char *pszFunction)
-{
@@ -939 +987 @@
-    for (size_t i = 0; i < cbChars; i++)
-    {
-
+ /** @todo this isn't any release logging in ring-0 from what I can tell... */
-        SUPR0Printf("%c", pachChars[i]);
-    }
@@ -959 +1007 @@
-    }
-}
+
+

trunk/src/VBox/VMM/VMMR0/VMMR0A.asm

@@ -41 +41 @@
-; @param    pJmpBuf msc:rcx gcc:rdi x86:[esp+4]     Our jmp_buf.
-; @param    pfn     msc:rdx gcc:rsi x86:[esp+8]     The function to be called when not resuming.
-VM   
+vUser
-;
-BEGINPROC vmmR0CallHostSetJmp
+GLOBALNAME vmmR0CallHostSetJmpEx
-%ifdef RT_ARCH_X86
-    ;
@@ -135 +136 @@
- %else
-    sub     rsp, 10h
-VM
+vUser
-    mov     r11, rsi                    ; pfn
-    mov     rdx, rdi                    ; pJmpBuf
@@ -163 +164 @@
-    mov     [rbp - 8], rdx              ; Save it and fix stack alignment (16).
- %ifdef ASM_CALL64_MSC
-VM
+vUser
- %else
-VM
+vUser
- %endif
-    call    r11