Changeset 90467 in vbox for trunk/src/VBox/Devices/VMMDev

Timestamp:

Aug 2, 2021 10:57:30 AM (4 years ago)

Author:

vboxsync

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

146071

Message:

VMMDev/Testing: Added VMMDEV_TESTING_LOCKED_BUSY_SUCCESS flag so we can test both regular return-to-ring-3 on contention and must-get-the-lock-no-matter-wath code paths. bugref:6695

Location:

trunk/src/VBox/Devices/VMMDev

Files:

• VMMDevState.h (modified) (1 diff)
• VMMDevTesting.cpp (modified) (2 diffs)

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

@@ -318 +318 @@
             uint32_t    cUsBetween : 14;
             /** Reserved MBZ. */
-            uint32_t    uReserved : 3;
+            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;

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

@@ -599 +599 @@
                 case 1:
                 {
-                    int rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VINF_SUCCESS);
-                    AssertRCReturn(rc, rc);
+#ifndef IN_RING3
+                    if (!pThis->TestingLockControl.s.fMustSucceed)
+                    {
+                        int rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VINF_IOM_R3_IOPORT_WRITE);
+                        if (rc != VINF_SUCCESS)
+                            return rc;
+                    }
+                    else
+#endif
+                    {
+                        int rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VINF_SUCCESS);
+                        AssertRCReturn(rc, rc);
+                    }
 
                     u32 &= ~VMMDEV_TESTING_LOCKED_MBZ_MASK;
@@ -707 +718 @@
                 case 1:
                 {
-                    int rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VINF_SUCCESS);
-                    AssertRCReturn(rc, rc);
+#ifndef IN_RING3
+                    if (!pThis->TestingLockControl.s.fMustSucceed)
+                    {
+                        int rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VINF_IOM_R3_IOPORT_READ);
+                        if (rc != VINF_SUCCESS)
+                            return rc;
+                    }
+                    else
+#endif
+                    {
+                        int rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VINF_SUCCESS);
+                        AssertRCReturn(rc, rc);
+                    }
 
                     *pu32 = pThis->TestingLockControl.u32;