Changeset 91895 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Oct 20, 2021 1:30:17 PM (3 years ago)

Author:

vboxsync

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

147699

Message:

VMM: Removed raw-mode stuff from PDMQueue. bugref:9517

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• PDM.cpp (modified) (1 diff)
• PDMDevice.cpp (modified) (1 diff)
• PDMQueue.cpp (modified) (9 diffs)

trunk/src/VBox/VMM/VMMR3/PDM.cpp

@@ -579 +579 @@
 
     /*
-     * Queues.
-     */
-    pdmR3QueueRelocate(pVM, offDelta);
-    pVM->pdm.s.pDevHlpQueueRC = PDMQueueRCPtr(pVM->pdm.s.pDevHlpQueueR3);
-
-    /*
      * The registered PIC.
      */

trunk/src/VBox/VMM/VMMR3/PDMDevice.cpp

@@ -135 +135 @@
     AssertRCReturn(rc, rc);
     pVM->pdm.s.pDevHlpQueueR0 = PDMQueueR0Ptr(pVM->pdm.s.pDevHlpQueueR3);
-    pVM->pdm.s.pDevHlpQueueRC = PDMQueueRCPtr(pVM->pdm.s.pDevHlpQueueR3);
-
 
     /*

trunk/src/VBox/VMM/VMMR3/PDMQueue.cpp

@@ -86 +86 @@
     pQueue->pVMR3 = pVM;
     pQueue->pVMR0 = fRZEnabled ? pVM->pVMR0ForCall : NIL_RTR0PTR;
-    pQueue->pVMRC = fRZEnabled ? pVM->pVMRC : NIL_RTRCPTR;
     pQueue->pszName = pszName;
     pQueue->cMilliesInterval = cMilliesInterval;
@@ -102 +101 @@
         pQueue->aFreeItems[i].pItemR3 = pItem;
         if (fRZEnabled)
-        {
             pQueue->aFreeItems[i].pItemR0 = MMHyperR3ToR0(pVM, pItem);
-            pQueue->aFreeItems[i].pItemRC = MMHyperR3ToRC(pVM, pItem);
-        }
     }
 
@@ -455 +451 @@
         pQueue->hTimer = NIL_TMTIMERHANDLE;
     }
-    if (pQueue->pVMRC)
-    {
-        pQueue->pVMRC = NIL_RTRCPTR;
+    if (pQueue->pVMR0)
+    {
         pQueue->pVMR0 = NIL_RTR0PTR;
         MMHyperFree(pVM, pQueue);
@@ -569 +564 @@
     pdmUnlock(pVM);
     return VINF_SUCCESS;
-}
-
-
-/**
- * Relocate the queues.
- *
- * @param   pVM             The cross context VM structure.
- * @param   offDelta        The relocation delta.
- */
-void pdmR3QueueRelocate(PVM pVM, RTGCINTPTR offDelta)
-{
-    /*
-     * Process the queues.
-     */
-    PUVM      pUVM       = pVM->pUVM;
-    PPDMQUEUE pQueueNext = pUVM->pdm.s.pQueuesTimer;
-    PPDMQUEUE pQueue     = pUVM->pdm.s.pQueuesForced;
-    do
-    {
-        while (pQueue)
-        {
-            if (pQueue->pVMRC)
-            {
-                pQueue->pVMRC = pVM->pVMRC;
-
-                /* Pending RC items. */
-                if (pQueue->pPendingRC)
-                {
-                    pQueue->pPendingRC += offDelta;
-                    PPDMQUEUEITEMCORE pCur = (PPDMQUEUEITEMCORE)MMHyperRCToR3(pVM, pQueue->pPendingRC);
-                    while (pCur->pNextRC)
-                    {
-                        pCur->pNextRC += offDelta;
-                        pCur = (PPDMQUEUEITEMCORE)MMHyperRCToR3(pVM, pCur->pNextRC);
-                    }
-                }
-
-                /* The free items. */
-                uint32_t i = pQueue->iFreeTail;
-                while (i != pQueue->iFreeHead)
-                {
-                    pQueue->aFreeItems[i].pItemRC = MMHyperR3ToRC(pVM, pQueue->aFreeItems[i].pItemR3);
-                    i = (i + 1) % (pQueue->cItems + PDMQUEUE_FREE_SLACK);
-                }
-            }
-
-            /* next queue */
-            pQueue = pQueue->pNext;
-        }
-
-        /* next queue list */
-        pQueue = pQueueNext;
-        pQueueNext = NULL;
-    } while (pQueue);
 }
 
@@ -654 +595 @@
         for (PPDMQUEUE pCur = pVM->pUVM->pdm.s.pQueuesForced; pCur; pCur = pCur->pNext)
             if (    pCur->pPendingR3
-                ||  pCur->pPendingR0
-                ||  pCur->pPendingRC)
+                ||  pCur->pPendingR0)
                 pdmR3QueueFlush(pCur);
 
@@ -684 +624 @@
      */
     PPDMQUEUEITEMCORE pItems   = ASMAtomicXchgPtrT(&pQueue->pPendingR3, NULL, PPDMQUEUEITEMCORE);
-    RTRCPTR           pItemsRC = ASMAtomicXchgRCPtr(&pQueue->pPendingRC, NIL_RTRCPTR);
     RTR0PTR           pItemsR0 = ASMAtomicXchgR0Ptr(&pQueue->pPendingR0, NIL_RTR0PTR);
 
     AssertMsgReturn(   pItemsR0
-                    || pItemsRC
                     || pItems,
                     ("Someone is racing us? This shouldn't happen!\n"),
@@ -702 +640 @@
         PPDMQUEUEITEMCORE pInsert = pCur;
         pCur = pCur->pNextR3;
-        pInsert->pNextR3 = pItems;
-        pItems = pInsert;
-    }
-
-    /*
-     * Do the same for any pending RC items.
-     */
-    while (pItemsRC)
-    {
-        PPDMQUEUEITEMCORE pInsert = (PPDMQUEUEITEMCORE)MMHyperRCToR3(pQueue->pVMR3, pItemsRC);
-        pItemsRC = pInsert->pNextRC;
-        pInsert->pNextRC = NIL_RTRCPTR;
         pInsert->pNextR3 = pItems;
         pItems = pInsert;
@@ -845 +771 @@
 
     pQueue->aFreeItems[i].pItemR3 = pItem;
-    if (pQueue->pVMRC)
-    {
-        pQueue->aFreeItems[i].pItemRC = MMHyperR3ToRC(pQueue->pVMR3, pItem);
+    if (pQueue->pVMR0)
         pQueue->aFreeItems[i].pItemR0 = MMHyperR3ToR0(pQueue->pVMR3, pItem);
-    }
 
     if (!ASMAtomicCmpXchgU32(&pQueue->iFreeHead, iNext, i))
@@ -866 +789 @@
 
     if (   pQueue->pPendingR3
-        || pQueue->pPendingR0
-        || pQueue->pPendingRC)
+        || pQueue->pPendingR0)
         pdmR3QueueFlush(pQueue);
     int rc = TMTimerSetMillies(pVM, hTimer, pQueue->cMilliesInterval);