Changeset 90462 in vbox for trunk/src

Timestamp:

Aug 1, 2021 9:27:16 PM (4 years ago)

Author:

vboxsync

Message:

VMMDev: New port for lock contention testing. [grr] bugref:6695

File:

• trunk/src/VBox/Devices/VMMDev/VMMDevTesting.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/VMMDev/VMMDevTesting.cpp

@@ -582 +582 @@
                 }
 
-                /*
-                 * Configure the locking contention test.
-                 */
-                case VMMDEV_TESTING_IOPORT_LOCKED - VMMDEV_TESTING_IOPORT_BASE:
-                    switch (cb)
-                    {
-                        case 4:
-                        case 2:
-                        case 1:
-                        {
-                            int rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VINF_SUCCESS);
-                            AssertRCReturn(rc, rc);
-
-                            u32 &= ~VMMDEV_TESTING_LOCKED_MBZ_MASK;
-                            if (pThis->TestingLockControl.u32 != u32)
-                            {
-                                pThis->TestingLockControl.u32 = u32;
-                                PDMDevHlpSUPSemEventSignal(pDevIns, pThis->hTestingLockEvt);
-                            }
-
-                            PDMDevHlpCritSectLeave(pDevIns, &pThis->CritSect);
-                            return VINF_SUCCESS;
-                        }
-
-                        default:
-                            AssertFailed();
-                            return VERR_INTERNAL_ERROR_2;
-                    }
-
                 default:
                     break;
@@ -617 +588 @@
             return VINF_SUCCESS;
         }
+
+        /*
+         * Configure the locking contention test.
+         */
+        case VMMDEV_TESTING_IOPORT_LOCKED - VMMDEV_TESTING_IOPORT_BASE:
+            switch (cb)
+            {
+                case 4:
+                case 2:
+                case 1:
+                {
+                    int rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VINF_SUCCESS);
+                    AssertRCReturn(rc, rc);
+
+                    u32 &= ~VMMDEV_TESTING_LOCKED_MBZ_MASK;
+                    if (pThis->TestingLockControl.u32 != u32)
+                    {
+                        pThis->TestingLockControl.u32 = u32;
+                        PDMDevHlpSUPSemEventSignal(pDevIns, pThis->hTestingLockEvt);
+                    }
+
+                    PDMDevHlpCritSectLeave(pDevIns, &pThis->CritSect);
+                    return VINF_SUCCESS;
+                }
+
+                default:
+                    AssertFailed();
+                    return VERR_INTERNAL_ERROR_2;
+            }
 
         default:
@@ -695 +695 @@
             }
             break;
+
+        /*
+         * Just return the current locking configuration value after first
+         * acquiring the lock of course.
+         */
+        case VMMDEV_TESTING_IOPORT_LOCKED - VMMDEV_TESTING_IOPORT_BASE:
+            switch (cb)
+            {
+                case 4:
+                case 2:
+                case 1:
+                {
+                    int rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VINF_SUCCESS);
+                    AssertRCReturn(rc, rc);
+
+                    *pu32 = pThis->TestingLockControl.u32;
+
+                    PDMDevHlpCritSectLeave(pDevIns, &pThis->CritSect);
+                    return VINF_SUCCESS;
+                }
+
+                default:
+                    AssertFailed();
+                    return VERR_INTERNAL_ERROR_2;
+            }
 
         /*