Changeset 19252 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Apr 29, 2009 9:56:19 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

46655

Message:

SUPCallVMMR0(Ex) arguments must include the VCPU id.
Note: support driver major version change!

Location:

trunk/src/VBox/HostDrivers/Support

Files:

• SUPDrv.c (modified) (3 diffs)
• SUPDrvIOC.h (modified) (2 diffs)
• SUPDrvInternal.h (modified) (1 diff)
• SUPLib.cpp (modified) (5 diffs)
• testcase/tstInt.cpp (modified) (2 diffs)
• win/SUPDrvA-win.asm (modified) (2 diffs)

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

@@ -149 +149 @@
 
 #ifdef RT_WITH_W64_UNWIND_HACK
-DECLASM(int)    supdrvNtWrapVMMR0EntryEx(PFNRT pfnVMMR0EntryEx, PVM pVM, unsigned uOperation, PSUPVMMR0REQHDR pReq, uint64_t u64Arg, PSUPDRVSESSION pSession);
+DECLASM(int)    supdrvNtWrapVMMR0EntryEx(PFNRT pfnVMMR0EntryEx, PVM pVM, unsigned idCpu, unsigned uOperation, PSUPVMMR0REQHDR pReq, uint64_t u64Arg, PSUPDRVSESSION pSession);
 DECLASM(int)    supdrvNtWrapVMMR0EntryFast(PFNRT pfnVMMR0EntryFast, PVM pVM, unsigned idCpu, unsigned uOperation);
 DECLASM(void)   supdrvNtWrapObjDestructor(PFNRT pfnDestruction, void *pvObj, void *pvUser1, void *pvUser2);
@@ -1328 +1328 @@
                 if (RT_LIKELY(pDevExt->pfnVMMR0EntryEx))
 #ifdef RT_WITH_W64_UNWIND_HACK
-                    pReq->Hdr.rc = supdrvNtWrapVMMR0EntryEx((PFNRT)pDevExt->pfnVMMR0EntryEx, pReq->u.In.pVMR0, pReq->u.In.uOperation, NULL, pReq->u.In.u64Arg, pSession);
+                    pReq->Hdr.rc = supdrvNtWrapVMMR0EntryEx((PFNRT)pDevExt->pfnVMMR0EntryEx, pReq->u.In.pVMR0, pReq->u.In.idCpu, 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);
+                    pReq->Hdr.rc = pDevExt->pfnVMMR0EntryEx(pReq->u.In.pVMR0, pReq->u.In.idCpu, pReq->u.In.uOperation, NULL, pReq->u.In.u64Arg, pSession);
 #endif
                 else
@@ -1346 +1346 @@
                 if (RT_LIKELY(pDevExt->pfnVMMR0EntryEx))
 #ifdef RT_WITH_W64_UNWIND_HACK
-                    pReq->Hdr.rc = supdrvNtWrapVMMR0EntryEx((PFNRT)pDevExt->pfnVMMR0EntryEx, pReq->u.In.pVMR0, pReq->u.In.uOperation, pVMMReq, pReq->u.In.u64Arg, pSession);
+                    pReq->Hdr.rc = supdrvNtWrapVMMR0EntryEx((PFNRT)pDevExt->pfnVMMR0EntryEx, pReq->u.In.pVMR0, pReq->u.In.idCpu, 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);
+                    pReq->Hdr.rc = pDevExt->pfnVMMR0EntryEx(pReq->u.In.pVMR0, pReq->u.In.idCpu, pReq->u.In.uOperation, pVMMReq, pReq->u.In.u64Arg, pSession);
 #endif
                 else

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

@@ -188 +188 @@
  *            and renaming the related IOCtls too.
  */
-#define SUPDRV_IOC_VERSION                              0x000a0009
+#define SUPDRV_IOC_VERSION                              0x000b0000
 
 /** SUP_IOCTL_COOKIE. */
@@ -527 +527 @@
             /** The VM handle. */
             PVMR0           pVMR0;
+            /** VCPU id. */
+            uint32_t        idCpu;
             /** Which operation to execute. */
             uint32_t        uOperation;
-#if R0_ARCH_BITS == 64
-            /** Alignment. */
-            uint32_t        u32Reserved;
-#endif
             /** Argument to use when no request packet is supplied. */
             uint64_t        u64Arg;

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

@@ -570 +570 @@
     DECLR0CALLBACKMEMBER(void,      pfnVMMR0EntryFast, (PVM pVM, unsigned idCpu, unsigned uOperation));
     /** VMMR0EntryEx() pointer. */
