Changeset 10724 in vbox for trunk

Timestamp:

Jul 17, 2008 1:08:56 PM (16 years ago)

Author:

vboxsync

Message:

Bumped the SUPDRV_IOC_VERSION major as the changes to the fast path on NT isn't backwards compatible. Made VMMR0EntryFast return void.

Location:

trunk

Files:

• include/VBox/vmm.h (modified) (2 diffs)
• src/VBox/HostDrivers/Support/SUPDrv.c (modified) (2 diffs)
• src/VBox/HostDrivers/Support/SUPDrvIOC.h (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPDrvInternal.h (modified) (1 diff)
• src/VBox/HostDrivers/Support/SUPLib.cpp (modified) (1 diff)
• src/VBox/HostDrivers/Support/testcase/tstInt.cpp (modified) (11 diffs)
• src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (6 diffs)

trunk/include/VBox/vmm.h

@@ -370 +370 @@
     /** Official NOP that we use for profiling. */
     VMMR0_DO_NOP = SUP_VMMR0_DO_NOP,
+    /** Official slow iocl NOP that we use for profiling. */
+    VMMR0_DO_SLOW_NOP,
 
     /** Ask the GVMM to create a new VM. */
@@ -493 +495 @@
  * @remarks Assume called with interrupts _enabled_.
  */
-VMMR0DECL(int) VMMR0EntryFast(PVM pVM, VMMR0OPERATION enmOperation);
+VMMR0DECL(void) VMMR0EntryFast(PVM pVM, VMMR0OPERATION enmOperation);
 
 /**

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

@@ -717 +717 @@
 int VBOXCALL supdrvIOCtlFast(uintptr_t uIOCtl, PSUPDRVDEVEXT pDevExt, PSUPDRVSESSION pSession)
 {
-    int rc;
-
     /*
      * We check the two prereqs after doing this only to allow the compiler to optimize things better.
@@ -727 +725 @@
         {
             case SUP_IOCTL_FAST_DO_RAW_RUN:
-                rc = pDevExt->pfnVMMR0EntryFast(pSession->pVM, SUP_VMMR0_DO_RAW_RUN);
+                pDevExt->pfnVMMR0EntryFast(pSession->pVM, SUP_VMMR0_DO_RAW_RUN);
                 break;
             case SUP_IOCTL_FAST_DO_HWACC_RUN:
-                rc = pDevExt->pfnVMMR0EntryFast(pSession->pVM, SUP_VMMR0_DO_HWACC_RUN);
+                pDevExt->pfnVMMR0EntryFast(pSession->pVM, SUP_VMMR0_DO_HWACC_RUN);
                 break;
             case SUP_IOCTL_FAST_DO_NOP:
-                rc = pDevExt->pfnVMMR0EntryFast(pSession->pVM, SUP_VMMR0_DO_NOP);
+                pDevExt->pfnVMMR0EntryFast(pSession->pVM, SUP_VMMR0_DO_NOP);
                 break;
             default:
-                rc = VERR_INTERNAL_ERROR;
-                break;
-        }
-    }
-    else
-        rc = VERR_INTERNAL_ERROR;
-
-    return rc;
+                return VERR_INTERNAL_ERROR;
+        }
+        return VINF_SUCCESS;
+    }
+    return VERR_INTERNAL_ERROR;
 }
 

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

@@ -182 +182 @@
  * The upper 16-bit is the major version, the the lower the minor version.
  * When incompatible changes are made, the upper major number has to be changed. */
-#define SUPDRV_IOC_VERSION                              0x00070005
+#define SUPDRV_IOC_VERSION                              0x00080000
 
 /** SUP_IOCTL_COOKIE. */

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

@@ -615 +615 @@
     DECLR0CALLBACKMEMBER(int, pfnVMMR0EntryInt, (PVM pVM, unsigned uOperation, void *pvArg));
     /** VMMR0EntryFast() pointer. */
-    DECLR0CALLBACKMEMBER(int, pfnVMMR0EntryFast, (PVM pVM, unsigned uOperation));
+    DECLR0CALLBACKMEMBER(void, pfnVMMR0EntryFast, (PVM pVM, unsigned uOperation));
     /** VMMR0EntryEx() pointer. */
     DECLR0CALLBACKMEMBER(int, pfnVMMR0EntryEx, (PVM pVM, unsigned uOperation, PSUPVMMR0REQHDR pReq, uint64_t u64Arg));

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

@@ -212 +212 @@
         strcpy(CookieReq.u.In.szMagic, SUPCOOKIE_MAGIC);
         CookieReq.u.In.u32ReqVersion = SUPDRV_IOC_VERSION;
-        const uint32_t MinVersion = (SUPDRV_IOC_VERSION & 0xffff0000) == 0x00070000
-                                  ? 0x00070005 /* need new exports */
-                                  : SUPDRV_IOC_VERSION & 0xffff0000;
+        const uint32_t MinVersion = /*(SUPDRV_IOC_VERSION & 0xffff0000) == 0x000y0000
+                                  ? 0x000y000x
+                                  : */SUPDRV_IOC_VERSION & 0xffff0000;
         CookieReq.u.In.u32MinVersion = MinVersion;
         rc = suplibOsIOCtl(SUP_IOCTL_COOKIE, &CookieReq, SUP_IOCTL_COOKIE_SIZE);

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

@@ -111 +111 @@
                 pVM->paVMPagesR3 = paPages;
                 pVM->pSession = pSession;
+                pVM->enmVMState = VMSTATE_CREATED;
 
                 rc = SUPSetVMForFastIOCtl(pVMR0);
@@ -121 +122 @@
                     for (i = cIterations; i > 0; i--)
                     {
-                        rc = SUPCallVMMR0(pVMR0, VMMR0_DO_NOP, NULL);
+                        rc = SUPCallVMMR0(pVMR0, VMMR0_DO_SLOW_NOP, NULL);
                         if (rc != VINF_SUCCESS)
                         {
@@ -132 +133 @@
 
                     /*
-                     * Profile it.
+                     * The fast path.
                      */
-                    if (!rc)
+                    if (rc == VINF_SUCCESS)
                     {
                         RTTimeNanoTS();
@@ -143 +144 @@
                         {
                             uint64_t OneStartTick = ASMReadTSC();
-                            rc = SUPCallVMMR0(pVMR0, VMMR0_DO_NOP, NULL);
+                            rc = SUPCallVMMR0Fast(pVMR0, VMMR0_DO_NOP);
                             uint64_t Ticks = ASMReadTSC() - OneStartTick;
                             if (Ticks < MinTicks)
@@ -150 +151 @@
                             if (RT_UNLIKELY(rc != VINF_SUCCESS))
                             {
-                                RTPrintf("tstInt: SUPCallVMMR0 -> rc=%Vrc i=%d Expected VINF_SUCCESS!\n", rc, i);
+                                RTPrintf("tstInt: SUPCallVMMR0Fast -> rc=%Vrc i=%d Expected VINF_SUCCESS!\n", rc, i);
                                 rcRet++;
                                 break;
@@ -158 +159 @@
                         uint64_t NanoSecs = RTTimeNanoTS() - StartTS;
 
-                        RTPrintf("tstInt: SUPCallVMMR0     - %d iterations in %llu ns / %llu ticks. %llu ns / %#llu ticks per iteration. Min %llu ticks.\n",
+                        RTPrintf("tstInt: SUPCallVMMR0Fast - %d iterations in %llu ns / %llu ticks. %llu ns / %#llu ticks per iteration. Min %llu ticks.\n",
                                  i, NanoSecs, Ticks, NanoSecs / i, Ticks / i, MinTicks);
 
@@ -172 +173 @@
                         {
                             uint64_t OneStartTick = ASMReadTSC();
-                            rc = SUPCallVMMR0Fast(pVMR0, VMMR0_DO_NOP);
+                            rc = SUPCallVMMR0(pVMR0, VMMR0_DO_NOP, NULL);
                             uint64_t Ticks = ASMReadTSC() - OneStartTick;
                             if (Ticks < MinTicks)
@@ -179 +180 @@
                             if (RT_UNLIKELY(rc != VINF_SUCCESS))
                             {
-                                RTPrintf("tstInt: SUPCallVMMR0 -> rc=%Vrc i=%d Expected VINF_SUCCESS!\n", rc, i);
+                                RTPrintf("tstInt: SUPCallVMMR0/idt -> rc=%Vrc i=%d Expected VINF_SUCCESS!\n", rc, i);
                                 rcRet++;
                                 break;
@@ -187 +188 @@
                         NanoSecs = RTTimeNanoTS() - StartTS;
 
-                        RTPrintf("tstInt: SUPCallVMMR0Fast - %d iterations in %llu ns / %llu ticks. %llu ns / %#llu ticks per iteration. Min %llu ticks.\n",
+                        RTPrintf("tstInt: SUPCallVMMR0/idt - %d iterations in %llu ns / %llu ticks. %llu ns / %#llu ticks per iteration. Min %llu ticks.\n",
                                  i, NanoSecs, Ticks, NanoSecs / i, Ticks / i, MinTicks);
 #endif /* VBOX_WITH_IDT_PATCHING */
@@ -201 +202 @@
                         {
                             uint64_t OneStartTick = ASMReadTSC();
-                            rc = SUPCallVMMR0Ex(pVMR0, VMMR0_DO_NOP, 0, NULL);
+                            rc = SUPCallVMMR0Ex(pVMR0, VMMR0_DO_SLOW_NOP, 0, NULL);
                             uint64_t Ticks = ASMReadTSC() - OneStartTick;
                             if (Ticks < MinTicks)
@@ -208 +209 @@
                             if (RT_UNLIKELY(rc != VINF_SUCCESS))
                             {
-                                RTPrintf("tstInt: SUPCallVMMR0 -> rc=%Vrc i=%d Expected VINF_SUCCESS!\n", rc, i);
+                                RTPrintf("tstInt: SUPCallVMMR0Ex -> rc=%Vrc i=%d Expected VINF_SUCCESS!\n", rc, i);
                                 rcRet++;
                                 break;

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

@@ -287 +287 @@
      * Deal with the two high-speed IOCtl that takes it's arguments from
      * the session and iCmd, and only returns a VBox status code.
+     *
+     * Note: The previous method of returning the rc prior to IDC version
+     *       7.4 has been abandond, we're no longer compatible with that
+     *       interface.
      */
     ULONG ulCmd = pStack->Parameters.DeviceIoControl.IoControlCode;
@@ -293 +297 @@
         ||  ulCmd == SUP_IOCTL_FAST_DO_NOP)
     {
-        KIRQL oldIrql;
-        int   rc;
-
-        /* We're here with METHOD_NEITHER, which means no parameter validation has been performed. Do not use input
-         * or write to output parameters!
-         */
-
         /* Raise the IRQL to DISPATCH_LEVEl to prevent Windows from rescheduling us to another CPU/core. */
         Assert(KeGetCurrentIrql() <= DISPATCH_LEVEL);
+        KIRQL oldIrql;
         KeRaiseIrql(DISPATCH_LEVEL, &oldIrql);
-        rc = supdrvIOCtlFast(ulCmd, pDevExt, pSession);
+        int rc = supdrvIOCtlFast(ulCmd, pDevExt, pSession);
         KeLowerIrql(oldIrql);
 
         /* Complete the I/O request. */
-        NTSTATUS rcNt = pIrp->IoStatus.Status = STATUS_SUCCESS;
+        NTSTATUS rcNt = pIrp->IoStatus.Status = RT_SUCCESS(rc) ? STATUS_SUCCESS : STATUS_INVALID_PARAMETER;
         IoCompleteRequest(pIrp, IO_NO_INCREMENT);
         return rcNt;

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

@@ -568 +568 @@
  * The Ring 0 entry point, called by the fast-ioctl path.
  *
- * @returns VBox status code.
  * @param   pVM             The VM to operate on.
+ *                          The return code is stored in pVM->vmm.s.iLastGCRc.
  * @param   enmOperation    Which operation to execute.
  * @remarks Assume called with interrupts _enabled_.
  */
-VMMR0DECL(int) VMMR0EntryFast(PVM pVM, VMMR0OPERATION enmOperation)
+VMMR0DECL(void) VMMR0EntryFast(PVM pVM, VMMR0OPERATION enmOperation)
 {
     switch (enmOperation)
@@ -601 +601 @@
                 vmmR0RecordRC(pVM, rc);
 #endif
-                return rc;
             }
-
-            Assert(!pVM->vmm.s.fSwitcherDisabled);
-            pVM->vmm.s.iLastGCRc = VERR_NOT_SUPPORTED;
-            break;
-       }
+            else
+            {
+                Assert(!pVM->vmm.s.fSwitcherDisabled);
+                pVM->vmm.s.iLastGCRc = VERR_NOT_SUPPORTED;
+            }
+            break;
+        }
 
         /*
@@ -639 +640 @@
 #endif
             /* No special action required for external interrupts, just return. */
-            return rc;
+            break;
         }
 
@@ -647 +648 @@
         case VMMR0_DO_NOP:
             pVM->vmm.s.iLastGCRc = VINF_SUCCESS;
-            return VINF_SUCCESS;
+            break;
 
         /*
@@ -657 +658 @@
             break;
     }
-    /* Error case, but the error was written to pVM->vmm.s.iLastGCRc */
-    return VINF_SUCCESS;
 }
 
@@ -910 +909 @@
          */
         case VMMR0_DO_NOP:
+        case VMMR0_DO_SLOW_NOP:
             return VINF_SUCCESS;