Changeset 90503 in vbox for trunk/src/VBox/Devices/VMMDev/VMMDevState.h

Timestamp:

Aug 3, 2021 9:22:13 PM (3 years ago)

Author:

vboxsync

Message:

VMMDevTesting,bs3-locking-1: Expanded the locking test port to two ports, incorporating read/write CS and a EMT hold interval. bugref:6695

File:

• trunk/src/VBox/Devices/VMMDev/VMMDevState.h (modified) (2 diffs)

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -261 +261 @@
     uint32_t            StatMemBalloonChunks;
 
-    /** @name Testing
-     * @{ */
-    /** Set if testing is enabled. */
-    bool                fTestingEnabled;
-    /** Set if testing the MMIO testing range is enabled. */
-    bool                fTestingMMIO;
-    /** Alignment padding. */
-    bool                afPadding9[HC_ARCH_BITS == 32 ? 2 : 6];
-#if !defined(VBOX_WITHOUT_TESTING_FEATURES) || defined(DOXYGEN_RUNNING)
-    /** The high timestamp value. */
-    uint32_t            u32TestingHighTimestamp;
-    /** The current testing command (VMMDEV_TESTING_CMD_XXX). */
-    uint32_t            u32TestingCmd;
-    /** The testing data offset (command specific). */
-    uint32_t            offTestingData;
-    /** For buffering the what comes in over the testing data port. */
-    union
-    {
-        char            padding[1024];
-
-        /** VMMDEV_TESTING_CMD_INIT, VMMDEV_TESTING_CMD_SUB_NEW,
-         *  VMMDEV_TESTING_CMD_FAILED. */
-        struct
-        {
-            char        sz[1024];
-        } String, Init, SubNew, Failed;
-
-        /** VMMDEV_TESTING_CMD_TERM, VMMDEV_TESTING_CMD_SUB_DONE. */
-        struct
-        {
-            uint32_t    c;
-        } Error, Term, SubDone;
-
-        /** VMMDEV_TESTING_CMD_VALUE. */
-        struct
-        {
-            RTUINT64U   u64Value;
-            uint32_t    u32Unit;
-            char        szName[1024 - 8 - 4];
-        } Value;
-
-        /** The read back register (VMMDEV_TESTING_MMIO_OFF_READBACK,
-         *  VMMDEV_TESTING_MMIO_OFF_READBACK_R3). */
-        uint8_t         abReadBack[VMMDEV_TESTING_READBACK_SIZE];
-    } TestingData;
-    /** The locking testing control dword. */
-    union
-    {
-        /** Plain view. */
-        uint32_t        u32;
-        struct
-        {
-            /** Number of microseconds to hold the lock. Zero means disabled. */
-            uint32_t    cUsHold : 14;
-            /** Number of microseconds to wait before retaking the lock again. */
-            uint32_t    cUsBetween : 14;
-            /** Reserved MBZ. */
-            uint32_t    uReserved : 2;
-            /** Pass VINF_SUCCESS as rcBusy if set. */
-            uint32_t    fMustSucceed : 1;
-            /** Whether to poke EMTs before releasing it. */
-            uint32_t    fPokeBeforeRelease : 1;
-        } s;
-    } TestingLockControl;
-    /** Alignment padding.  */
-    uint32_t            uPadding10;
-    /** Event semaphore that the locking thread blocks. */
-    SUPSEMEVENT         hTestingLockEvt;
-    /** Handle for the I/O ports used by the testing component. */
-    IOMIOPORTHANDLE     hIoPortTesting;
-    /** Handle for the MMIO region used by the testing component. */
-    IOMMMIOHANDLE       hMmioTesting;
-#endif /* !VBOX_WITHOUT_TESTING_FEATURES || DOXYGEN_RUNNING */
-    /** @} */
-
     /** @name Heartbeat
      * @{ */
@@ -354 +279 @@
     /** Timer for signalling a flatlined guest. */
     TMTIMERHANDLE       hFlatlinedTimer;