-    DECLR0CALLBACKMEMBER(int,       pfnVMMR0EntryEx, (PVM pVM, unsigned uOperation, PSUPVMMR0REQHDR pReq, uint64_t u64Arg, PSUPDRVSESSION pSession));
+    DECLR0CALLBACKMEMBER(int,       pfnVMMR0EntryEx, (PVM pVM, unsigned idCpu, unsigned uOperation, PSUPVMMR0REQHDR pReq, uint64_t u64Arg, PSUPDRVSESSION pSession));
 
     /** Linked list of loaded code. */

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

@@ -582 +582 @@
 
 
-SUPR3DECL(int) SUPCallVMMR0Ex(PVMR0 pVMR0, unsigned uOperation, uint64_t u64Arg, PSUPVMMR0REQHDR pReqHdr)
+SUPR3DECL(int) SUPCallVMMR0Ex(PVMR0 pVMR0, unsigned idCpu, unsigned uOperation, uint64_t u64Arg, PSUPVMMR0REQHDR pReqHdr)
 {
     /*
@@ -609 +609 @@
         Req.Hdr.rc = VERR_INTERNAL_ERROR;
         Req.u.In.pVMR0 = pVMR0;
+        Req.u.In.idCpu = idCpu;
         Req.u.In.uOperation = uOperation;
         Req.u.In.u64Arg = u64Arg;
@@ -629 +630 @@
         pReq->Hdr.rc = VERR_INTERNAL_ERROR;
         pReq->u.In.pVMR0 = pVMR0;
+        pReq->u.In.idCpu = idCpu;
         pReq->u.In.uOperation = uOperation;
         pReq->u.In.u64Arg = u64Arg;
@@ -643 +645 @@
 
 
-SUPR3DECL(int) SUPCallVMMR0(PVMR0 pVMR0, unsigned uOperation, void *pvArg)
+SUPR3DECL(int) SUPCallVMMR0(PVMR0 pVMR0, unsigned idCpu, unsigned uOperation, void *pvArg)
 {
     /*
@@ -653 +655 @@
                     ("%#x\n", uOperation),
                     VERR_INTERNAL_ERROR);
-    return SUPCallVMMR0Ex(pVMR0, uOperation, (uintptr_t)pvArg, NULL);
+    return SUPCallVMMR0Ex(pVMR0, idCpu, uOperation, (uintptr_t)pvArg, NULL);
 }
 

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

@@ -124 +124 @@
                     for (i = cIterations; i > 0; i--)
                     {
-                        rc = SUPCallVMMR0(pVMR0, VMMR0_DO_SLOW_NOP, NULL);
+                        rc = SUPCallVMMR0(pVMR0, 0, VMMR0_DO_SLOW_NOP, NULL);
                         if (rc != VINF_SUCCESS)
                         {
@@ -174 +174 @@
                         {
                             uint64_t OneStartTick = ASMReadTSC();
-                            rc = SUPCallVMMR0Ex(pVMR0, VMMR0_DO_SLOW_NOP, 0, NULL);
+                            rc = SUPCallVMMR0Ex(pVMR0, 0, VMMR0_DO_SLOW_NOP, 0, NULL);
                             uint64_t Ticks = ASMReadTSC() - OneStartTick;
                             if (Ticks < MinTicks)

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

@@ -170 +170 @@
 
 ;;
-; @cproto DECLASM(int) supdrvNtWrapVMMR0EntryEx(PFNRT pfnVMMR0EntryEx, PVM pVM, unsigned uOperation, PSUPVMMR0REQHDR pReq, uint64_t u64Arg, PSUPDRVSESSION pSession);
+; @cproto DECLASM(int) supdrvNtWrapVMMR0EntryEx(PFNRT pfnVMMR0EntryEx, PVM pVM, unsigned idCpu, 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]
+; @param    idCpu               r8
+; @param    uOperation          r9
+; @param    pReq                [rsp + 28h] / [rbp + 30h]
+; @param    u64Arg              [rsp + 30h] / [rbp + 38h]
+; @param    pSession            [rsp + 38h] / [rbp + 40h]
 ;
 BEGINPROC supdrvNtWrapVMMR0EntryEx
@@ -190 +191 @@
         mov     r11, [rbp + 38h]
         mov     [rsp + 20h], r11
+        mov     r11, [rbp + 40h]
+        mov     [rsp + 28h], r11
         call    rax