Changeset 87811 in vbox

Timestamp:

Feb 19, 2021 4:56:39 PM (4 years ago)

Author:

vboxsync

Message:

HDA: Use a PDMCRITSECT per stream instead of RTCRITSECT, to also allow access in R0. ticketoem2ref:36

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHDA.cpp (modified) (11 diffs)
• HDAStream.cpp (modified) (7 diffs)
• HDAStream.h (modified) (3 diffs)

trunk/src/VBox/Devices/Audio/DevHDA.cpp

@@ -1387 +1387 @@
         LogFunc(("[SD%RU8] Reset enter\n", uSD));
 
-        hdaR3StreamLock(pStreamR3);
+        hdaStreamLock(pStreamShared);
 
 # ifdef VBOX_WITH_AUDIO_HDA_ASYNC_IO
@@ -1400 +1400 @@
         hdaR3StreamAsyncIOUnlock(pStreamR3);
 # endif
-        hdaR3StreamUnlock(pStreamR3);
+        hdaStreamUnlock(pStreamShared);
     }
     else
@@ -1412 +1412 @@
             LogFunc(("[SD%RU8] State changed (fRun=%RTbool)\n", uSD, fRun));
 
-            hdaR3StreamLock(pStreamR3);
+            hdaStreamLock(pStreamShared);
 
             int rc2 = VINF_SUCCESS;
@@ -1506 +1506 @@
 # endif
             /* Make sure to leave the lock before (eventually) starting the timer. */
-            hdaR3StreamUnlock(pStreamR3);
+            hdaStreamUnlock(pStreamShared);
         }
     }
@@ -1526 +1526 @@
     AssertReturn(uSD < RT_ELEMENTS(pThis->aStreams), VERR_INTERNAL_ERROR_3); /* paranoia^2: Bad g_aHdaRegMap. */
     PHDASTATER3 const  pThisCC       = PDMDEVINS_2_DATA_CC(pDevIns, PHDASTATER3);
-    PHDASTREAMR3 const pStreamR3     = &pThisCC->aStreams[uSD];
     PHDASTREAM const   pStreamShared = &pThis->aStreams[uSD];
 
@@ -1539 +1538 @@
     }
 
-    hdaR3StreamLock(pStreamR3);
+    hdaStreamLock(pStreamShared);
 
     uint32_t v = HDA_REG_IND(pThis, iReg);
@@ -1625 +1624 @@
     if (cTransferTicks)
         PDMDevHlpTimerUnlockClock(pDevIns, pStreamShared->hTimer); /* Caller will unlock pThis->CritSect. */
-    hdaR3StreamUnlock(pStreamR3);
+    hdaStreamUnlock(pStreamShared);
     return VINF_SUCCESS;
 #else  /* !IN_RING3 */
@@ -2707 +2706 @@
                      pSink->pMixSink->pszName, pSink->pStreamShared->u8SD, pSink->pStreamShared->u8Channel));
 
-            hdaR3StreamLock(pSink->pStreamR3);
+            hdaStreamLock(pSink->pStreamShared);
 
             /* Only disable the stream if the stream descriptor # has changed. */
@@ -2715 +2714 @@
             pSink->pStreamR3->pMixSink = NULL;
 
-            hdaR3StreamUnlock(pSink->pStreamR3);
+            hdaStreamUnlock(pSink->pStreamShared);
 
             pSink->pStreamShared = NULL;
@@ -2730 +2729 @@
             PHDASTREAMR3 pStreamR3     = &pThisCC->aStreams[uSD];
             PHDASTREAM   pStreamShared = &pThis->aStreams[uSD];
-            hdaR3StreamLock(pStreamR3);
+            hdaStreamLock(pStreamShared);
 
             pSink->pStreamR3     = pStreamR3;
@@ -2738 +2737 @@
             pStreamR3->pMixSink      = pSink;
 
-            hdaR3StreamUnlock(pStreamR3);
+            hdaStreamUnlock(pStreamShared);
             rc = VINF_SUCCESS;
         }

trunk/src/VBox/Devices/Audio/HDAStream.cpp

@@ -75 +75 @@
 #endif
 
-# ifdef VBOX_WITH_AUDIO_HDA_ASYNC_IO
-    rc = RTCritSectInit(&pStreamR3->CritSect);
+#ifdef VBOX_WITH_AUDIO_HDA_ASYNC_IO
+    AssertPtr(pStreamR3->pHDAStateR3);
+    AssertPtr(pStreamR3->pHDAStateR3->pDevIns);
+    rc = PDMDevHlpCritSectInit(pStreamR3->pHDAStateR3->pDevIns, &pStreamShared->CritSect,
+                               RT_SRC_POS, "hda_sd#%RU8", pStreamShared->u8SD);
     AssertRCReturn(rc, rc);
-# endif
+#endif
 
     rc = hdaR3StreamPeriodCreate(&pStreamShared->State.Period);
@@ -175 +178 @@
 #endif
 
