Changeset 37443 in vbox for trunk/src/VBox

Timestamp:

Jun 14, 2011 2:34:11 PM (14 years ago)

Author:

vboxsync

Message:

PDM: Implemented the NOP critical section.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IOMAll.cpp (modified) (1 diff)
• VMMAll/PDMAllCritSect.cpp (modified) (1 diff)
• VMMR3/PDM.cpp (modified) (2 diffs)
• VMMR3/PDMCritSect.cpp (modified) (2 diffs)
• VMMR3/PDMDevHlp.cpp (modified) (3 diffs)
• VMMR3/PDMLdr.cpp (modified) (8 diffs)
• include/PDMInternal.h (modified) (4 diffs)
• testcase/tstVMStructRC.cpp (modified) (2 diffs)

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

@@ -262 +262 @@
 VMMDECL(VBOXSTRICTRC) IOMIOPortRead(PVM pVM, RTIOPORT Port, uint32_t *pu32Value, size_t cbValue)
 {
+/** @todo should initialize *pu32Value here because it can happen that some
+ *        handle is buggy and doesn't handle all cases. */
     /* Take the IOM lock before performing any device I/O. */
     int rc2 = iomLock(pVM);

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

@@ -487 +487 @@
     AssertMsg(pCritSect->s.Core.u32Magic == RTCRITSECT_MAGIC, ("%p %RX32\n", pCritSect, pCritSect->s.Core.u32Magic));
     Assert(pCritSect->s.Core.u32Magic == RTCRITSECT_MAGIC);
+
+    /* Check for NOP sections before asserting ownership. */
+    if (pCritSect->s.Core.fFlags & RTCRITSECT_FLAGS_NOP)
+        return;
+
     Assert(pCritSect->s.Core.NativeThreadOwner == pdmCritSectGetNativeSelf(pCritSect));
     Assert(pCritSect->s.Core.cNestings >= 1);
-
-    /*
-     * Check for NOP sections.
-     */
-    if (pCritSect->s.Core.fFlags & RTCRITSECT_FLAGS_NOP)
-        return;
 
     /*

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

@@ -353 +353 @@
     AssertRelease(sizeof(pVM->pdm.s) <= sizeof(pVM->pdm.padding));
     AssertCompileMemberAlignment(PDM, CritSect, sizeof(uintptr_t));
+
     /*
      * Init the structure.
      */
-    pVM->pdm.s.offVM = RT_OFFSETOF(VM, pdm.s);
     pVM->pdm.s.GCPhysVMMDevHeap = NIL_RTGCPHYS;
 
     /*
-     * Initialize sub components.
+     * Initialize critical sections first.
      */
     int rc = pdmR3CritSectInitStats(pVM);
     if (RT_SUCCESS(rc))
         rc = PDMR3CritSectInit(pVM, &pVM->pdm.s.CritSect, RT_SRC_POS, "PDM");
+    if (RT_SUCCESS(rc))
+        rc = PDMR3CritSectInit(pVM, &pVM->pdm.s.GiantDevCritSect, RT_SRC_POS, "Giant PDM Dev");
+    if (RT_SUCCESS(rc))
+    {
+        rc = PDMR3CritSectInit(pVM, &pVM->pdm.s.NopCritSect, RT_SRC_POS, "NOP");
+        if (RT_SUCCESS(rc))
+            pVM->pdm.s.NopCritSect.s.Core.fFlags |= RTCRITSECT_FLAGS_NOP;
+    }
+
+    /*
+     * Initialize sub components.
+     */
     if (RT_SUCCESS(rc))
         rc = pdmR3LdrInitU(pVM->pUVM);
@@ -587 +599 @@
 {
     LogFlow(("PDMR3Term:\n"));
-    AssertMsg(pVM->pdm.s.offVM, ("bad init order!\n"));
+    AssertMsg(PDMCritSectIsInitialized(&pVM->pdm.s.CritSect), ("bad init order!\n"));
 
     /*

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

@@ -622 +622 @@
  * Leave all critical sections the calling thread owns.
  *
+ * This is only used when entering guru meditation in order to prevent other
+ * EMTs and I/O threads from deadlocking.
+ *
  * @param   pVM         The VM handle.
  */
-void PDMR3CritSectLeaveAll(PVM pVM)
+VMMR3DECL(void) PDMR3CritSectLeaveAll(PVM pVM)
 {
     RTNATIVETHREAD const hNativeSelf = RTThreadNativeSelf();
@@ -641 +644 @@
 }
 
+
+/**
+ * Gets the address of the NOP critical section.
+ *
+ * The NOP critical section will not perform any thread serialization but let
+ * all enter immediately and concurrently.
+ *
+ * @returns The address of the NOP critical section.
+ * @param   pVM                 The VM handle.
+ */
+VMMR3DECL(PPDMCRITSECT)             PDMR3CritSectGetNop(PVM pVM)
+{
+    VM_ASSERT_VALID_EXT_RETURN(pVM, NULL);
+    return &pVM->pdm.s.NopCritSect;
+}
+
+
+/**
+ * Gets the ring-0 address of the NOP critical section.
+ *
+ * @returns The ring-0 address of the NOP critical section.
+ * @param   pVM                 The VM handle.
+ */
+VMMR3DECL(R0PTRTYPE(PPDMCRITSECT))  PDMR3CritSectGetNopR0(PVM pVM)
+{
+    VM_ASSERT_VALID_EXT_RETURN(pVM, NIL_RTR0PTR);
+    return MMHyperR3ToR0(pVM, &pVM->pdm.s.NopCritSect);
+}
+
+
+/**
+ * Gets the raw-mode context address of the NOP critical section.
+ *
+ * @returns The raw-mode context address of the NOP critical section.
+ * @param   pVM                 The VM handle.
+ */
+VMMR3DECL(RCPTRTYPE(PPDMCRITSECT))  PDMR3CritSectGetNopRC(PVM pVM)
+{
+    VM_ASSERT_VALID_EXT_RETURN(pVM, NIL_RTRCPTR);
+    return MMHyperR3ToRC(pVM, &pVM->pdm.s.NopCritSect);
+}
+

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

@@ -1541 +1541 @@
     LogFlow(("pdmR3DevHlp_CritSectInit: caller='%s'/%d: returns %Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
     return rc;
+}
+
+
+/** @interface_method_impl{PDMDEVHLPR3,pfnCritSectGetNop} */
+static DECLCALLBACK(PPDMCRITSECT) pdmR3DevHlp_CritSectGetNop(PPDMDEVINS pDevIns)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    PVM pVM = pDevIns->Internal.s.pVMR3;
+    VM_ASSERT_EMT(pVM);
+
+    PPDMCRITSECT pCritSect = PDMR3CritSectGetNop(pVM);
+    LogFlow(("pdmR3DevHlp_CritSectGetNop: caller='%s'/%d: return %p\n",
+             pDevIns->pReg->szName, pDevIns->iInstance, pCritSect));
+    return pCritSect;
+}
+
+
+/** @interface_method_impl{PDMDEVHLPR3,pfnCritSectGetNopR0} */
+static DECLCALLBACK(R0PTRTYPE(PPDMCRITSECT)) pdmR3DevHlp_CritSectGetNopR0(PPDMDEVINS pDevIns)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    PVM pVM = pDevIns->Internal.s.pVMR3;
+    VM_ASSERT_EMT(pVM);
+
+    R0PTRTYPE(PPDMCRITSECT) pCritSect = PDMR3CritSectGetNopR0(pVM);
+    LogFlow(("pdmR3DevHlp_CritSectGetNopR0: caller='%s'/%d: return %RHv\n",
+             pDevIns->pReg->szName, pDevIns->iInstance, pCritSect));
+    return pCritSect;
+}
+
+
+/** @interface_method_impl{PDMDEVHLPR3,pfnCritSectGetNopRC} */
+static DECLCALLBACK(RCPTRTYPE(PPDMCRITSECT)) pdmR3DevHlp_CritSectGetNopRC(PPDMDEVINS pDevIns)
+{
+    PDMDEV_ASSERT_DEVINS(pDevIns);
+    PVM pVM = pDevIns->Internal.s.pVMR3;
+    VM_ASSERT_EMT(pVM);
+
+    RCPTRTYPE(PPDMCRITSECT) pCritSect = PDMR3CritSectGetNopRC(pVM);
+    LogFlow(("pdmR3DevHlp_CritSectGetNopRC: caller='%s'/%d: return %RRv\n",
+             pDevIns->pReg->szName, pDevIns->iInstance, pCritSect));
+    return pCritSect;
 }
 
@@ -3218 +3260 @@
     pdmR3DevHlp_QueueCreate,
     pdmR3DevHlp_CritSectInit,
+    pdmR3DevHlp_CritSectGetNop,
+    pdmR3DevHlp_CritSectGetNopR0,
+    pdmR3DevHlp_CritSectGetNopRC,
     pdmR3DevHlp_ThreadCreate,
     pdmR3DevHlp_SetAsyncNotification,
@@ -3430 +3475 @@
     pdmR3DevHlp_QueueCreate,
     pdmR3DevHlp_CritSectInit,
+    pdmR3DevHlp_CritSectGetNop,
+    pdmR3DevHlp_CritSectGetNopR0,
+    pdmR3DevHlp_CritSectGetNopRC,
     pdmR3DevHlp_ThreadCreate,
     pdmR3DevHlp_SetAsyncNotification,

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -247 +247 @@
      * Validate input.
      */
-    AssertMsg(pUVM->pVM->pdm.s.offVM, ("bad init order!\n"));
+    AssertMsg(PDMCritSectIsInitialized(&pUVM->pVM->pdm.s.CritSect), ("bad init order!\n"));
     Assert(pszFilename);
     size_t cchFilename = strlen(pszFilename);
@@ -441 +441 @@
      * Validate input.
      */
-    AssertMsg(pVM->pdm.s.offVM, ("bad init order!\n"));
+    AssertMsg(PDMCritSectIsInitialized(&pVM->pdm.s.CritSect), ("bad init order!\n"));
     PUVM     pUVM = pVM->pUVM;
     RTCritSectEnter(&pUVM->pdm.s.ListCritSect);
@@ -692 +692 @@
      * Validate input.
      */
-    AssertMsg(pVM->pdm.s.offVM, ("bad init order!\n"));
+    AssertPtr(pVM);
+    AssertPtr(pszModule);
+    AssertPtr(ppvValue);
+    AssertMsg(PDMCritSectIsInitialized(&pVM->pdm.s.CritSect), ("bad init order!\n"));
 
     /*
@@ -748 +751 @@
      * Validate input.
      */
-    AssertMsg(pVM->pdm.s.offVM, ("bad init order!\n"));
+    AssertPtr(pVM);
+    AssertPtrNull(pszModule);
+    AssertPtr(ppvValue);
+    AssertMsg(PDMCritSectIsInitialized(&pVM->pdm.s.CritSect), ("bad init order!\n"));
+
     if (!pszModule)
         pszModule = "VMMR0.r0";
@@ -800 +807 @@
 
 #else
+    AssertPtr(pVM);
+    AssertPtrNull(pszModule);
+    AssertPtr(ppvValue);
+    AssertMsg(PDMCritSectIsInitialized(&pVM->pdm.s.CritSect), ("bad init order!\n"));
+
     /*
      * Since we're lazy, we'll only check if the module is present
      * and hand it over to PDMR3LdrGetSymbolR0 when that's done.
      */
-    AssertMsg(pVM->pdm.s.offVM, ("bad init order!\n"));
     if (pszModule)
     {
@@ -847 +858 @@
      * Validate input.
      */
-    AssertMsg(pVM->pdm.s.offVM, ("bad init order!\n"));
+    AssertPtr(pVM);
+    AssertPtrNull(pszModule);
+    AssertPtr(pRCPtrValue);
+    AssertMsg(PDMCritSectIsInitialized(&pVM->pdm.s.CritSect), ("bad init order!\n"));
+
     if (!pszModule)
         pszModule = "VMMGC.gc";
@@ -907 +922 @@
 
 #else
+    AssertPtr(pVM);
+    AssertPtrNull(pszModule);
+    AssertPtr(pRCPtrValue);
+    AssertMsg(PDMCritSectIsInitialized(&pVM->pdm.s.CritSect), ("bad init order!\n"));
+
     /*
      * Since we're lazy, we'll only check if the module is present
      * and hand it over to PDMR3LdrGetSymbolRC when that's done.
      */
-    AssertMsg(pVM->pdm.s.offVM, ("bad init order!\n"));
     if (pszModule)
     {

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -940 +940 @@
 } PDMCPU;
 
-/**
- * Converts a PDM pointer into a VM pointer.
- * @returns Pointer to the VM structure the PDM is part of.
- * @param   pPDM   Pointer to PDM instance data.
- */
-#define PDM2VM(pPDM)  ( (PVM)((char*)pPDM - pPDM->offVM) )
-
 
 /**
@@ -954 +947 @@
 typedef struct PDM
 {
-    /** Offset to the VM structure.
-     * See PDM2VM(). */
-    RTUINT                          offVM;
-    RTUINT                          uPadding0; /**< Alignment padding.*/
+    /** The PDM lock.
+     * This is used to protect everything that deals with interrupts, i.e.
+     * the PIC, APIC, IOAPIC and PCI devices plus some PDM functions. */
+    PDMCRITSECT                     CritSect;
+
+    /** The giant PDM device lock.
+     * This is a temporary measure and will be removed. */
+    PDMCRITSECT                     GiantDevCritSect;
+
+    /** The NOP critical section.
+     * This is a dummy critical section that will not do any thread
+     * serialization but instead let all threads enter immediately and
+     * concurrently. */
+    PDMCRITSECT                     NopCritSect;
 
     /** List of registered devices. (FIFO) */
@@ -1014 +1017 @@
     /** @} */
 
-    /** The PDM lock.
-     * This is used to protect everything that deals with interrupts, i.e.
-     * the PIC, APIC, IOAPIC and PCI devices plus some PDM functions. */
-    PDMCRITSECT                     CritSect;
-
     /** Number of times a critical section leave request needed to be queued for ring-3 execution. */
     STAMCOUNTER                     StatQueuedCritSectLeaves;

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

@@ -290 +290 @@
 
     GEN_CHECK_SIZE(PDM);
-    GEN_CHECK_OFF(PDM, offVM);
+    GEN_CHECK_OFF(PDM, CritSect);
+    GEN_CHECK_OFF(PDM, GiantDevCritSect);
+    GEN_CHECK_OFF(PDM, NopCritSect);
     GEN_CHECK_OFF(PDM, pDevs);
     GEN_CHECK_OFF(PDM, pDevInstances);
@@ -364 +366 @@
     GEN_CHECK_OFF(PDM, pQueueFlushR0);
     GEN_CHECK_OFF(PDM, pQueueFlushRC);
-    GEN_CHECK_OFF(PDM, CritSect);
     GEN_CHECK_OFF(PDM, StatQueuedCritSectLeaves);