Changeset 397 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Jan 28, 2007 2:34:06 AM (18 years ago)

Author:

vboxsync

Message:

Completed most of VBOX_WITHOUT_IDT_PATCHING. (hope I didn't break anything...) TODO: IST support on AMD64.

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDRVIOC.h (modified) (1 diff)
• SUPDRVShared.c (modified) (1 diff)
• SUPLib.cpp (modified) (1 diff)
• darwin/SUPDrv-darwin.cpp (modified) (1 diff)
• testcase/tstInt.cpp (modified) (1 diff)

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

@@ -132 +132 @@
 #define SUP_IOCTL_SET_VM_FOR_FAST   SUP_CTL_CODE(20)
 
-/** Fast path IOCtl: VMMR0_DO_RUN_GC */
+/** Fast path IOCtl: VMMR0_DO_RAW_RUN */
 #define SUP_IOCTL_FAST_DO_RAW_RUN   SUP_CTL_CODE_FAST(64)
-/** Fast path IOCtl: VMMR0_HWACC_RUN_GUEST */
+/** Fast path IOCtl: VMMR0_DO_HWACC_RUN */
 #define SUP_IOCTL_FAST_DO_HWACC_RUN SUP_CTL_CODE_FAST(65)
+/** Just a NOP call for profiling the latency of a fast ioctl call to VMMR0. */
+#define SUP_IOCTL_FAST_DO_NOP       SUP_CTL_CODE_FAST(66)
 
 

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

@@ -559 +559 @@
 int  VBOXCALL   supdrvIOCtlFast(unsigned uIOCtl, PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION pSession)
 {
-    if (    !pSession->pVM
-        ||  pDevExt->pfnVMMR0Entry)
-        return VERR_INTERNAL_ERROR;
-    switch (uIOCtl)
-    {
-        case SUP_IOCTL_FAST_DO_RAW_RUN:
-            return pDevExt->pfnVMMR0Entry(pSession->pVM, VMMR0_DO_RUN_GC, NULL);
-        case SUP_IOCTL_FAST_DO_HWACC_RUN:
-            return pDevExt->pfnVMMR0Entry(pSession->pVM, VMMR0_HWACC_RUN_GUEST, NULL);
-        default:
-            return VERR_INTERNAL_ERROR;
-    }
+    /*
+     * Disable interrupts before invoking VMMR0Entry() because it ASSUMES
+     * that interrupts are disabled. (We check the two prereqs after doing
+     * this only to allow the compiler to optimize things better.)
+     */
+    RTCCUINTREG     uFlags = ASMGetFlags();
+    ASMIntDisable();
+
+    int rc;
+    if (RT_LIKELY(pSession->pVM && pDevExt->pfnVMMR0Entry))
+    {
+        switch (uIOCtl)
+        {
+            case SUP_IOCTL_FAST_DO_RAW_RUN:
+                rc = pDevExt->pfnVMMR0Entry(pSession->pVM, VMMR0_DO_RAW_RUN, NULL);
+                break;
+            case SUP_IOCTL_FAST_DO_HWACC_RUN:
+                rc = pDevExt->pfnVMMR0Entry(pSession->pVM, VMMR0_DO_HWACC_RUN, NULL);
+                break;
+            case SUP_IOCTL_FAST_DO_NOP:
+                rc = pDevExt->pfnVMMR0Entry(pSession->pVM, VMMR0_DO_NOP, NULL);
+                break;
+            default:
+                rc = VERR_INTERNAL_ERROR;
+                break;
+        }
+    }
+    else
+        rc = VERR_INTERNAL_ERROR;
+
+    ASMSetFlags(uFlags);
+    return rc;
 }
 #endif /* VBOX_WITHOUT_IDT_PATCHING */

trunk/src/VBox/HostDrivers/Support/SUPLib.cpp

@@ -381 +381 @@
 #ifndef VBOX_WITHOUT_IDT_PATCHING
     return g_pfnCallVMMR0(pVM, uOperation, pvArg);
+
 #else
-    if (uOperation == VMMR0_DO_RUN_GC)
+    if (uOperation == VMMR0_DO_RAW_RUN)
     {
         Assert(!pvArg);
         return suplibOSIOCtlFast(SUP_IOCTL_FAST_DO_RAW_RUN);
     }
-    if (uOperation == VMMR0_HWACC_RUN_GUEST)
+    if (uOperation == VMMR0_DO_HWACC_RUN)
     {
         Assert(!pvArg);
         return suplibOSIOCtlFast(SUP_IOCTL_FAST_DO_HWACC_RUN);
+    }
+    if (uOperation == VMMR0_DO_NOP)
+    {
+        Assert(!pvArg);
+        return suplibOSIOCtlFast(SUP_IOCTL_FAST_DO_NOP);
     }
     return SUPCallVMMR0Ex(pVM, uOperation, pvArg, pvArg ? sizeof(pvArg) : 0);

trunk/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp

@@ -430 +430 @@
      * the session and iCmd, and only returns a VBox status code.
      */
-    if (    iCmd == 1
-        ||  iCmd == 1)
+    if (    iCmd == SUP_IOCTL_FAST_DO_RAW_RUN
+        ||  iCmd == SUP_IOCTL_FAST_DO_HWACC_RUN
+        ||  iCmd == SUP_IOCTL_FAST_DO_NOP)
         return supdrvIOCtlFast(iCmd, &g_DevExt, pSession);
     return VBoxSupDrvIOCtlSlow(pSession, iCmd, pData, pProcess);

trunk/src/VBox/HostDrivers/Support/testcase/tstInt.cpp

@@ -89 +89 @@
             for (int i = cIterations; i > 0; i--)
             {
-                rc = SUPCallVMMR0(&vm, 0xdeadbeef, NULL);
-                //RTPrintf("tstInt: SUPCallVMMR0 -> rc=%Vrc i=%d\n", rc, i);
+                rc = SUPCallVMMR0(&vm, VMMR0_DO_NOP, NULL);
+                if (rc != VINF_SUCCESS)
+                {
+                    RTPrintf("tstInt: SUPCallVMMR0 -> rc=%Vrc i=%d Expected VINF_SUCCESS!\n", rc, i);
+                    break;s
+                }
             }
             RTPrintf("tstInt: Performed SUPCallVMMR0 %d times (rc=%Vrc)\n", cIterations, rc);