Changeset 28258 in vbox for trunk/src/VBox

Timestamp:

Apr 13, 2010 2:51:16 PM (15 years ago)

Author:

vboxsync

Message:

PDM critsects for drivers. Fixed critsect cleanup in failure path. Started on new transmit locking scheme (required for intnet buffer serialization).

Location:

trunk/src/VBox

Files:

• Devices/Input/DrvKeyboardQueue.cpp (modified) (1 diff)
• Devices/Input/DrvMouseQueue.cpp (modified) (1 diff)
• Devices/Network/DevINIP.cpp (modified) (4 diffs)
• Devices/Network/DrvIntNet.cpp (modified) (16 diffs)
• Devices/Network/DrvNAT.cpp (modified) (26 diffs)
• Devices/Network/DrvNetSniffer.cpp (modified) (16 diffs)
• Devices/Network/DrvTAP.cpp (modified) (1 diff)
• Devices/PC/DrvACPI.cpp (modified) (1 diff)
• Devices/Parallel/DrvHostParallel.cpp (modified) (1 diff)
• Devices/Serial/DrvHostSerial.cpp (modified) (3 diffs)
• Devices/Storage/DrvSCSI.cpp (modified) (1 diff)
• Devices/Storage/DrvSCSIHost.cpp (modified) (1 diff)
• Devices/Storage/DrvVD.cpp (modified) (1 diff)
• VMM/PDM.cpp (modified) (3 diffs)
• VMM/PDMCritSect.cpp (modified) (19 diffs)
• VMM/PDMDriver.cpp (modified) (11 diffs)
• VMM/PDMInternal.h (modified) (6 diffs)
• VMM/VM.cpp (modified) (1 diff)
• VMM/testcase/tstVMStructRC.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Input/DrvKeyboardQueue.cpp

@@ -307 +307 @@
     }
 
-    rc = PDMDrvHlpPDMQueueCreate(pDrvIns, sizeof(DRVKBDQUEUEITEM), cItems, cMilliesInterval, drvKbdQueueConsumer, "Keyboard", &pDrv->pQueue);
+    rc = PDMDrvHlpQueueCreate(pDrvIns, sizeof(DRVKBDQUEUEITEM), cItems, cMilliesInterval, drvKbdQueueConsumer, "Keyboard", &pDrv->pQueue);
     if (RT_FAILURE(rc))
     {

trunk/src/VBox/Devices/Input/DrvMouseQueue.cpp

@@ -344 +344 @@
     }
 
-    rc = PDMDrvHlpPDMQueueCreate(pDrvIns, sizeof(DRVMOUSEQUEUEITEM), cItems, cMilliesInterval, drvMouseQueueConsumer, "Mouse", &pDrv->pQueue);
+    rc = PDMDrvHlpQueueCreate(pDrvIns, sizeof(DRVMOUSEQUEUEITEM), cItems, cMilliesInterval, drvMouseQueueConsumer, "Mouse", &pDrv->pQueue);
     if (RT_FAILURE(rc))
     {

trunk/src/VBox/Devices/Network/DevINIP.cpp

@@ -305 +305 @@
  * @param   cMillies    Number of milliseconds to wait. 0 means return immediately.
  */
-static DECLCALLBACK(int) devINIPWaitInputAvail(PPDMINETWORKDOWN pInterface, RTMSINTERVAL cMillies)
+static DECLCALLBACK(int) devINIPNetworkDown_WaitInputAvail(PPDMINETWORKDOWN pInterface, RTMSINTERVAL cMillies)
 {
     LogFlow(("%s: pInterface=%p\n", __FUNCTION__, pInterface));
@@ -320 +320 @@
  * @param   cb          Frame size.
  */
-static DECLCALLBACK(int) devINIPInput(PPDMINETWORKDOWN pInterface,
-                                      const void *pvBuf, size_t cb)
+static DECLCALLBACK(int) devINIPNetworkDown_Input(PPDMINETWORKDOWN pInterface,
+                                                  const void *pvBuf, size_t cb)
 {
     const uint8_t *pbBuf = (const uint8_t *)pvBuf;
@@ -385 +385 @@
 
 /**
+ * @interface_method_impl{PDMINETWORKDOWN,pfnDoTransmitWork}
+ */
+static DECLCALLBACK(void) devINIPNetworkDown_DoTransmitWork(PPDMINETWORKDOWN pInterface)
+{
+    NOREF(pInterface);
+}
+
+
+/**
  * Signals the end of lwIP TCPIP initialization.
  *
@@ -483 +492 @@
     pThis->IBase.pfnQueryInterface          = devINIPQueryInterface;
     /* INetworkDown */
-    pThis->INetworkDown.pfnWaitReceiveAvail = devINIPWaitInputAvail;
-    pThis->INetworkDown.pfnReceive          = devINIPInput;
+    pThis->INetworkDown.pfnWaitReceiveAvail = devINIPNetworkDown_WaitInputAvail;
+    pThis->INetworkDown.pfnReceive          = devINIPNetworkDown_Input;
+    pThis->INetworkDown.pfnDoTransmitWork   = devINIPNetworkDown_DoTransmitWork;
 
     /*

trunk/src/VBox/Devices/Network/DrvIntNet.cpp

@@ +1 @@
+#define VBOX_WITH_R0_AND_RC_DRIVERS
 /* $Id$ */
 /** @file
@@ -111 +112 @@
     /** Base interface for ring-0. */
     PDMIBASERC                      IBaseRC;
+
+    /** The transmit lock. */
+    PDMCRITSECT                     XmitLock;
 
 #ifdef LOG_ENABLED
@@ -190 +194 @@
 }
 
+
+
 /* -=-=-=-=- PDMINETWORKUP -=-=-=-=- */
+
+/**
+ * @interface_method_impl{PDMINETWORKUP,pfnBeginXmit}
+ */
+static DECLCALLBACK(int) drvR3IntNetUp_BeginXmit(PPDMINETWORKUP pInterface)
+{
+    PDRVINTNET pThis = RT_FROM_MEMBER(pInterface, DRVINTNET, INetworkUpR3);
+    int rc = PDMCritSectTryEnter(&pThis->XmitLock);
+    if (RT_UNLIKELY(rc == VERR_SEM_BUSY))
+        rc = VERR_TRY_AGAIN;
+    return rc;
+}
+
 
 /**
@@ -201 +220 @@
     int         rc    = VINF_SUCCESS;
     Assert(cbMin < UINT32_MAX / 2);
+//    Assert(PDMCritSectIsOwner(&pThis->XmitLock));
 
     /*
@@ -277 +297 @@
     Assert(   pHdr->u16Type == INTNETHDR_TYPE_FRAME
            || pHdr->u16Type == INTNETHDR_TYPE_GSO);
+//    Assert(PDMCritSectIsOwner(&pThis->XmitLock));
 
     /** @todo LATER: try unalloc the frame. */
@@ -298 +319 @@
     Assert(pSgBuf->fFlags == (PDMSCATTERGATHER_FLAGS_MAGIC | PDMSCATTERGATHER_FLAGS_OWNER_1));
     Assert(pSgBuf->cbUsed <= pSgBuf->cbAvailable);
+//    Assert(PDMCritSectIsOwner(&pThis->XmitLock));
 
     if (pSgBuf->pvUser)
@@ -319 +341 @@
     STAM_PROFILE_STOP(&pThis->StatTransmit, a);
     return VINF_SUCCESS;
+}
+
+
+/**
+ * @interface_method_impl{PDMINETWORKUP,pfnEndXmit}
+ */
+static DECLCALLBACK(void) drvR3IntNetUp_EndXmit(PPDMINETWORKUP pInterface)
+{
+    PDRVINTNET pThis = RT_FROM_MEMBER(pInterface, DRVINTNET, INetworkUpR3);
+    PDMCritSectLeave(&pThis->XmitLock);
 }
 
@@ -762 +794 @@
         Frame.Hdr.DstMac.au16[1] = 0xffff;
         Frame.Hdr.DstMac.au16[2] = 0xffff;
-        Frame.Hdr.EtherType      = RT_H2BE_U16(0x801e);
+        Frame.Hdr.EtherType      = RT_H2BE_U16_C(0x801e);
         int rc = pThis->pIAboveConfigR3->pfnGetMac(pThis->pIAboveConfigR3, &Frame.Hdr.SrcMac);
         if (RT_SUCCESS(rc))
@@ -805 +837 @@
         drvR3IntNetSetActive(pThis, true /* fActive */);
     }
+}
+
+
+/**
+ * @interface_method_impl{PDMDRVREG,pfnRelocate}
+ */
+static DECLCALLBACK(void) drvR3IntNetRelocate(PPDMDRVINS pDrvIns, RTGCINTPTR offDelta)
+{
+    /* nothing to do here yet */
 }
 
@@ -858 +899 @@
 
     /*
-     * Destroy the semaphore and S/G cache.
+     * Destroy the semaphore, S/G cache and xmit lock.
      */
     if (hEvtSuspended != NIL_RTSEMEVENT)
@@ -865 +906 @@
     RTMemCacheDestroy(pThis->hSgCache);
     pThis->hSgCache = NIL_RTMEMCACHE;
