Changeset 13765 in vbox

Timestamp:

Nov 3, 2008 5:20:11 PM (16 years ago)

Author:

vboxsync

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

38741

Message:

VM request updates for dispatching packets to individual CPU threads.

Location:

trunk

Files:

• include/VBox/vmapi.h (modified) (1 diff)
• src/VBox/VMM/DBGF.cpp (modified) (1 diff)
• src/VBox/VMM/EM.cpp (modified) (1 diff)
• src/VBox/VMM/VMEmt.cpp (modified) (3 diffs)
• src/VBox/VMM/VMReq.cpp (modified) (5 diffs)

trunk/include/VBox/vmapi.h

@@ -424 +424 @@
 VMMR3DECL(int)  VMR3ReqQueue(PVMREQ pReq, unsigned cMillies);
 VMMR3DECL(int)  VMR3ReqWait(PVMREQ pReq, unsigned cMillies);
-VMMR3DECL(int)  VMR3ReqProcessU(PUVM pUVM);
+VMMR3DECL(int)  VMR3ReqProcessU(PUVM pUVM, VMREQDEST enmDest);
 VMMR3DECL(void) VMR3NotifyFF(PVM pVM, bool fNotifiedREM);
 VMMR3DECL(void) VMR3NotifyFFU(PUVM pUVM, bool fNotifiedREM);

trunk/src/VBox/VMM/DBGF.cpp

@@ -611 +611 @@
             {
                 LogFlow(("dbgfR3VMMWait: Processes requests...\n"));
-                rc = VMR3ReqProcessU(pVM->pUVM);
+                rc = VMR3ReqProcessU(pVM->pUVM, VMREQDEST_ALL);
                 LogFlow(("dbgfR3VMMWait: VMR3ReqProcess -> %Vrc rcRet=%Vrc\n", rc, rcRet));
                 if (rc >= VINF_EM_FIRST && rc <= VINF_EM_LAST)

trunk/src/VBox/VMM/EM.cpp

@@ -3116 +3116 @@
         if (VM_FF_ISSET(pVM, VM_FF_REQUEST))
         {
-            rc2 = VMR3ReqProcessU(pVM->pUVM);
+            rc2 = VMR3ReqProcessU(pVM->pUVM, VMREQDEST_ALL);
             if (rc2 == VINF_EM_OFF || rc2 == VINF_EM_TERMINATE)
             {

trunk/src/VBox/VMM/VMEmt.cpp

@@ -97 +97 @@
                  * Service execute in EMT request.
                  */
-                rc = VMR3ReqProcessU(pUVM);
+                rc = VMR3ReqProcessU(pUVM, VMREQDEST_ALL);
                 Log(("vmR3EmulationThread: Req rc=%Vrc, VM state %d -> %d\n", rc, enmBefore, pUVM->pVM ? pUVM->pVM->enmVMState : VMSTATE_CREATING));
             }
@@ -132 +132 @@
                  * Service execute in EMT request.
                  */
-                rc = VMR3ReqProcessU(pUVM);
+                rc = VMR3ReqProcessU(pUVM, VMREQDEST_ALL);
                 Log(("vmR3EmulationThread: Req rc=%Vrc, VM state %d -> %d\n", rc, enmBefore, pVM->enmVMState));
             }
@@ -252 +252 @@
              * Service execute in EMT request.
              */
-            rc = VMR3ReqProcessU(pUVM);
+            rc = VMR3ReqProcessU(pUVM, VMREQDEST_ALL);
             Log(("vmR3EmulationThread: Req rc=%Vrc, VM state %d -> %d\n", rc, enmBefore, pVM->enmVMState));
         }

trunk/src/VBox/VMM/VMReq.cpp

@@ -401 +401 @@
                     VERR_VM_REQUEST_INVALID_TYPE);
     AssertPtrReturn(ppReq, VERR_INVALID_POINTER);
+    AssertMsgReturn(enmDest == VMREQDEST_ALL || (unsigned)enmDest < pUVM->pVM->cCPUs, ("Invalid destination %d (max=%d)\n", enmDest, pUVM->pVM->cCPUs), VERR_INVALID_PARAMETER);
 
     /*
@@ -619 +620 @@
     int rc = VINF_SUCCESS;
     PUVM pUVM = ((VMREQ volatile *)pReq)->pUVM;                 /* volatile paranoia */
