Changeset 91895 in vbox

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk

Files:

• include/VBox/vmm/pdmqueue.h (modified) (2 diffs)
• src/VBox/VMM/VMMAll/PDMAllQueue.cpp (modified) (4 diffs)
• src/VBox/VMM/VMMR3/PDM.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/PDMDevice.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR3/PDMQueue.cpp (modified) (9 diffs)
• src/VBox/VMM/include/PDMInternal.h (modified) (4 diffs)
• src/VBox/VMM/testcase/tstVMStruct.h (modified) (1 diff)

trunk/include/VBox/vmm/pdmqueue.h

@@ -59 +59 @@
     /** Pointer to the next item in the pending list - R0 Pointer. */
     R0PTRTYPE(PPDMQUEUEITEMCORE)    pNextR0;
-    /** Pointer to the next item in the pending list - RC Pointer. */
-    RCPTRTYPE(PPDMQUEUEITEMCORE)    pNextRC;
-#if HC_ARCH_BITS == 64
-    RTRCPTR                         Alignment0;
-#endif
 } PDMQUEUEITEMCORE;
 
@@ -156 +151 @@
 VMMDECL(void)                 PDMQueueInsert(PPDMQUEUE pQueue, PPDMQUEUEITEMCORE pItem);
 VMMDECL(void)                 PDMQueueInsertEx(PPDMQUEUE pQueue, PPDMQUEUEITEMCORE pItem, uint64_t NanoMaxDelay);
-VMMDECL(RCPTRTYPE(PPDMQUEUE)) PDMQueueRCPtr(PPDMQUEUE pQueue);
 VMMDECL(R0PTRTYPE(PPDMQUEUE)) PDMQueueR0Ptr(PPDMQUEUE pQueue);
 VMMDECL(bool)                 PDMQueueFlushIfNecessary(PPDMQUEUE pQueue);

trunk/src/VBox/VMM/VMMAll/PDMAllQueue.cpp

@@ -83 +83 @@
 /**
  * Queue an item.
+ *
  * The item must have been obtained using PDMQueueAlloc(). Once the item
  * have been passed to this function it must not be touched!
@@ -120 +121 @@
 /**
  * Queue an item.
+ *
  * The item must have been obtained using PDMQueueAlloc(). Once the item
  * have been passed to this function it must not be touched!
@@ -145 +147 @@
         Log2(("PDMQueueInsertEx: Setting VMCPU_FF_TO_R3\n"));
     }
-#endif
-}
-
-
-
-/**
- * Gets the RC pointer for the specified queue.
- *
- * @returns The RC address of the queue.
- * @returns NULL if pQueue is invalid.
- * @param   pQueue          The queue handle.
- */
-VMMDECL(RCPTRTYPE(PPDMQUEUE)) PDMQueueRCPtr(PPDMQUEUE pQueue)
-{
-    AssertPtr(pQueue);
-    Assert(pQueue->pVMR3 && pQueue->pVMRC);
-#ifdef IN_RC
-    return pQueue;
-#else
-    return MMHyperCCToRC(pQueue->CTX_SUFF(pVM), pQueue);
 #endif
 }
@@ -198 +180 @@
     AssertPtr(pQueue);
     if (   pQueue->pPendingR3 != NIL_RTR3PTR
-        || pQueue->pPendingR0 != NIL_RTR0PTR
-        || pQueue->pPendingRC != NIL_RTRCPTR)
+        || pQueue->pPendingR0 != NIL_RTR0PTR)
     {
         pdmQueueSetFF(pQueue);

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);

trunk/src/VBox/VMM/include/PDMInternal.h

@@ -1063 +1063 @@
     /** LIFO of pending items - R0. */
     R0PTRTYPE(PPDMQUEUEITEMCORE) volatile pPendingR0;
-    /** Pointer to the GC VM and indicator for GC enabled queue.
-     * If this is NULL, the queue cannot be used in GC.
-     */
-    PVMRC                           pVMRC;
-    /** LIFO of pending items - GC. */
-    RCPTRTYPE(PPDMQUEUEITEMCORE) volatile pPendingRC;
 
     /** Item size (bytes). */
@@ -1107 +1101 @@
         /** Pointer to the free item - HC Ptr. */
         R0PTRTYPE(PPDMQUEUEITEMCORE) volatile   pItemR0;
-        /** Pointer to the free item - GC Ptr. */
-        RCPTRTYPE(PPDMQUEUEITEMCORE) volatile   pItemRC;
-#if HC_ARCH_BITS == 64
-        RTRCPTR                                 Alignment0;
-#endif
     }                               aFreeItems[1];
 } PDMQUEUE;
@@ -1434 +1423 @@
     /** Queue in which devhlp tasks are queued for R3 execution - R0 Ptr. */
     R0PTRTYPE(PPDMQUEUE)            pDevHlpQueueR0;
-    /** Queue in which devhlp tasks are queued for R3 execution - RC Ptr. */
-    RCPTRTYPE(PPDMQUEUE)            pDevHlpQueueRC;
-    /** Pointer to the queue which should be manually flushed - RC Ptr.
-     * Only touched by EMT. */
-    RCPTRTYPE(struct PDMQUEUE *)    pQueueFlushRC;
     /** Pointer to the queue which should be manually flushed - R0 Ptr.
      * Only touched by EMT. */
@@ -1676 +1660 @@
 char       *pdmR3FileR3(const char *pszFile, bool fShared);
 int         pdmR3LoadR3U(PUVM pUVM, const char *pszFilename, const char *pszName);
-
-void        pdmR3QueueRelocate(PVM pVM, RTGCINTPTR offDelta);
 
 int         pdmR3TaskInit(PVM pVM);

trunk/src/VBox/VMM/testcase/tstVMStruct.h

@@ -609 +609 @@
     GEN_CHECK_OFF_DOT(PDMQUEUE, aFreeItems[0].pItemR3);
     GEN_CHECK_OFF_DOT(PDMQUEUE, aFreeItems[0].pItemR0);
-    GEN_CHECK_OFF_DOT(PDMQUEUE, aFreeItems[1].pItemRC);
     GEN_CHECK_SIZE(PDMDEVHLPTASK);
     GEN_CHECK_OFF(PDMDEVHLPTASK, Core);