+
+    if (PDMCritSectIsInitialized(&pThis->XmitLock))
+        PDMR3CritSectDelete(&pThis->XmitLock);
 
     if (pThis->pBufR3)
@@ -917 +961 @@
     pThis->IBaseRC.pfnQueryInterface                = drvR3IntNetIBaseRC_QueryInterface;
     /* INetworkUp */
+    pThis->INetworkUpR3.pfnBeginXmit                = drvR3IntNetUp_BeginXmit;
     pThis->INetworkUpR3.pfnAllocBuf                 = drvR3IntNetUp_AllocBuf;
     pThis->INetworkUpR3.pfnFreeBuf                  = drvR3IntNetUp_FreeBuf;
     pThis->INetworkUpR3.pfnSendBuf                  = drvR3IntNetUp_SendBuf;
+    pThis->INetworkUpR3.pfnEndXmit                  = drvR3IntNetUp_EndXmit;
     pThis->INetworkUpR3.pfnSetPromiscuousMode       = drvR3IntNetUp_SetPromiscuousMode;
     pThis->INetworkUpR3.pfnNotifyLinkChanged        = drvR3IntNetUp_NotifyLinkChanged;
@@ -1186 +1232 @@
 
     /*
-     * Create the event semaphore and S/G cache.
+     * Create the event semaphore, S/G cache and xmit critsect.
      */
     rc = RTSemEventCreate(&pThis->hEvtSuspended);
@@ -1194 +1240 @@
     if (RT_FAILURE(rc))
         return rc;
+    rc = PDMDrvHlpCritSectInit(pDrvIns, &pThis->XmitLock, RT_SRC_POS, "IntNetXmit");
+    if (RT_FAILURE(rc))
+        return rc;
+
 
     /*
@@ -1276 +1326 @@
     "IntNet",
     /* szRCMod */
-    "VBoxDD",
+    "VBoxDDRC",
     /* szR0Mod */
-    "VBoxDD",
+    "VBoxDDR0",
     /* pszDescription */
     "Internal Networking Transport Driver",
@@ -1298 +1348 @@
     drvR3IntNetDestruct,
     /* pfnRelocate */
-    NULL,
+    drvR3IntNetRelocate,
     /* pfnIOCtl */
     NULL,

trunk/src/VBox/Devices/Network/DrvNAT.cpp

@@ -151 +151 @@
     /** tftp server name to provide in the DHCP server response. */
     char                   *pszNextServer;
-    /* polling thread */
+    /** Polling thread. */
     PPDMTHREAD              pSlirpThread;
     /** Queue for NAT-thread-external events. */
@@ -193 +193 @@
 
     /** makes access to device func RecvAvail and Recv atomical. */
-    RTCRITSECT              csDevAccess;
-    volatile uint32_t       cUrgPkt;
-    volatile uint32_t       cPkt;
+    RTCRITSECT              DevAccessLock;
+    /** Number of in-flight urgent packets. */
+    volatile uint32_t       cUrgPkts;
+    /** Number of in-flight regular packets. */
+    volatile uint32_t       cPkts;
+
+    /** Transmit lock taken by BeginXmit and released by EndXmit. */
+    RTCRITSECT              XmitLock;
 } DRVNAT;
 AssertCompileMemberAlignment(DRVNAT, StatNATRecvWakeups, 8);
@@ -235 +240 @@
     {
         RTReqProcess(pThis->pRecvReqQueue, 0);
-        if (ASMAtomicReadU32(&pThis->cPkt) == 0)
+        if (ASMAtomicReadU32(&pThis->cPkts) == 0)
             RTSemEventWait(pThis->EventRecv, RT_INDEFINITE_WAIT);
     }
@@ -262 +267 @@
     {
         RTReqProcess(pThis->pUrgRecvReqQueue, 0);
-        if (ASMAtomicReadU32(&pThis->cUrgPkt) == 0)
+        if (ASMAtomicReadU32(&pThis->cUrgPkts) == 0)
         {
             int rc = RTSemEventWait(pThis->EventUrgRecv, RT_INDEFINITE_WAIT);
@@ -282 +287 @@
 static DECLCALLBACK(void) drvNATUrgRecvWorker(PDRVNAT pThis, uint8_t *pu8Buf, int cb, struct mbuf *m)
 {
-    int rc = RTCritSectEnter(&pThis->csDevAccess);
+    int rc = RTCritSectEnter(&pThis->DevAccessLock);
     AssertRC(rc);
     rc = pThis->pIAboveNet->pfnWaitReceiveAvail(pThis->pIAboveNet, RT_INDEFINITE_WAIT);
@@ -297 +302 @@
     }
 
-    rc = RTCritSectLeave(&pThis->csDevAccess);
+    rc = RTCritSectLeave(&pThis->DevAccessLock);
     AssertRC(rc);
 
@@ -304 +309 @@
     RTMemFree(pu8Buf);
 #endif
-    if (ASMAtomicDecU32(&pThis->cUrgPkt) == 0)
+    if (ASMAtomicDecU32(&pThis->cUrgPkts) == 0)
     {
         drvNATRecvWakeup(pThis->pDrvIns, pThis->pRecvThread);
@@ -319 +324 @@
     STAM_PROFILE_START(&pThis->StatNATRecvWait, b);
 
-    while (ASMAtomicReadU32(&pThis->cUrgPkt) != 0)
+    while (ASMAtomicReadU32(&pThis->cUrgPkts) != 0)
     {
         rc = RTSemEventWait(pThis->EventRecv, RT_INDEFINITE_WAIT);
@@ -328 +333 @@
     }
 
-    rc = RTCritSectEnter(&pThis->csDevAccess);
+    rc = RTCritSectEnter(&pThis->DevAccessLock);
     AssertRC(rc);
 
@@ -344 +349 @@
     }
 
-    rc = RTCritSectLeave(&pThis->csDevAccess);
+    rc = RTCritSectLeave(&pThis->DevAccessLock);
     AssertRC(rc);
 
@@ -352 +357 @@
     RTMemFree(pu8Buf);
 #endif
-    ASMAtomicDecU32(&pThis->cPkt);
+    ASMAtomicDecU32(&pThis->cPkts);
 
     drvNATNotifyNATThread(pThis, "drvNATRecvWorker");
@@ -451 +456 @@
 
 /**
+ * @interface_method_impl{PDMINETWORKUP,pfnBeginXmit}
+ */
+static DECLCALLBACK(int) drvNATNetworkUp_BeginXmit(PPDMINETWORKUP pInterface)
+{
+    PDRVNAT pThis = RT_FROM_MEMBER(pInterface, DRVNAT, INetworkUp);
+    int rc = RTCritSectTryEnter(&pThis->XmitLock);
+    if (RT_FAILURE(rc))
+    {
+        /** @todo Kick the worker thread when we have one... */
+        rc = VERR_TRY_AGAIN;
+    }
+    return rc;
+}
+
+/**
  * @interface_method_impl{PDMINETWORKUP,pfnAllocBuf}
  */
@@ -457 +477 @@
 {
     PDRVNAT pThis = RT_FROM_MEMBER(pInterface, DRVNAT, INetworkUp);
+//    Assert(RTCritSectIsOwner(&pThis->XmitLock);
 
     /*
@@ -522 +543 @@
 {
     PDRVNAT pThis = RT_FROM_MEMBER(pInterface, DRVNAT, INetworkUp);
+//    Assert(RTCritSectIsOwner(&pThis->XmitLock);
     drvNATFreeSgBuf(pThis, pSgBuf);
     return VINF_SUCCESS;
@@ -533 +555 @@
     PDRVNAT pThis = RT_FROM_MEMBER(pInterface, DRVNAT, INetworkUp);
     Assert((pSgBuf->fFlags & PDMSCATTERGATHER_FLAGS_OWNER_MASK) == PDMSCATTERGATHER_FLAGS_OWNER_1);
+//    Assert(RTCritSectIsOwner(&pThis->XmitLock);
 
     int rc;
@@ -556 +579 @@
     drvNATFreeSgBuf(pThis, pSgBuf);
     return rc;
+}
+
+/**
+ * @interface_method_impl{PDMINETWORKUP,pfnEndXmit}
+ */
+static DECLCALLBACK(void) drvNATNetworkUp_EndXmit(PPDMINETWORKUP pInterface)
+{
+    PDRVNAT pThis = RT_FROM_MEMBER(pInterface, DRVNAT, INetworkUp);
+    RTCritSectLeave(&pThis->XmitLock);
 }
 
@@ -841 +873 @@
         return;
 
-    ASMAtomicIncU32(&pThis->cUrgPkt);
+    ASMAtomicIncU32(&pThis->cUrgPkts);
     int rc = RTReqCallEx(pThis->pUrgRecvReqQueue, NULL /*ppReq*/, 0 /*cMillies*/, RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
                          (PFNRT)drvNATUrgRecvWorker, 4, pThis, pu8Buf, cb, m);
@@ -865 +897 @@
         return;
 
-    ASMAtomicIncU32(&pThis->cPkt);
+    ASMAtomicIncU32(&pThis->cPkts);
     int rc = RTReqCallEx(pThis->pRecvReqQueue, NULL /*ppReq*/, 0 /*cMillies*/, RTREQFLAGS_VOID | RTREQFLAGS_NO_WAIT,
                          (PFNRT)drvNATRecvWorker, 4, pThis, pu8Buf, cb, m);
@@ -1030 +1062 @@
         pThis->pNATState = NULL;
     }
+
+    RTReqDestroyQueue(pThis->pSlirpReqQueue);
+    pThis->pSlirpReqQueue = NULL;
+
+    RTReqDestroyQueue(pThis->pUrgRecvReqQueue);
+    pThis->pUrgRecvReqQueue = NULL;
+
+    RTSemEventDestroy(pThis->EventRecv);
+    pThis->EventRecv = NIL_RTSEMEVENT;
+
+    RTSemEventDestroy(pThis->EventUrgRecv);
+    pThis->EventUrgRecv = NIL_RTSEMEVENT;
+
+    if (RTCritSectIsInitialized(&pThis->DevAccessLock))
+        RTCritSectDelete(&pThis->DevAccessLock);
+
+    if (RTCritSectIsInitialized(&pThis->XmitLock))
+        RTCritSectDelete(&pThis->XmitLock);
 }
 
@@ -1064 +1114 @@
     pThis->pszBootFile                  = NULL;
     pThis->pszNextServer                = NULL;
+    pThis->pSlirpReqQueue               = NULL;
+    pThis->pUrgRecvReqQueue             = NULL;
+    pThis->EventRecv                    = NIL_RTSEMEVENT;
+    pThis->EventUrgRecv                 = NIL_RTSEMEVENT;
+
     /* IBase */
     pDrvIns->IBase.pfnQueryInterface    = drvNATQueryInterface;
+
     /* INetwork */
+    pThis->INetworkUp.pfnBeginXmit          = drvNATNetworkUp_BeginXmit;
     pThis->INetworkUp.pfnAllocBuf           = drvNATNetworkUp_AllocBuf;
     pThis->INetworkUp.pfnFreeBuf            = drvNATNetworkUp_FreeBuf;
     pThis->INetworkUp.pfnSendBuf            = drvNATNetworkUp_SendBuf;
+    pThis->INetworkUp.pfnEndXmit            = drvNATNetworkUp_EndXmit;
     pThis->INetworkUp.pfnSetPromiscuousMode = drvNATNetworkUp_SetPromiscuousMode;
     pThis->INetworkUp.pfnNotifyLinkChanged  = drvNATNetworkUp_NotifyLinkChanged;
@@ -1170 +1228 @@
 #endif
 
-        int rc2 = drvNATConstructRedir(pDrvIns->iInstance, pThis, pCfg, Network);
-        if (RT_SUCCESS(rc2))
+        rc = drvNATConstructRedir(pDrvIns->iInstance, pThis, pCfg, Network);
+        if (RT_SUCCESS(rc))
         {
             /*
@@ -1177 +1235 @@
              * engine after we loaded a guest state.
              */
-            rc2 = PDMDrvHlpSSMRegisterLoadDone(pDrvIns, drvNATLoadDone);
-            AssertRC(rc2);
+            rc = PDMDrvHlpSSMRegisterLoadDone(pDrvIns, drvNATLoadDone);
+            AssertRCReturn(rc, rc);
+
             rc = RTReqCreateQueue(&pThis->pSlirpReqQueue);
             if (RT_FAILURE(rc))
@@ -1193 +1252 @@
                 return rc;
             }
+
             rc = RTReqCreateQueue(&pThis->pUrgRecvReqQueue);
             if (RT_FAILURE(rc))
@@ -1199 +1259 @@
                 return rc;
             }