-    if (pUVM->vm.s.NativeThreadEMT != RTThreadNativeSelf())
+    if (    pReq->enmDest == VMREQDEST_ALL
+        &&  pUVM->vm.s.NativeThreadEMT != RTThreadNativeSelf())
     {
         unsigned fFlags = ((VMREQ volatile *)pReq)->fFlags;     /* volatile paranoia */
@@ -639 +641 @@
         if (pUVM->pVM)
             VM_FF_SET(pUVM->pVM, VM_FF_REQUEST);
+        VMR3NotifyFFU(pUVM, false);
+
+        /*
+         * Wait and return.
+         */
+        if (!(fFlags & VMREQFLAGS_NO_WAIT))
+            rc = VMR3ReqWait(pReq, cMillies);
+        LogFlow(("VMR3ReqQueue: returns %Vrc\n", rc));
+    }
+    else
+    if (    pReq->enmDest != VMREQDEST_ALL
+        &&  pUVM->aCpu[pReq->enmDest].vm.s.NativeThreadEMT != RTThreadNativeSelf())
+    {
+        RTCPUID  idTarget = (RTCPUID)pReq->enmDest;
+        unsigned fFlags = ((VMREQ volatile *)pReq)->fFlags;     /* volatile paranoia */
+
+        /*
+         * Insert it.
+         */
+        pReq->enmState = VMREQSTATE_QUEUED;
+        PVMREQ pNext;
+        do
+        {
+            pNext = pUVM->aCpu[idTarget].vm.s.pReqs;
+            pReq->pNext = pNext;
+        } while (!ASMAtomicCmpXchgPtr((void * volatile *)&pUVM->aCpu[idTarget].vm.s.pReqs, (void *)pReq, (void *)pNext));
+
+        /*
+         * Notify EMT.
+         */
+        if (pUVM->pVM)
+            VMCPU_FF_SET(pUVM->pVM, VM_FF_REQUEST, idTarget);
+        /* @todo: VMR3NotifyFFU*/
+        AssertFailed();
         VMR3NotifyFFU(pUVM, false);
 
@@ -735 +771 @@
  *
  * @param   pUVM            Pointer to the user mode VM structure.
- */
-VMMR3DECL(int) VMR3ReqProcessU(PUVM pUVM)
-{
-    LogFlow(("VMR3ReqProcessU: (enmVMState=%d)\n", pUVM->pVM ? pUVM->pVM->enmVMState : VMSTATE_CREATING));
+ * @param   enmDest         Destination of the request packet (global or per VCPU).
+ */
+VMMR3DECL(int) VMR3ReqProcessU(PUVM pUVM, VMREQDEST enmDest)
+{
+    LogFlow(("VMR3ReqProcessU: (enmVMState=%d) enmDest=%d\n", pUVM->pVM ? pUVM->pVM->enmVMState : VMSTATE_CREATING, enmDest));
 
     /*
@@ -749 +786 @@
     while (rc <= VINF_SUCCESS)
     {
+        void *volatile *ppReqs;
+
         /*
          * Get pending requests.
          */
-        if (RT_LIKELY(pUVM->pVM))
-            VM_FF_CLEAR(pUVM->pVM, VM_FF_REQUEST);
-        PVMREQ pReqs = (PVMREQ)ASMAtomicXchgPtr((void * volatile *)&pUVM->vm.s.pReqs, NULL);
+        if (enmDest == VMREQDEST_ALL)
+        {
+            ppReqs = (void * volatile *)&pUVM->vm.s.pReqs;
+            if (RT_LIKELY(pUVM->pVM))
+                VM_FF_CLEAR(pUVM->pVM, VM_FF_REQUEST);
+        }
+        else
+        {
+            ppReqs = (void * volatile *)&pUVM->aCpu[enmDest].vm.s.pReqs;
+            if (RT_LIKELY(pUVM->pVM))
+                VMCPU_FF_CLEAR(pUVM->pVM, enmDest, VM_FF_REQUEST);
+        }
+
+        PVMREQ pReqs = (PVMREQ)ASMAtomicXchgPtr(ppReqs, NULL);
         if (!pReqs)
             break;