Changeset 26376 in vbox for trunk/src/VBox

Timestamp:

Feb 9, 2010 2:25:28 PM (15 years ago)

Author:

vboxsync

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

57469

Message:

HPET: reworking locking per Knut suggestions

Location:

trunk/src/VBox

Files:

• Devices/PC/DevHPET.cpp (modified) (7 diffs)
• VMM/PDMDevMiscHlp.cpp (modified) (2 diffs)
• VMM/VMMGC/PDMGCDevice.cpp (modified) (3 diffs)
• VMM/VMMR0/PDMR0Device.cpp (modified) (3 diffs)

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

@@ -177 +177 @@
     /* main counter */
     uint64_t             u64HpetCounter;
+
+    /* Global device lock */
+    PDMCRITSECT          csLock;
 } HpetState;
 
@@ -199 +202 @@
 static const bool fHpetLocking = true;
 
-DECLINLINE(int) hpetLock(HpetState* pThis)
+DECLINLINE(int) hpetLock(HpetState* pThis, int rcBusy)
 {
     if (!fHpetLocking)
-        return 0;
-
-    return pThis->CTX_SUFF(pHpetHlp)->pfnLock(pThis->CTX_SUFF(pDevIns),
-                                              VERR_INTERNAL_ERROR);
+        return VINF_SUCCESS;
+
+    return PDMCritSectEnter(&pThis->csLock, rcBusy);
 }
 
@@ -213 +215 @@
         return;
 
-    pThis->CTX_SUFF(pHpetHlp)->pfnUnlock(pThis->CTX_SUFF(pDevIns));
+    PDMCritSectLeave(&pThis->csLock);
 }
 
@@ -706 +708 @@
     LogFlow(("hpetMMIORead: %llx (%x)\n", (uint64_t)GCPhysAddr, iIndex));
 
-    rc = hpetLock(pThis);
-    AssertLogRelRCReturn(rc, rc);
+    rc = hpetLock(pThis, VINF_IOM_HC_MMIO_READ);
+    if (RT_UNLIKELY(rc != VINF_SUCCESS))
+        return rc;
 
     switch (cb)
@@ -748 +751 @@
              (uint64_t)GCPhysAddr, iIndex, *(uint32_t*)pv));
 
-    rc = hpetLock(pThis);
-    AssertLogRelRCReturn(rc, rc);
+    rc = hpetLock(pThis, VINF_IOM_HC_MMIO_WRITE);
+    if (RT_UNLIKELY(rc != VINF_SUCCESS))
+        return rc;
 
     switch (cb)
@@ -921 +925 @@
         return;
 
-    rc = hpetLock(pThis);
+    /* Lock in R3 must either block or succeed */
+    rc = hpetLock(pThis, VERR_IGNORED);
+    
     AssertLogRelRCReturnVoid(rc);
 
@@ -1122 +1128 @@
         return rc;
     }
+
+    /*
+     * Initialize critical section.
+     */
+    rc = PDMDevHlpCritSectInit(pDevIns, &pThis->csLock, RT_SRC_POS, "HPET");
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc, N_("HPET cannot initialize critical section"));
+
     /*
      * Register the MMIO range, PDM API requests page aligned

trunk/src/VBox/VMM/PDMDevMiscHlp.cpp

@@ -564 +564 @@
 }
 
-
-/** @interface_method_impl{PDMHPETHLPR3,pfnLock} */
-static DECLCALLBACK(int) pdmR3HpetHlp_Lock(PPDMDEVINS pDevIns, int rc)
-{
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-    LogFlow(("pdmR3HpetHlp_Lock: caller='%s'/%d: rc=%Rrc\n", pDevIns->pReg->szName, pDevIns->iInstance, rc));
-    return pdmLockEx(pDevIns->Internal.s.pVMR3, rc);
-}
-
-
-/** @interface_method_impl{PDMHPETHLPR3,pfnUnlock} */
-static DECLCALLBACK(void) pdmR3HpetHlp_Unlock(PPDMDEVINS pDevIns)
-{
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-    LogFlow(("pdmR3HpetHlp_Unlock: caller='%s'/%d:\n", pDevIns->pReg->szName, pDevIns->iInstance));
-    pdmUnlock(pDevIns->Internal.s.pVMR3);
-}
-
-
 /** @interface_method_impl{PDMHPETHLPR3,pfnGetRCHelpers} */
 static DECLCALLBACK(PCPDMHPETHLPRC) pdmR3HpetHlp_GetRCHelpers(PPDMDEVINS pDevIns)
@@ -620 +601 @@
     PDM_HPETHLPR3_VERSION,
     pdmR3HpetHlp_SetLegacyMode,
-    pdmR3HpetHlp_Lock,
-    pdmR3HpetHlp_Unlock,
     pdmR3HpetHlp_GetRCHelpers,
     pdmR3HpetHlp_GetR0Helpers,

trunk/src/VBox/VMM/VMMGC/PDMGCDevice.cpp

@@ -587 +587 @@
  */
 
-/** @interface_method_impl{PDMHPETHLPRC,pfnLock} */
-static DECLCALLBACK(int) pdmRCHpetHlp_Lock(PPDMDEVINS pDevIns, int rc)
-{
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-    return pdmLockEx(pDevIns->Internal.s.pVMRC, rc);
-}
-
-
-/** @interface_method_impl{PDMHPETHLPRC,pfnUnlock} */
-static DECLCALLBACK(void) pdmRCHpetHlp_Unlock(PPDMDEVINS pDevIns)
-{
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-    pdmUnlock(pDevIns->Internal.s.pVMRC);
-}
-
 
 /**
@@ -609 +594 @@
 {
     PDM_HPETHLPRC_VERSION,
-    pdmRCHpetHlp_Lock,
-    pdmRCHpetHlp_Unlock,
     PDM_HPETHLPRC_VERSION, /* the end */
 };
@@ -785 +768 @@
     }
 }
-

trunk/src/VBox/VMM/VMMR0/PDMR0Device.cpp

@@ -622 +622 @@
  */
 
-/** @interface_method_impl{PDMHPETHLPR0,pfnLock} */
-static DECLCALLBACK(int) pdmR0HpetHlp_Lock(PPDMDEVINS pDevIns, int rc)
-{
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-    return pdmLockEx(pDevIns->Internal.s.pVMR0, rc);
-}
-
-
-/** @interface_method_impl{PDMHPETHLPR0,pfnUnlock} */
-static DECLCALLBACK(void) pdmR0HpetHlp_Unlock(PPDMDEVINS pDevIns)
-{
-    PDMDEV_ASSERT_DEVINS(pDevIns);
-    pdmUnlock(pDevIns->Internal.s.pVMR0);
-}
-
-
 /**
  * The Ring-0 HPET Helper Callbacks.
@@ -644 +628 @@
 {
     PDM_HPETHLPR0_VERSION,
-    pdmR0HpetHlp_Lock,
-    pdmR0HpetHlp_Unlock,
     PDM_HPETHLPR0_VERSION, /* the end */
 };
@@ -818 +800 @@
     }
 }
-