-            rc = PDMDrvHlpPDMThreadCreate(pDrvIns, &pThis->pRecvThread, pThis, drvNATRecv,
-                                          drvNATRecvWakeup, 128 * _1K, RTTHREADTYPE_IO, "NATRX");
-            AssertRC(rc);
+
+            rc = PDMDrvHlpThreadCreate(pDrvIns, &pThis->pRecvThread, pThis, drvNATRecv,
+                                       drvNATRecvWakeup, 128 * _1K, RTTHREADTYPE_IO, "NATRX");
+            AssertRCReturn(rc, rc);
+
             rc = RTSemEventCreate(&pThis->EventRecv);
-
-            rc = PDMDrvHlpPDMThreadCreate(pDrvIns, &pThis->pUrgRecvThread, pThis, drvNATUrgRecv,
-                                          drvNATUrgRecvWakeup, 128 * _1K, RTTHREADTYPE_IO, "NATURGRX");
-            AssertRC(rc);
+            AssertRCReturn(rc, rc);
+
+            rc = PDMDrvHlpThreadCreate(pDrvIns, &pThis->pUrgRecvThread, pThis, drvNATUrgRecv,
+                                       drvNATUrgRecvWakeup, 128 * _1K, RTTHREADTYPE_IO, "NATURGRX");
+            AssertRCReturn(rc, rc);
+
             rc = RTSemEventCreate(&pThis->EventRecv);
+            AssertRCReturn(rc, rc);
+
             rc = RTSemEventCreate(&pThis->EventUrgRecv);
-            rc = RTCritSectInit(&pThis->csDevAccess);
+            AssertRCReturn(rc, rc);
+
+            rc = RTCritSectInit(&pThis->DevAccessLock);
+            AssertRCReturn(rc, rc);
+
+            rc = RTCritSectInit(&pThis->XmitLock);
+            AssertRCReturn(rc, rc);
 
 #ifndef RT_OS_WINDOWS
@@ -1230 +1302 @@
 #endif
 
-            rc = PDMDrvHlpPDMThreadCreate(pDrvIns, &pThis->pSlirpThread, pThis, drvNATAsyncIoThread,
-                                          drvNATAsyncIoWakeup, 128 * _1K, RTTHREADTYPE_IO, "NAT");
+            rc = PDMDrvHlpThreadCreate(pDrvIns, &pThis->pSlirpThread, pThis, drvNATAsyncIoThread,
+                                       drvNATAsyncIoWakeup, 128 * _1K, RTTHREADTYPE_IO, "NAT");
             AssertRC(rc);
 
 #ifdef VBOX_WITH_SLIRP_MT
-            rc = PDMDrvHlpPDMThreadCreate(pDrvIns, &pThis->pGuestThread, pThis, drvNATAsyncIoGuest,
-                                          drvNATAsyncIoGuestWakeup, 128 * _1K, RTTHREADTYPE_IO, "NATGUEST");
+            rc = PDMDrvHlpThreadCreate(pDrvIns, &pThis->pGuestThread, pThis, drvNATAsyncIoGuest,
+                                       drvNATAsyncIoGuestWakeup, 128 * _1K, RTTHREADTYPE_IO, "NATGUEST");
             AssertRC(rc);
 #endif
@@ -1245 +1317 @@
             return rc;
         }
+
         /* failure path */
-        rc = rc2;
         slirp_term(pThis->pNATState);
         pThis->pNATState = NULL;

trunk/src/VBox/Devices/Network/DrvNetSniffer.cpp

@@ -77 +77 @@
     /** Pointer to the driver instance. */
     PPDMDRVINS              pDrvIns;
+    /** For when we're the leaf driver. */
+    RTCRITSECT              XmitLock;
 
 } DRVNETSNIFFER, *PDRVNETSNIFFER;
 
+
+
+/**
+ * @interface_method_impl{PDMINETWORKUP,pfnBeginXmit}
+ */
+static DECLCALLBACK(int) drvNetSnifferUp_BeginXmit(PPDMINETWORKUP pInterface)
+{
+    PDRVNETSNIFFER pThis = RT_FROM_MEMBER(pInterface, DRVNETSNIFFER, INetworkUp);
+    if (RT_UNLIKELY(!pThis->pIBelowNet))
+    {
+        int rc = RTCritSectTryEnter(&pThis->XmitLock);
+        if (RT_UNLIKELY(rc == VERR_SEM_BUSY))
+            rc = VERR_TRY_AGAIN;
+        return rc;
+    }
+    return pThis->pIBelowNet->pfnBeginXmit(pThis->pIBelowNet);
+}
 
 
@@ -135 +154 @@
 
 /**
+ * @interface_method_impl{PDMINETWORKUP,pfnEndXmit}
+ */
+static DECLCALLBACK(void) drvNetSnifferUp_EndXmit(PPDMINETWORKUP pInterface)
+{
+    LogFlow(("drvNetSnifferUp_EndXmit:\n"));
+    PDRVNETSNIFFER pThis = RT_FROM_MEMBER(pInterface, DRVNETSNIFFER, INetworkUp);
+    if (RT_LIKELY(pThis->pIBelowNet))
+        pThis->pIBelowNet->pfnEndXmit(pThis->pIBelowNet);
+    else
+        RTCritSectLeave(&pThis->XmitLock);
+}
+
+
+/**
  * @interface_method_impl{PDMINETWORKUP,pfnSetPromiscuousMode}
  */
