Changeset 88164 in vbox

Timestamp:

Mar 17, 2021 5:13:24 PM (4 years ago)

Author:

vboxsync

Message:

DevHDA: Remove the FIFO buffer. Try align the stream state on cache lines. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevHDA.cpp (modified) (1 diff)
• DevHDA.h (modified) (2 diffs)
• DevHDACommon.h (modified) (1 diff)
• HDAStream.cpp (modified) (1 diff)
• HDAStream.h (modified) (3 diffs)

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

@@ -499 +499 @@
     SSMFIELD_ENTRY(HDABDLESTATELEGACY, u32BDLIndex),
     SSMFIELD_ENTRY(HDABDLESTATELEGACY, cbBelowFIFOW),
-    SSMFIELD_ENTRY_OLD(FIFO,           HDA_FIFO_MAX), /* Deprecated; now is handled in the stream's circular buffer. */
+    SSMFIELD_ENTRY_OLD(FIFO,           256),            /* Deprecated; now is handled in the stream's circular buffer. */
     SSMFIELD_ENTRY(HDABDLESTATELEGACY, u32BufOff),
     SSMFIELD_ENTRY_TERM()

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

@@ -82 +82 @@
     /** Critical section protecting the HDA state. */
     PDMCRITSECT             CritSect;
+    /** Internal stream states (aligned on 64 byte boundrary). */
+    HDASTREAM               aStreams[HDA_MAX_STREAMS];
     /** The HDA's register set. */
     uint32_t                au32Regs[HDA_NUM_REGS];
-    /** Internal stream states. */
-    HDASTREAM               aStreams[HDA_MAX_STREAMS];
     /** CORB buffer base address. */
     uint64_t                u64CORBBase;
@@ -215 +215 @@
     uint64_t                uAlignmentCheckMagic;
 } HDASTATE;
+AssertCompileMemberAlignment(HDASTATE, aStreams, 64);
 /** Pointer to a shared HDA device state.  */
 typedef HDASTATE *PHDASTATE;

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

@@ -103 +103 @@
  * Other values not listed are not supported.
  */
-/** Maximum FIFO size (in bytes). */
-#define HDA_FIFO_MAX                256
 
 /** Default timer frequency (in Hz).

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

@@ -477 +477 @@
     const uint32_t u32CBL     = HDA_STREAM_REG(pThis, CBL, uSD);
     const uint8_t  u8FIFOS    = HDA_STREAM_REG(pThis, FIFOS, uSD) + 1;
-          uint8_t  u8FIFOW    = hdaSDFIFOWToBytes(HDA_STREAM_REG(pThis, FIFOW, uSD));
+    uint8_t        u8FIFOW    = hdaSDFIFOWToBytes(HDA_STREAM_REG(pThis, FIFOW, uSD));
     const uint16_t u16FMT     = HDA_STREAM_REG(pThis, FMT, uSD);
 

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

@@ -234 +234 @@
 typedef struct HDASTREAM
 {
+    /** Internal state of this stream. */
+    HDASTREAMSTATE              State;
+
     /** Stream descriptor number (SDn). */
     uint8_t                     u8SD;
@@ -239 +242 @@
      *  For a stereo stream, this is u8Channel + 1. */
     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(). */
+    /** FIFO Watermark (checked + translated in bytes, FIFOW).
+     * This will be update from hdaRegWriteSDFIFOW() and also copied
+     * hdaR3StreamInit() for some reason. */
+    uint8_t                     u8FIFOW;
+
+    /** @name Register values at stream setup.
+     * These will all be copied in hdaR3StreamInit().
+     * @{ */
+    /** FIFO Size (checked + translated in bytes, FIFOS).
+     * This is supposedly the max number of bytes we'll be DMA'ing in one chunk
+     * and correspondingly the LPIB & wall clock update jumps.  However, we're
+     * not at all being honest with the guest about this. */
+    uint8_t                     u8FIFOS;
+    /** Cyclic Buffer Length (SDnCBL) - Represents the size of the ring buffer. */
+    uint32_t                    u32CBL;
+    /** Last Valid Index (SDnLVI). */
+    uint16_t                    u16LVI;
+    /** Format (SDnFMT). */
+    uint16_t                    u16FMT;
+    uint8_t                     abPadding[4];
+    /** DMA base address (SDnBDPU - SDnBDPL). */
     uint64_t                    u64BDLBase;
-    /** Cyclic Buffer Length (SDnCBL).
-     *  Represents the size of the ring buffer.
-     *  Will be updated in hdaR3StreamInit(). */
-    uint32_t                    u32CBL;
-    /** Format (SDnFMT).
-     *  Will be updated in hdaR3StreamInit(). */
-    uint16_t                    u16FMT;
-    /** FIFO Size (checked + translated in bytes, FIFOS).
-     *  Maximum number of bytes that may have been DMA'd into
-     *  memory but not yet transmitted on the link.
-     *
-     *  Will be updated in hdaR3StreamInit(). */
-    uint8_t                     u8FIFOS;
-    /** FIFO Watermark (checked + translated in bytes, FIFOW). */
-    uint8_t                     u8FIFOW;
-    uint8_t                     abPadding1[2];
-    /** FIFO scratch buffer, to avoid intermediate (re-)allocations. */
-    uint8_t                     abFIFO[HDA_FIFO_MAX + 1];
-    /** Last Valid Index (SDnLVI).
-     *  Will be updated in hdaR3StreamInit(). */
-    uint16_t                    u16LVI;
+    /** @} */
+
     /** The timer for pumping data thru the attached LUN drivers. */
     TMTIMERHANDLE               hTimer;
-    /** Internal state of this stream. */
-    HDASTREAMSTATE              State;
+
+#ifdef VBOX_WITH_AUDIO_HDA_ASYNC_IO
+    /** Pad the structure size to a 64 byte alignment. */
+    uint64_t                    au64Padding1[2];
+    /** Critical section for serialize access to the stream state between the async
+     * I/O thread and (basically) the guest. */
+    PDMCRITSECT                 CritSect;
+#endif
 } HDASTREAM;
+AssertCompileMemberAlignment(HDASTREAM, State.aBdl, 16);
+AssertCompileMemberAlignment(HDASTREAM, State.aSchedule, 16);
+AssertCompileSizeAlignment(HDASTREAM, 64);
 /** Pointer to an HDA stream (SDI / SDO).  */
 typedef HDASTREAM *PHDASTREAM;
@@ -320 +326 @@
     /** Debug bits. */
     HDASTREAMDEBUG              Dbg;
+    uint64_t                    au64Alignment[2];
 } HDASTREAMR3;
+AssertCompileSizeAlignment(HDASTREAMR3, 64);
 /** Pointer to an HDA stream (SDI / SDO).  */
 typedef HDASTREAMR3 *PHDASTREAMR3;