Changeset 6274 in vbox for trunk

Timestamp:

Jan 8, 2008 12:56:33 PM (17 years ago)

Author:

vboxsync

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

27120

Message:

pReq may be invalid after queuing it (VMREQFLAGS_NO_WAIT), so make local copies of the fFlags and pVM members. This should fix the sporadic assertions we've been seeing.

File:

• trunk/src/VBox/VMM/VMReq.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMReq.cpp

@@ -526 +526 @@
     }
 
+    /*
+     * Are we the EMT or not?
+     * Also, store pVM (and fFlags) locally since pReq may be invalid after queuing it.
+     */
     int rc = VINF_SUCCESS;
-    if (pReq->pVM->NativeThreadEMT != RTThreadNativeSelf())
-    {
+    PVM pVM = ((VMREQ volatile *)pReq)->pVM;                    /* volatile paranoia */
+    if (pVM->NativeThreadEMT != RTThreadNativeSelf())
+    {
+        unsigned fFlags = ((VMREQ volatile *)pReq)->fFlags;     /* volatile paranoia */
+
         /*
          * Insert it.
@@ -536 +543 @@
         do
         {
-            pNext = pReq->pVM->vm.s.pReqs;
+            pNext = pVM->vm.s.pReqs;
             pReq->pNext = pNext;
-        } while (!ASMAtomicCmpXchgPtr((void * volatile *)&pReq->pVM->vm.s.pReqs, (void *)pReq, (void *)pNext));
+        } while (!ASMAtomicCmpXchgPtr((void * volatile *)&pVM->vm.s.pReqs, (void *)pReq, (void *)pNext));
 
         /*
          * Notify EMT.
          */
-        VM_FF_SET(pReq->pVM, VM_FF_REQUEST);
-        VMR3NotifyFF(pReq->pVM, false);
+        VM_FF_SET(pVM, VM_FF_REQUEST);
+        VMR3NotifyFF(pVM, false);
 
         /*
          * Wait and return.
          */
-        if (!(pReq->fFlags & VMREQFLAGS_NO_WAIT))
+        if (!(fFlags & VMREQFLAGS_NO_WAIT))
             rc = VMR3ReqWait(pReq, cMillies);
         LogFlow(("VMR3ReqQueue: returns %Vrc\n", rc));
@@ -559 +566 @@
          */
         pReq->enmState = VMREQSTATE_QUEUED;
-        rc = vmR3ReqProcessOne(pReq->pVM, pReq);
+        rc = vmR3ReqProcessOne(pVM, pReq);
         LogFlow(("VMR3ReqQueue: returns %Vrc (processed)\n", rc));
     }