@@ -159 +192 @@
 
 /**
- * @copydoc PDMINETWORKDOWN::pfnWaitReceiveAvail
+ * @interface_method_impl{PDMINETWORKDOWN,pfnWaitReceiveAvail}
  */
 static DECLCALLBACK(int) drvNetSnifferDown_WaitReceiveAvail(PPDMINETWORKDOWN pInterface, RTMSINTERVAL cMillies)
@@ -169 +202 @@
 
 /**
- * @copydoc PDMINETWORKDOWN::pfnReceive
+ * @interface_method_impl{PDMINETWORKDOWN,pfnReceive}
  */
 static DECLCALLBACK(int) drvNetSnifferDown_Receive(PPDMINETWORKDOWN pInterface, const void *pvBuf, size_t cb)
@@ -196 +229 @@
 
 /**
- * @copydoc PDMINETWORKDOWN::pfnNotifyBufAvailable
- */
-static DECLCALLBACK(void) drvNetSnifferDown_NotifyBufAvailable(PPDMINETWORKDOWN pInterface)
+ * @interface_method_impl{PDMINETWORKDOWN,pfnDoTransmitWork}
+ */
+static DECLCALLBACK(void) drvNetSnifferDown_DoTransmitWork(PPDMINETWORKDOWN pInterface)
 {
     PDRVNETSNIFFER pThis = RT_FROM_MEMBER(pInterface, DRVNETSNIFFER, INetworkDown);
-    pThis->pIAboveNet->pfnNotifyBufAvailable(pThis->pIAboveNet);
+    pThis->pIAboveNet->pfnDoTransmitWork(pThis->pIAboveNet);
 }
 
@@ -263 +296 @@
 
 /**
- * Detach a driver instance.
- *
- * @param   pDrvIns     The driver instance.
- * @param   fFlags      Flags, combination of the PDM_TACH_FLAGS_* \#defines.
+ * @interface_method_impl{PDMDRVREG,pfnDetach}
  */
 static DECLCALLBACK(void) drvNetSnifferDetach(PPDMDRVINS pDrvIns, uint32_t fFlags)
@@ -273 +303 @@
 
     LogFlow(("drvNetSnifferDetach: pDrvIns: %p, fFlags: %u\n", pDrvIns, fFlags));
-
+    RTCritSectEnter(&pThis->XmitLock);
     pThis->pIBelowNet = NULL;
-}
-
-
-/**
- * Attach a driver instance.
- *
- * @returns VBox status code.
- * @param   pDrvIns     The driver instance.
- * @param   fFlags      Flags, combination of the PDM_TACH_FLAGS_* \#defines.
+    RTCritSectLeave(&pThis->XmitLock);
+}
+
+
+/**
+ * @interface_method_impl{PDMDRVREG,pfnAttach}
  */
 static DECLCALLBACK(int) drvNetSnifferAttach(PPDMDRVINS pDrvIns, uint32_t fFlags)
 {
     PDRVNETSNIFFER pThis = PDMINS_2_DATA(pDrvIns, PDRVNETSNIFFER);
-
-    LogFlow(("drvNetSnifferAttach: pDrvIns: %p, fFlags: %u\n", pDrvIns, fFlags));
+    LogFlow(("drvNetSnifferAttach/#%#x: fFlags=%#x\n", pDrvIns->iInstance, fFlags));
+    RTCritSectEnter(&pThis->XmitLock);
 
     /*
@@ -298 +325 @@
     if (   rc == VERR_PDM_NO_ATTACHED_DRIVER
         || rc == VERR_PDM_CFG_MISSING_DRIVER_NAME)
+    {
         pThis->pIBelowNet = NULL;
+        rc = VINF_SUCCESS;
+    }
     else if (RT_SUCCESS(rc))
     {
         pThis->pIBelowNet = PDMIBASE_QUERY_INTERFACE(pBaseDown, PDMINETWORKUP);
-        if (!pThis->pIBelowNet)
+        if (pThis->pIBelowNet)
+            rc = VINF_SUCCESS;
+        else
         {
             AssertMsgFailed(("Configuration error: the driver below didn't export the network connector interface!\n"));
-            return VERR_PDM_MISSING_INTERFACE_BELOW;
+            rc = VERR_PDM_MISSING_INTERFACE_BELOW;
         }
     }
     else
-    {
         AssertMsgFailed(("Failed to attach to driver below! rc=%Rrc\n", rc));
-        return rc;
-    }
-
+
+    RTCritSectLeave(&pThis->XmitLock);
     return VINF_SUCCESS;
 }
@@ -319 +349 @@
 
 /**
- * Destruct a driver instance.
- *
- * Most VM resources are freed by the VM. This callback is provided so that any non-VM
- * resources can be freed correctly.
- *
- * @param   pDrvIns     The driver instance data.
+ * @interface_method_impl{PDMDRVREG,pfnDestruct}
  */
 static DECLCALLBACK(void) drvNetSnifferDestruct(PPDMDRVINS pDrvIns)
@@ -334 +359 @@
         RTCritSectDelete(&pThis->Lock);
 
+    if (RTCritSectIsInitialized(&pThis->XmitLock))
+        RTCritSectDelete(&pThis->XmitLock);
+
     if (pThis->File != NIL_RTFILE)
     {
@@ -343 +371 @@
 
 /**
- * Construct a NAT network transport driver instance.
- *
- * @copydoc FNPDMDRVCONSTRUCT
+ * @interface_method_impl{Construct a NAT network transport driver instance,
+ *                       PDMDRVREG,pfnDestruct}
  */
 static DECLCALLBACK(int) drvNetSnifferConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags)
@@ -352 +379 @@
     LogFlow(("drvNetSnifferConstruct:\n"));
     PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
-
-    /*
-     * Validate the config.
-     */
-    if (!CFGMR3AreValuesValid(pCfg, "File\0"))
-        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
-
-    if (CFGMR3GetFirstChild(pCfg))
-        LogRel(("NetSniffer: Found child config entries -- are you trying to redirect ports?\n"));
 
     /*
@@ -372 +390 @@
     pDrvIns->IBase.pfnQueryInterface                = drvNetSnifferQueryInterface;
     /* INetworkUp */
+    pThis->INetworkUp.pfnBeginXmit                  = drvNetSnifferUp_BeginXmit;
     pThis->INetworkUp.pfnAllocBuf                   = drvNetSnifferUp_AllocBuf;
     pThis->INetworkUp.pfnFreeBuf                    = drvNetSnifferUp_FreeBuf;
     pThis->INetworkUp.pfnSendBuf                    = drvNetSnifferUp_SendBuf;
+    pThis->INetworkUp.pfnEndXmit                    = drvNetSnifferUp_EndXmit;
     pThis->INetworkUp.pfnSetPromiscuousMode         = drvNetSnifferUp_SetPromiscuousMode;
     pThis->INetworkUp.pfnNotifyLinkChanged          = drvNetSnifferUp_NotifyLinkChanged;
@@ -380 +400 @@
     pThis->INetworkDown.pfnWaitReceiveAvail         = drvNetSnifferDown_WaitReceiveAvail;
     pThis->INetworkDown.pfnReceive                  = drvNetSnifferDown_Receive;
-    pThis->INetworkDown.pfnNotifyBufAvailable       = drvNetSnifferDown_NotifyBufAvailable;
+    pThis->INetworkDown.pfnDoTransmitWork           = drvNetSnifferDown_DoTransmitWork;
     /* INetworkConfig */
     pThis->INetworkConfig.pfnGetMac                 = drvNetSnifferDownCfg_GetMac;
@@ -387 +407 @@
 
     /*
+     * Create the locks.
+     */
+    int rc = RTCritSectInit(&pThis->Lock);
+    AssertRCReturn(rc, rc);
+    rc = RTCritSectInit(&pThis->XmitLock);
+    AssertRCReturn(rc, rc);
+
+    /*
+     * Validate the config.
+     */
+    if (!CFGMR3AreValuesValid(pCfg, "File\0"))
+        return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
+
+    if (CFGMR3GetFirstChild(pCfg))
+        LogRel(("NetSniffer: Found child config entries -- are you trying to redirect ports?\n"));
+
+    /*
      * Get the filename.
      */
-    int rc = CFGMR3QueryString(pCfg, "File", pThis->szFilename, sizeof(pThis->szFilename));
+    rc = CFGMR3QueryString(pCfg, "File", pThis->szFilename, sizeof(pThis->szFilename));
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
     {
@@ -446 +483 @@
         return rc;
     }
-
-    /*
-     * Create the lock.
-     */
-    rc = RTCritSectInit(&pThis->Lock);
-    if (RT_FAILURE(rc))
-        return rc;
 
     /*

trunk/src/VBox/Devices/Network/DrvTAP.cpp

@@ -1116 +1116 @@
      * Create the async I/O thread.
      */
-    rc = PDMDrvHlpPDMThreadCreate(pDrvIns, &pThis->pThread, pThis, drvTAPAsyncIoThread, drvTapAsyncIoWakeup, 128 * _1K, RTTHREADTYPE_IO, "TAP");
+    rc = PDMDrvHlpThreadCreate(pDrvIns, &pThis->pThread, pThis, drvTAPAsyncIoThread, drvTapAsyncIoWakeup, 128 * _1K, RTTHREADTYPE_IO, "TAP");
     AssertRCReturn(rc, rc);
 

trunk/src/VBox/Devices/PC/DrvACPI.cpp

@@ -982 +982 @@
      * Start the poller thread.
      */
-    rc = PDMDrvHlpPDMThreadCreate(pDrvIns, &pThis->pPollerThread, pThis, drvACPIPoller,
-                                  drvACPIPollerWakeup, 0, RTTHREADTYPE_INFREQUENT_POLLER, "ACPI Poller");
+    rc = PDMDrvHlpThreadCreate(pDrvIns, &pThis->pPollerThread, pThis, drvACPIPoller,
+                               drvACPIPollerWakeup, 0, RTTHREADTYPE_INFREQUENT_POLLER, "ACPI Poller");
     if (RT_FAILURE(rc))
         return rc;

trunk/src/VBox/Devices/Parallel/DrvHostParallel.cpp

@@ -379 +379 @@
      * Start waiting for interrupts.
      */
-    rc = PDMDrvHlpPDMThreadCreate(pDrvIns, &pThis->pMonitorThread, pThis, drvHostParallelMonitorThread, drvHostParallelWakeupMonitorThread, 0,
-                                  RTTHREADTYPE_IO, "ParMon");
+    rc = PDMDrvHlpThreadCreate(pDrvIns, &pThis->pMonitorThread, pThis, drvHostParallelMonitorThread, drvHostParallelWakeupMonitorThread, 0,
+                               RTTHREADTYPE_IO, "ParMon");
     if (RT_FAILURE(rc))
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("HostParallel#%d cannot create monitor thread"), pDrvIns->iInstance);