-# ifdef VBOX_WITH_AUDIO_HDA_ASYNC_IO
-    if (RTCritSectIsInitialized(&pStreamR3->CritSect))
-    {
-        rc2 = RTCritSectDelete(&pStreamR3->CritSect);
+#ifdef VBOX_WITH_AUDIO_HDA_ASYNC_IO
+    if (PDMCritSectIsInitialized(&pStreamShared->CritSect))
+    {
+        rc2 = PDMR3CritSectDelete(&pStreamShared->CritSect);
         AssertRC(rc2);
     }
-# endif
+#endif
 
     if (pStreamR3->State.pCircBuf)
@@ -1096 +1099 @@
 
     uint8_t const uSD = pStreamShared->u8SD;
-    hdaR3StreamLock(pStreamR3);
+    hdaStreamLock(pStreamShared);
 
     PHDASTREAMPERIOD pPeriod = &pStreamShared->State.Period;
@@ -1121 +1124 @@
     if (!fProceed)
     {
-        hdaR3StreamUnlock(pStreamR3);
+        hdaStreamUnlock(pStreamShared);
         return VINF_SUCCESS;
     }
@@ -1581 +1584 @@
     LogFlowFuncLeave();
 
-    hdaR3StreamUnlock(pStreamR3);
+    hdaStreamUnlock(pStreamShared);
 
     return VINF_SUCCESS;
@@ -1788 +1791 @@
  *
  * @returns IPRT status code.
- * @param   pStreamR3           HDA stream to lock (ring-3 bits).
- */
-void hdaR3StreamLock(PHDASTREAMR3 pStreamR3)
-{
-    AssertPtrReturnVoid(pStreamR3);
+ * @param   pStreamShared       HDA stream to lock (shared bits).
+ */
+void hdaStreamLock(PHDASTREAM pStreamShared)
+{
+    AssertPtrReturnVoid(pStreamShared);
 # ifdef VBOX_WITH_AUDIO_HDA_ASYNC_IO
-    int rc2 = RTCritSectEnter(&pStreamR3->CritSect);
+    int rc2 = PDMCritSectEnter(&pStreamShared->CritSect, VINF_SUCCESS);
     AssertRC(rc2);
-# else
-    Assert(PDMDevHlpCritSectIsOwner(pStream->pHDAState->pDevInsR3, pStream->pHDAState->CritSect));
-# endif
+#endif
 }
 
@@ -1805 +1806 @@
  *
  * @returns IPRT status code.
- * @param   pStreamR3           HDA stream to unlock (ring-3 bits).
- */
-void hdaR3StreamUnlock(PHDASTREAMR3 pStreamR3)
-{
-    AssertPtrReturnVoid(pStreamR3);
+ * @param   pStreamShared       HDA stream to unlock (shared bits).
+ */
+void hdaStreamUnlock(PHDASTREAM pStreamShared)
+{
+    AssertPtrReturnVoid(pStreamShared);
 # ifdef VBOX_WITH_AUDIO_HDA_ASYNC_IO
-    int rc2 = RTCritSectLeave(&pStreamR3->CritSect);
+    int rc2 = PDMCritSectLeave(&pStreamShared->CritSect);
     AssertRC(rc2);
 # endif

trunk/src/VBox/Devices/Audio/HDAStream.h

@@ -191 +191 @@
     uint8_t                     u8Channel;
     uint8_t                     abPadding0[6];
+#ifdef VBOX_WITH_AUDIO_HDA_ASYNC_IO
+    /** The stream's shared r0/r3 critical section to serialize access between the async I/O
+     *  thread and (basically) the guest. */
+    PDMCRITSECT                 CritSect;
+#endif
     /** DMA base address (SDnBDPU - SDnBDPL).
      *  Will be updated in hdaR3StreamInit(). */
@@ -238 +243 @@
     /** Pointer to HDA sink this stream is attached to. */
     R3PTRTYPE(PHDAMIXERSINK)    pMixSink;
-#ifdef VBOX_WITH_AUDIO_HDA_ASYNC_IO
-    /** The stream's critical section to serialize access between the async I/O
-     *  thread and (basically) the guest. */
-    RTCRITSECT                  CritSect;
-#endif
     /** Internal state of this stream. */
     struct
@@ -281 +281 @@
 bool                hdaR3StreamTransferIsScheduled(PHDASTREAM pStreamShared, uint64_t tsNow);
 uint64_t            hdaR3StreamTransferGetNext(PHDASTREAM pStreamShared);
-void                hdaR3StreamLock(PHDASTREAMR3 pStreamR3);
-void                hdaR3StreamUnlock(PHDASTREAMR3 pStreamR3);
+void                hdaStreamLock(PHDASTREAM pStreamShared);
+void                hdaStreamUnlock(PHDASTREAM pStreamShared);
 void                hdaR3StreamUpdate(PPDMDEVINS pDevIns, PHDASTATE pThis, PHDASTATER3 pThisCC,
                                       PHDASTREAM pStreamShared, PHDASTREAMR3 pStreamR3, bool fInTimer);