+    /** @} */
+
+    /** @name Testing
+     * @{ */
+    /** Set if testing is enabled. */
+    bool                fTestingEnabled;
+    /** Set if testing the MMIO testing range is enabled. */
+    bool                fTestingMMIO;
+    /** Alignment padding. */
+    bool                afPadding9[2];
+#if !defined(VBOX_WITHOUT_TESTING_FEATURES) || defined(DOXYGEN_RUNNING)
+    /** The high timestamp value. */
+    uint32_t            u32TestingHighTimestamp;
+    /** The current testing command (VMMDEV_TESTING_CMD_XXX). */
+    uint32_t            u32TestingCmd;
+    /** The testing data offset (command specific). */
+    uint32_t            offTestingData;
+    /** For buffering the what comes in over the testing data port. */
+    union
+    {
+        char            padding[1024];
+
+        /** VMMDEV_TESTING_CMD_INIT, VMMDEV_TESTING_CMD_SUB_NEW,
+         *  VMMDEV_TESTING_CMD_FAILED. */
+        struct
+        {
+            char        sz[1024];
+        } String, Init, SubNew, Failed;
+
+        /** VMMDEV_TESTING_CMD_TERM, VMMDEV_TESTING_CMD_SUB_DONE. */
+        struct
+        {
+            uint32_t    c;
+        } Error, Term, SubDone;
+
+        /** VMMDEV_TESTING_CMD_VALUE. */
+        struct
+        {
+            RTUINT64U   u64Value;
+            uint32_t    u32Unit;
+            char        szName[1024 - 8 - 4];
+        } Value;
+
+        /** The read back register (VMMDEV_TESTING_MMIO_OFF_READBACK,
+         *  VMMDEV_TESTING_MMIO_OFF_READBACK_R3). */
+        uint8_t         abReadBack[VMMDEV_TESTING_READBACK_SIZE];
+    } TestingData;
+    /** The locking testing control dword. */
+    union
+    {
+        /** Plain view. */
+        uint64_t        u64;
+        /** Plain 32-bit view. */
+        uint32_t        au32[2];
+        struct
+        {
+            /** bits 15:0: Number of microseconds to hold the lock. */
+            uint32_t    cUsHold : 16;
+            /** bits 31:16: Number of microseconds to wait before retaking the lock again. */
+            uint32_t    cUsBetween : 16;
+            /** bits 51:32: Kilo (1024) ticks the EMT should hold the lock for. */
+            uint32_t    cKiloTicksEmtHold : 20;
+            /** bits 57:52: Reserved MBZ. */
+            uint32_t    uReserved : 6;
+            /** bit 58: Thread takes lock in shared mode when set, exclusive when clear.  */
+            uint32_t    fThreadShared : 1;
+            /** bit 59: EMT takes lock in shared mode when set, exclusive when clear.  */
+            uint32_t    fEmtShared : 1;
+            /** bit 60: Use read/write critical section instead of regular.  */
+            uint32_t    fReadWriteSection : 1;
+            /** bit 61: EMT passes VINF_SUCCESS as rcBusy if set. */
+            uint32_t    fMustSucceed : 1;
+            /** bit 62: Thread pokes EMTs before releasing it when set. */
+            uint32_t    fPokeBeforeRelease : 1;
+            /** bit 63: Enabled/disabled. */
+            uint32_t    fEnabled : 1;
+        } s;
+    } TestingLockControl;
+    /** Event semaphore that the locking thread blocks. */
+    SUPSEMEVENT         hTestingLockEvt;
+# if HC_ARCH_BITS == 32
+    uint32_t            uPadding10;
+# endif
+    /** Handle for the I/O ports used by the testing component. */
+    IOMIOPORTHANDLE     hIoPortTesting;
+    /** Handle for the MMIO region used by the testing component. */
+    IOMMMIOHANDLE       hMmioTesting;
+    /** Read write critical section of lock testing. */
+    PDMCRITSECTRW       CritSectRw;
+#endif /* !VBOX_WITHOUT_TESTING_FEATURES || DOXYGEN_RUNNING */
     /** @} */