trunk/src/VBox/Devices/Serial/DrvHostSerial.cpp

@@ -1435 +1435 @@
      * Create the receive, send and monitor threads pluss the related send semaphore.
      */
-    rc = PDMDrvHlpPDMThreadCreate(pDrvIns, &pThis->pRecvThread, pThis, drvHostSerialRecvThread, drvHostSerialWakeupRecvThread, 0, RTTHREADTYPE_IO, "SerRecv");
+    rc = PDMDrvHlpThreadCreate(pDrvIns, &pThis->pRecvThread, pThis, drvHostSerialRecvThread, drvHostSerialWakeupRecvThread, 0, RTTHREADTYPE_IO, "SerRecv");
     if (RT_FAILURE(rc))
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("HostSerial#%d cannot create receive thread"), pDrvIns->iInstance);
@@ -1442 +1442 @@
     AssertRC(rc);
 
-    rc = PDMDrvHlpPDMThreadCreate(pDrvIns, &pThis->pSendThread, pThis, drvHostSerialSendThread, drvHostSerialWakeupSendThread, 0, RTTHREADTYPE_IO, "SerSend");
+    rc = PDMDrvHlpThreadCreate(pDrvIns, &pThis->pSendThread, pThis, drvHostSerialSendThread, drvHostSerialWakeupSendThread, 0, RTTHREADTYPE_IO, "SerSend");
     if (RT_FAILURE(rc))
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("HostSerial#%d cannot create send thread"), pDrvIns->iInstance);
@@ -1451 +1451 @@
     ioctl(pThis->DeviceFile, TIOCMGET, &pThis->fStatusLines);
 # endif
-    rc = PDMDrvHlpPDMThreadCreate(pDrvIns, &pThis->pMonitorThread, pThis, drvHostSerialMonitorThread, drvHostSerialWakeupMonitorThread, 0, RTTHREADTYPE_IO, "SerMon");
+    rc = PDMDrvHlpThreadCreate(pDrvIns, &pThis->pMonitorThread, pThis, drvHostSerialMonitorThread, drvHostSerialWakeupMonitorThread, 0, RTTHREADTYPE_IO, "SerMon");
     if (RT_FAILURE(rc))
         return PDMDrvHlpVMSetError(pDrvIns, rc, RT_SRC_POS, N_("HostSerial#%d cannot create monitor thread"), pDrvIns->iInstance);

trunk/src/VBox/Devices/Storage/DrvSCSI.cpp

@@ -697 +697 @@
 
     /* Create I/O thread. */
-    rc = PDMDrvHlpPDMThreadCreate(pDrvIns, &pThis->pAsyncIOThread, pThis, drvscsiAsyncIOLoop,
-                                  drvscsiAsyncIOLoopWakeup, 0, RTTHREADTYPE_IO, "SCSI async IO");
+    rc = PDMDrvHlpThreadCreate(pDrvIns, &pThis->pAsyncIOThread, pThis, drvscsiAsyncIOLoop,
+                               drvscsiAsyncIOLoopWakeup, 0, RTTHREADTYPE_IO, "SCSI async IO");
     AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create async I/O thread rc=%Rrc\n"), rc);
 

trunk/src/VBox/Devices/Storage/DrvSCSIHost.cpp

@@ -484 +484 @@
 
     /* Create I/O thread. */
-    rc = PDMDrvHlpPDMThreadCreate(pDrvIns, &pThis->pAsyncIOThread, pThis, drvscsihostAsyncIOLoop,
-                                  drvscsihostAsyncIOLoopWakeup, 0, RTTHREADTYPE_IO, "SCSI async IO");
+    rc = PDMDrvHlpThreadCreate(pDrvIns, &pThis->pAsyncIOThread, pThis, drvscsihostAsyncIOLoop,
+                               drvscsihostAsyncIOLoopWakeup, 0, RTTHREADTYPE_IO, "SCSI async IO");
     AssertMsgReturn(RT_SUCCESS(rc), ("Failed to create async I/O thread rc=%Rrc\n"), rc);
 

trunk/src/VBox/Devices/Storage/DrvVD.cpp

@@ -344 +344 @@
         if (RT_SUCCESS(rc))
         {
-            rc = PDMDrvHlpPDMAsyncCompletionTemplateCreate(pThis->pDrvIns, &pStorageBackend->pTemplate,
-                                                           drvvdAsyncTaskCompleted, pStorageBackend, "AsyncTaskCompleted");
+            rc = PDMDrvHlpAsyncCompletionTemplateCreate(pThis->pDrvIns, &pStorageBackend->pTemplate,
+                                                        drvvdAsyncTaskCompleted, pStorageBackend, "AsyncTaskCompleted");
             if (RT_SUCCESS(rc))
             {

trunk/src/VBox/VMM/PDM.cpp

@@ -307 +307 @@
     AssertCompile(sizeof(pUVM->pdm.s) <= sizeof(pUVM->pdm.padding));
     AssertRelease(sizeof(pUVM->pdm.s) <= sizeof(pUVM->pdm.padding));
-    pUVM->pdm.s.pModules = NULL;
-    return VINF_SUCCESS;
+    pUVM->pdm.s.pModules   = NULL;
+    pUVM->pdm.s.pCritSects = NULL;
+    return RTCritSectInit(&pUVM->pdm.s.ListCritSect);
 }
 
@@ -337 +338 @@
      * Initialize sub compontents.
      */
-    int rc = RTCritSectInit(&pVM->pdm.s.MiscCritSect);
-    if (RT_SUCCESS(rc))
-        rc = pdmR3CritSectInit(pVM);
+    int rc = pdmR3CritSectInitStats(pVM);
     if (RT_SUCCESS(rc))
         rc = PDMR3CritSectInit(pVM, &pVM->pdm.s.CritSect, RT_SRC_POS, "PDM");
@@ -649 +648 @@
      */
     pdmR3LdrTermU(pUVM);
+
+    Assert(pUVM->pdm.s.pCritSects == NULL);
+    RTCritSectDelete(&pUVM->pdm.s.ListCritSect);
 }
 

trunk/src/VBox/VMM/PDMCritSect.cpp

@@ -29 +29 @@
 #include <VBox/mm.h>
 #include <VBox/vm.h>
+#include <VBox/uvm.h>
 
 #include <VBox/err.h>
@@ -43 +44 @@
 *   Internal Functions                                                         *
 *******************************************************************************/
-static int pdmR3CritSectDeleteOne(PVM pVM, PPDMCRITSECTINT pCritSect, PPDMCRITSECTINT pPrev, bool fFinal);
-
-
-
-/**
- * Initializes the critical section subcomponent.
+static int pdmR3CritSectDeleteOne(PVM pVM, PUVM pUVM, PPDMCRITSECTINT pCritSect, PPDMCRITSECTINT pPrev, bool fFinal);
+
+
+
+/**
+ * Register statistics related to the critical sections.
  *
  * @returns VBox status code.
  * @param   pVM         The VM handle.
- * @remark  Not to be confused with PDMR3CritSectInit and pdmR3CritSectInitDevice which are
- *          for initializing a critical section.
- */
-int pdmR3CritSectInit(PVM pVM)
+ */
+int pdmR3CritSectInitStats(PVM pVM)
 {
     STAM_REG(pVM, &pVM->pdm.s.StatQueuedCritSectLeaves, STAMTYPE_COUNTER, "/PDM/QueuedCritSectLeaves", STAMUNIT_OCCURENCES,
@@ -70 +69 @@
 void pdmR3CritSectRelocate(PVM pVM)
 {
-    RTCritSectEnter(&pVM->pdm.s.MiscCritSect);
-    for (PPDMCRITSECTINT pCur = pVM->pdm.s.pCritSects;
+    PUVM pUVM = pVM->pUVM;
+    RTCritSectEnter(&pUVM->pdm.s.ListCritSect);
+
+    for (PPDMCRITSECTINT pCur = pUVM->pdm.s.pCritSects;
          pCur;
          pCur = pCur->pNext)
         pCur->pVMRC = pVM->pVMRC;
-    RTCritSectLeave(&pVM->pdm.s.MiscCritSect);
+
+    RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
 }
 
@@ -82 +84 @@
  * Deletes all remaining critical sections.
  *
- * This is called at the end of the termination process.
+ * This is called at the very end of the termination process.  It is also called
+ * at the end of vmR3CreateU failure cleanup, which may cause it to be called
+ * twice depending on hwere vmR3CreateU actually failed.  We have to do the
+ * latter call because other components expect the critical sections to be
+ * automatically deleted.
  *
  * @returns VBox status.
  *          First error code, rest is lost.
- * @param   pVM         The VM handle.
+ * @param   pVMU        The user mode VM handle.
  * @remark  Don't confuse this with PDMR3CritSectDelete.
  */
 VMMDECL(int) PDMR3CritSectTerm(PVM pVM)
 {
-    int rc = VINF_SUCCESS;
-    RTCritSectEnter(&pVM->pdm.s.MiscCritSect);
-    while (pVM->pdm.s.pCritSects)
-    {
-        int rc2 = pdmR3CritSectDeleteOne(pVM, pVM->pdm.s.pCritSects, NULL, true /* final */);
+    PUVM    pUVM = pVM->pUVM;
+    int     rc   = VINF_SUCCESS;
+    RTCritSectEnter(&pUVM->pdm.s.ListCritSect);
+
+    while (pUVM->pdm.s.pCritSects)
+    {
+        int rc2 = pdmR3CritSectDeleteOne(pVM, pUVM, pUVM->pdm.s.pCritSects, NULL, true /* final */);
         AssertRC(rc2);
         if (RT_FAILURE(rc2) && RT_SUCCESS(rc))
             rc = rc2;
     }
-    RTCritSectLeave(&pVM->pdm.s.MiscCritSect);
-    RTCritSectDelete(&pVM->pdm.s.MiscCritSect);
+
+    RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
     return rc;
 }
-
 
 
@@ -162 +169 @@
                 pCritSect->pvKey                     = pvKey;
                 pCritSect->EventToSignal             = NIL_RTSEMEVENT;
-                pCritSect->pNext                     = pVM->pdm.s.pCritSects;
+                pCritSect->pNext                     = pVM->pUVM->pdm.s.pCritSects;
                 pCritSect->pszName                   = pszName;
-                pVM->pdm.s.pCritSects = pCritSect;
+                pVM->pUVM->pdm.s.pCritSects = pCritSect;
                 STAMR3RegisterF(pVM, &pCritSect->StatContentionRZLock,  STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,          NULL, "/PDM/CritSects/%s/ContentionRZLock", pCritSect->pszName);
                 STAMR3RegisterF(pVM, &pCritSect->StatContentionRZUnlock,STAMTYPE_COUNTER, STAMVISIBILITY_ALWAYS, STAMUNIT_OCCURENCES,          NULL, "/PDM/CritSects/%s/ContentionRZUnlock", pCritSect->pszName);
@@ -215 +222 @@
 
 /**
- * Initializes a PDM critical section.
+ * Initializes a PDM critical section for a device.
  *
  * The PDM critical sections are derived from the IPRT critical sections, but
@@ -224 +231 @@
  * @param   pDevIns         Device instance.
  * @param   pCritSect       Pointer to the critical section.
- * @param   pszNameFmt      Format string for namging the critical section.  For
+ * @param   pszNameFmt      Format string for naming the critical section.  For
  *                          statistics and lock validation.
  * @param   va              Arguments for the format string.
@@ -232 +239 @@
 {
     return pdmR3CritSectInitOne(pVM, &pCritSect->s, pDevIns, RT_SRC_POS_ARGS, pszNameFmt, va);
+}
+
+
+/**
+ * Initializes a PDM critical section for a driver.
+ *
+ * @returns VBox status code.
+ * @param   pVM             The VM handle.
+ * @param   pDrvIns         Driver instance.
+ * @param   pCritSect       Pointer to the critical section.
+ * @param   pszNameFmt      Format string for naming the critical section.  For
+ *                          statistics and lock validation.
+ * @param   ...             Arguments for the format string.
+ */
+int pdmR3CritSectInitDriver(PVM pVM, PPDMDRVINS pDrvIns, PPDMCRITSECT pCritSect, RT_SRC_POS_DECL,
+                            const char *pszNameFmt, ...)
+{
+    va_list va;
+    va_start(va, pszNameFmt);
+    int rc = pdmR3CritSectInitOne(pVM, &pCritSect->s, pDrvIns, RT_SRC_POS_ARGS, pszNameFmt, va);
+    va_end(va);
+    return rc;
 }
 
@@ -245 +274 @@
  * @param   fFinal      Set if this is the final call and statistics shouldn't be deregistered.
  *
- * @remarks Caller must've entered the MiscCritSect.
- */
-static int pdmR3CritSectDeleteOne(PVM pVM, PPDMCRITSECTINT pCritSect, PPDMCRITSECTINT pPrev, bool fFinal)
+ * @remarks Caller must've entered the ListCritSect.
+ */
+static int pdmR3CritSectDeleteOne(PVM pVM, PUVM pUVM, PPDMCRITSECTINT pCritSect, PPDMCRITSECTINT pPrev, bool fFinal)
 {
     /*
@@ -256 +285 @@
     Assert(pCritSect->Core.cLockers == -1);
     Assert(pCritSect->Core.NativeThreadOwner == NIL_RTNATIVETHREAD);
-    Assert(RTCritSectIsOwner(&pVM->pdm.s.MiscCritSect));
+    Assert(RTCritSectIsOwner(&pUVM->pdm.s.ListCritSect));
 
     /*
@@ -264 +293 @@
         pPrev->pNext = pCritSect->pNext;
     else
-        pVM->pdm.s.pCritSects = pCritSect->pNext;
+        pUVM->pdm.s.pCritSects = pCritSect->pNext;
 
     /*
@@ -314 +343 @@
      * Iterate the list and match key.
      */
+    PUVM            pUVM  = pVM->pUVM;
     int             rc    = VINF_SUCCESS;
     PPDMCRITSECTINT pPrev = NULL;
-    RTCritSectEnter(&pVM->pdm.s.MiscCritSect);
-    PPDMCRITSECTINT pCur  = pVM->pdm.s.pCritSects;
+    RTCritSectEnter(&pUVM->pdm.s.ListCritSect);
+    PPDMCRITSECTINT pCur  = pUVM->pdm.s.pCritSects;
     while (pCur)
     {
         if (pCur->pvKey == pvKey)
         {
-            int rc2 = pdmR3CritSectDeleteOne(pVM, pCur, pPrev, false /* not final */);
+            int rc2 = pdmR3CritSectDeleteOne(pVM, pUVM, pCur, pPrev, false /* not final */);
             AssertRC(rc2);
             if (RT_FAILURE(rc2) && RT_SUCCESS(rc))
@@ -332 +362 @@
         pCur = pCur->pNext;
     }
-    RTCritSectLeave(&pVM->pdm.s.MiscCritSect);
+    RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
     return rc;
 }
@@ -351 +381 @@
 
 /**
+ * Deletes all undeleted critical sections initalized by a given driver.
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM handle.
+ * @param   pDrvIns     The driver handle.
+ */
+int pdmR3CritSectDeleteDriver(PVM pVM, PPDMDRVINS pDrvIns)
+{
+    return pdmR3CritSectDeleteByKey(pVM, pDrvIns);
+}
+
+
+/**
  * Deletes the critical section.
  *
@@ -365 +408 @@
      */
     PVM             pVM   = pCritSect->s.pVMR3;
+    PUVM            pUVM  = pVM->pUVM;
     AssertReleaseReturn(pVM, VERR_INTERNAL_ERROR);
     PPDMCRITSECTINT pPrev = NULL;
-    RTCritSectEnter(&pVM->pdm.s.MiscCritSect);
-    PPDMCRITSECTINT pCur  = pVM->pdm.s.pCritSects;
+    RTCritSectEnter(&pUVM->pdm.s.ListCritSect);
+    PPDMCRITSECTINT pCur  = pUVM->pdm.s.pCritSects;
     while (pCur)
     {
         if (pCur == &pCritSect->s)
         {
-            int rc = pdmR3CritSectDeleteOne(pVM, pCur, pPrev, false /* not final */);
-            RTCritSectLeave(&pVM->pdm.s.MiscCritSect);
+            int rc = pdmR3CritSectDeleteOne(pVM, pUVM, pCur, pPrev, false /* not final */);
+            RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
             return rc;
         }
@@ -382 +426 @@
         pCur = pCur->pNext;
     }
-    RTCritSectLeave(&pVM->pdm.s.MiscCritSect);
+    RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
     AssertReleaseMsgFailed(("pCritSect=%p wasn't found!\n", pCritSect));
     return VERR_INTERNAL_ERROR;
@@ -519 +563 @@
     RTNATIVETHREAD const    hNativeThread = RTThreadNativeSelf();
     uint32_t                cCritSects = 0;
-    for (PPDMCRITSECTINT pCur = pVM->pdm.s.pCritSects;
+    for (PPDMCRITSECTINT pCur = pVM->pUVM->pdm.s.pCritSects;
          pCur;
          pCur = pCur->pNext)
@@ -583 +627 @@
 {
     RTNATIVETHREAD const hNativeSelf = RTThreadNativeSelf();
-
-    RTCritSectEnter(&pVM->pdm.s.MiscCritSect);
-    for (PPDMCRITSECTINT pCur = pVM->pdm.s.pCritSects;
+    PUVM                 pUVM        = pVM->pUVM;
+
+    RTCritSectEnter(&pUVM->pdm.s.ListCritSect);
+    for (PPDMCRITSECTINT pCur = pUVM->pdm.s.pCritSects;
          pCur;
          pCur = pCur->pNext)
@@ -593 +638 @@
             PDMCritSectLeave((PPDMCRITSECT)pCur);
     }
-    RTCritSectLeave(&pVM->pdm.s.MiscCritSect);
-}
-
+    RTCritSectLeave(&pUVM->pdm.s.ListCritSect);
+}
+

trunk/src/VBox/VMM/PDMDriver.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -654 +654 @@
         AssertRC(rc);
 
+        /* PDM critsects. */
+        rc = pdmR3CritSectDeleteDriver(pVM, pCur);
+        AssertRC(rc);
+
         /* Finally, the driver it self. */
         bool fHyperHeap = pCur->Internal.s.fHyperHeap;
@@ -925 +929 @@
 
 
-/** @interface_method_impl{PDMDRVHLP,pfnPDMQueueCreate} */
-static DECLCALLBACK(int) pdmR3DrvHlp_PDMQueueCreate(PPDMDRVINS pDrvIns, uint32_t cbItem, uint32_t cItems, uint32_t cMilliesInterval,
-                                                    PFNPDMQUEUEDRV pfnCallback, const char *pszName, PPDMQUEUE *ppQueue)
+/** @interface_method_impl{PDMDRVHLP,pfnQueueCreate} */
+static DECLCALLBACK(int) pdmR3DrvHlp_QueueCreate(PPDMDRVINS pDrvIns, uint32_t cbItem, uint32_t cItems, uint32_t cMilliesInterval,
+                                                 PFNPDMQUEUEDRV pfnCallback, const char *pszName, PPDMQUEUE *ppQueue)
 {
     PDMDRV_ASSERT_DRVINS(pDrvIns);
@@ -1164 +1168 @@
 
 
-/** @interface_method_impl{PDMDRVHLP,pfnPDMThreadCreate} */
-static DECLCALLBACK(int) pdmR3DrvHlp_PDMThreadCreate(PPDMDRVINS pDrvIns, PPPDMTHREAD ppThread, void *pvUser, PFNPDMTHREADDRV pfnThread,
-                                                     PFNPDMTHREADWAKEUPDRV pfnWakeup, size_t cbStack, RTTHREADTYPE enmType, const char *pszName)
-{
-    PDMDRV_ASSERT_DRVINS(pDrvIns);
-    VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
-    LogFlow(("pdmR3DrvHlp_PDMThreadCreate: caller='%s'/%d: ppThread=%p pvUser=%p pfnThread=%p pfnWakeup=%p cbStack=%#zx enmType=%d pszName=%p:{%s}\n",
+/** @interface_method_impl{PDMDRVHLP,pfnThreadCreate} */
+static DECLCALLBACK(int) pdmR3DrvHlp_ThreadCreate(PPDMDRVINS pDrvIns, PPPDMTHREAD ppThread, void *pvUser, PFNPDMTHREADDRV pfnThread,
+                                                  PFNPDMTHREADWAKEUPDRV pfnWakeup, size_t cbStack, RTTHREADTYPE enmType, const char *pszName)
+{
+    PDMDRV_ASSERT_DRVINS(pDrvIns);
+    VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
+    LogFlow(("pdmR3DrvHlp_ThreadCreate: caller='%s'/%d: ppThread=%p pvUser=%p pfnThread=%p pfnWakeup=%p cbStack=%#zx enmType=%d pszName=%p:{%s}\n",
              pDrvIns->pReg->szName, pDrvIns->iInstance, ppThread, pvUser, pfnThread, pfnWakeup, cbStack, enmType, pszName, pszName));
 
     int rc = pdmR3ThreadCreateDriver(pDrvIns->Internal.s.pVMR3, pDrvIns, ppThread, pvUser, pfnThread, pfnWakeup, cbStack, enmType, pszName);
 
-    LogFlow(("pdmR3DrvHlp_PDMThreadCreate: caller='%s'/%d: returns %Rrc *ppThread=%RTthrd\n", pDrvIns->pReg->szName, pDrvIns->iInstance,
+    LogFlow(("pdmR3DrvHlp_ThreadCreate: caller='%s'/%d: returns %Rrc *ppThread=%RTthrd\n", pDrvIns->pReg->szName, pDrvIns->iInstance,
             rc, *ppThread));
     return rc;
@@ -1181 +1185 @@
 
 
-/** @interface_method_impl{PDMDRVHLP,pfnPDMAsyncCompletionTemplateCreate} */
-static DECLCALLBACK(int) pdmR3DrvHlp_PDMAsyncCompletionTemplateCreate(PPDMDRVINS pDrvIns, PPPDMASYNCCOMPLETIONTEMPLATE ppTemplate,
-                                                                      PFNPDMASYNCCOMPLETEDRV pfnCompleted, void *pvTemplateUser,
-                                                                      const char *pszDesc)
-{
-    PDMDRV_ASSERT_DRVINS(pDrvIns);
-    VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
-    LogFlow(("pdmR3DrvHlp_PDMAsyncCompletionTemplateCreate: caller='%s'/%d: ppTemplate=%p pfnCompleted=%p pszDesc=%p:{%s}\n",
+/** @interface_method_impl{PDMDRVHLP,pfnAsyncCompletionTemplateCreate} */
+static DECLCALLBACK(int) pdmR3DrvHlp_AsyncCompletionTemplateCreate(PPDMDRVINS pDrvIns, PPPDMASYNCCOMPLETIONTEMPLATE ppTemplate,
+                                                                   PFNPDMASYNCCOMPLETEDRV pfnCompleted, void *pvTemplateUser,
+                                                                   const char *pszDesc)
+{
+    PDMDRV_ASSERT_DRVINS(pDrvIns);
+    VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
+    LogFlow(("pdmR3DrvHlp_AsyncCompletionTemplateCreate: caller='%s'/%d: ppTemplate=%p pfnCompleted=%p pszDesc=%p:{%s}\n",
              pDrvIns->pReg->szName, pDrvIns->iInstance, ppTemplate, pfnCompleted, pszDesc, pszDesc));
 
     int rc = PDMR3AsyncCompletionTemplateCreateDriver(pDrvIns->Internal.s.pVMR3, pDrvIns, ppTemplate, pfnCompleted, pvTemplateUser, pszDesc);
 
-    LogFlow(("pdmR3DrvHlp_PDMAsyncCompletionTemplateCreate: caller='%s'/%d: returns %Rrc *ppThread=%p\n", pDrvIns->pReg->szName,
+    LogFlow(("pdmR3DrvHlp_AsyncCompletionTemplateCreate: caller='%s'/%d: returns %Rrc *ppThread=%p\n", pDrvIns->pReg->szName,
              pDrvIns->iInstance, rc, *ppTemplate));
     return rc;
@@ -1199 +1203 @@
 
 
-/** @interface_method_impl{PDMDRVHLP,pfnPDMLdrGetRCInterfaceSymbols} */
-static DECLCALLBACK(int) pdmR3DrvHlp_PDMLdrGetRCInterfaceSymbols(PPDMDRVINS pDrvIns, void *pvInterface, size_t cbInterface,
-                                                                 const char *pszSymPrefix, const char *pszSymList)
-{
-    PDMDRV_ASSERT_DRVINS(pDrvIns);
-    VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
-    LogFlow(("pdmR3DrvHlp_PDMLdrGetRCInterfaceSymbols: caller='%s'/%d: pvInterface=%p cbInterface=%zu pszSymPrefix=%p:{%s} pszSymList=%p:{%s}\n",
+/** @interface_method_impl{PDMDRVHLP,pfnLdrGetRCInterfaceSymbols} */
+static DECLCALLBACK(int) pdmR3DrvHlp_LdrGetRCInterfaceSymbols(PPDMDRVINS pDrvIns, void *pvInterface, size_t cbInterface,
+                                                              const char *pszSymPrefix, const char *pszSymList)
+{
+    PDMDRV_ASSERT_DRVINS(pDrvIns);
+    VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
+    LogFlow(("pdmR3DrvHlp_LdrGetRCInterfaceSymbols: caller='%s'/%d: pvInterface=%p cbInterface=%zu pszSymPrefix=%p:{%s} pszSymList=%p:{%s}\n",
              pDrvIns->pReg->szName, pDrvIns->iInstance, pvInterface, cbInterface, pszSymPrefix, pszSymPrefix, pszSymList, pszSymList));
 
@@ -1229 +1233 @@
     }
 
-    LogFlow(("pdmR3DrvHlp_PDMLdrGetRCInterfaceSymbols: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szName,
+    LogFlow(("pdmR3DrvHlp_LdrGetRCInterfaceSymbols: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szName,
              pDrvIns->iInstance, rc));
     return rc;
@@ -1235 +1239 @@
 
 
-/** @interface_method_impl{PDMDRVHLP,pfnPDMLdrGetR0InterfaceSymbols} */
-static DECLCALLBACK(int) pdmR3DrvHlp_PDMLdrGetR0InterfaceSymbols(PPDMDRVINS pDrvIns, void *pvInterface, size_t cbInterface,
-                                                                 const char *pszSymPrefix, const char *pszSymList)
-{
-    PDMDRV_ASSERT_DRVINS(pDrvIns);
-    VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
-    LogFlow(("pdmR3DrvHlp_PDMLdrGetR0InterfaceSymbols: caller='%s'/%d: pvInterface=%p cbInterface=%zu pszSymPrefix=%p:{%s} pszSymList=%p:{%s}\n",
+/** @interface_method_impl{PDMDRVHLP,pfnLdrGetR0InterfaceSymbols} */
+static DECLCALLBACK(int) pdmR3DrvHlp_LdrGetR0InterfaceSymbols(PPDMDRVINS pDrvIns, void *pvInterface, size_t cbInterface,
+                                                              const char *pszSymPrefix, const char *pszSymList)
+{
+    PDMDRV_ASSERT_DRVINS(pDrvIns);
+    VM_ASSERT_EMT(pDrvIns->Internal.s.pVMR3);
+    LogFlow(("pdmR3DrvHlp_LdrGetR0InterfaceSymbols: caller='%s'/%d: pvInterface=%p cbInterface=%zu pszSymPrefix=%p:{%s} pszSymList=%p:{%s}\n",
              pDrvIns->pReg->szName, pDrvIns->iInstance, pvInterface, cbInterface, pszSymPrefix, pszSymPrefix, pszSymList, pszSymList));
 
@@ -1265 +1269 @@
     }
 
-    LogFlow(("pdmR3DrvHlp_PDMLdrGetR0InterfaceSymbols: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szName,
+    LogFlow(("pdmR3DrvHlp_LdrGetR0InterfaceSymbols: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szName,
+             pDrvIns->iInstance, rc));
+    return rc;
+}
+
+
+/** @interface_method_impl{PDMDRVHLP,pfnCritSectInit} */
+static DECLCALLBACK(int) pdmR3DrvHlp_CritSectInit(PPDMDRVINS pDrvIns, PPDMCRITSECT pCritSect,
+                                                  RT_SRC_POS_DECL, const char *pszName)
+{
+    PDMDRV_ASSERT_DRVINS(pDrvIns);
+    PVM pVM = pDrvIns->Internal.s.pVMR3;
+    VM_ASSERT_EMT(pVM);
+    LogFlow(("pdmR3DrvHlp_CritSectInit: caller='%s'/%d: pCritSect=%p pszName=%s\n",
+             pDrvIns->pReg->szName, pDrvIns->iInstance, pCritSect, pszName));
+
+    int rc = pdmR3CritSectInitDriver(pVM, pDrvIns, pCritSect, RT_SRC_POS_ARGS, "%s_%u", pszName, pDrvIns->iInstance);
+
+    LogFlow(("pdmR3DrvHlp_CritSectInit: caller='%s'/%d: returns %Rrc\n", pDrvIns->pReg->szName,
              pDrvIns->iInstance, rc));
     return rc;
@@ -1289 +1311 @@
     pdmR3DrvHlp_VMState,
     pdmR3DrvHlp_VMTeleportedAndNotFullyResumedYet,
-    pdmR3DrvHlp_PDMQueueCreate,
+    pdmR3DrvHlp_QueueCreate,
     pdmR3DrvHlp_TMGetVirtualFreq,
     pdmR3DrvHlp_TMGetVirtualTime,
@@ -1303 +1325 @@
     pdmR3DrvHlp_SetAsyncNotification,
     pdmR3DrvHlp_AsyncNotificationCompleted,
-    pdmR3DrvHlp_PDMThreadCreate,
-    pdmR3DrvHlp_PDMAsyncCompletionTemplateCreate,
-    pdmR3DrvHlp_PDMLdrGetRCInterfaceSymbols,
-    pdmR3DrvHlp_PDMLdrGetR0InterfaceSymbols,
+    pdmR3DrvHlp_ThreadCreate,
+    pdmR3DrvHlp_AsyncCompletionTemplateCreate,
+    pdmR3DrvHlp_LdrGetRCInterfaceSymbols,
+    pdmR3DrvHlp_LdrGetR0InterfaceSymbols,
+    pdmR3DrvHlp_CritSectInit,
     PDM_DRVHLPR3_VERSION /* u32TheEnd */
 };

trunk/src/VBox/VMM/PDMInternal.h

@@ -940 +940 @@
     /** List of registered drivers. (FIFO) */
     R3PTRTYPE(PPDMDRV)              pDrvs;
-    /** List of initialized critical sections. (LIFO) */
-    R3PTRTYPE(PPDMCRITSECTINT)      pCritSects;
     /** PCI Buses. */
     PDMPCIBUS                       aPciBuses[PDM_PCI_BUSSES_MAX];
@@ -965 +963 @@
     RTRCPTR                         uPadding1; /**< Alignment padding. */
 
+/** @name Move to PDMUSERPERVM
+ * @{
+ */
     /** Linked list of timer driven PDM queues. */
     R3PTRTYPE(struct PDMQUEUE *)    pQueuesTimer;
@@ -983 +984 @@
     /** Tail of the PDM Thread list. (singly linked) */
     R3PTRTYPE(PPDMTHREAD)           pThreadsTail;
+/** @}  */
 
     /** @name   PDM Async Completion
+     * @todo Move to PDMUSERPERVM
      * @{ */
     /** Pointer to the array of supported endpoint classes. */
@@ -1012 +1015 @@
      * the PIC, APIC, IOAPIC and PCI devices pluss some PDM functions. */
     PDMCRITSECT                     CritSect;
-    /** The PDM miscellancous lock.
-     * This is used to protect things like critsect init/delete that formerly was
-     * serialized by there only being one EMT.
-     */
-    RTCRITSECT                      MiscCritSect;
 
     /** Number of times a critical section leave requesed needed to be queued for ring-3 execution. */
@@ -1033 +1031 @@
 typedef struct PDMUSERPERVM
 {
+    /** @todo move more stuff over here. */
+
+    /** Lock protecting the lists below it. */
+    RTCRITSECT                      ListCritSect;
     /** Pointer to list of loaded modules. */
     PPDMMOD                         pModules;
-    /** @todo move more stuff over here. */
+    /** List of initialized critical sections. (LIFO) */
+    R3PTRTYPE(PPDMCRITSECTINT)      pCritSects;
+
 } PDMUSERPERVM;
 /** Pointer to the PDM data kept in the UVM. */
@@ -1095 +1099 @@
 *******************************************************************************/
 #ifdef IN_RING3
-int         pdmR3CritSectInit(PVM pVM);
-int         pdmR3CritSectTerm(PVM pVM);
+int         pdmR3CritSectInitStats(PVM pVM);
 void        pdmR3CritSectRelocate(PVM pVM);
 int         pdmR3CritSectInitDevice(PVM pVM, PPDMDEVINS pDevIns, PPDMCRITSECT pCritSect, RT_SRC_POS_DECL, const char *pszNameFmt, va_list va);
 int         pdmR3CritSectDeleteDevice(PVM pVM, PPDMDEVINS pDevIns);
+int         pdmR3CritSectInitDriver(PVM pVM, PPDMDRVINS pDrvIns, PPDMCRITSECT pCritSect, RT_SRC_POS_DECL, const char *pszNameFmt, ...);
+int         pdmR3CritSectDeleteDriver(PVM pVM, PPDMDRVINS pDrvIns);
 
 int         pdmR3DevInit(PVM pVM);

trunk/src/VBox/VMM/VM.cpp

@@ -707 +707 @@
             AssertRC(rc2);
         }
+
+        /*
+         * Do automatic cleanups while the VM structure is still alive and all
+         * references to it are still working.
+         */
+        PDMR3CritSectTerm(pVM);
 
         /*

trunk/src/VBox/VMM/testcase/tstVMStructRC.cpp

@@ -274 +274 @@
     GEN_CHECK_OFF(PDM, pUsbInstances);
     GEN_CHECK_OFF(PDM, pDrvs);
-    GEN_CHECK_OFF(PDM, pCritSects);
     GEN_CHECK_OFF(PDM, aPciBuses);
     GEN_CHECK_OFF(PDM, aPciBuses[0].iBus);