Changeset 90910 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 26, 2021 12:58:20 PM (3 years ago)

Author:

vboxsync

Message:

VMM/PDMCritSect[Rw]Enter*: Don't set cNsMaxTotal back to RT_NS_1MIN after we've entered non-interruptible mode. bugref:6695

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PDMAllCritSect.cpp (modified) (2 diffs)
• PDMAllCritSectRw.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp

@@ -206 +206 @@
 # else /* IN_RING0 */
     uint64_t const          tsStart     = RTTimeNanoTS();
-    uint64_t                cNsMaxTotal = RT_NS_5MIN;
+    uint64_t const          cNsMaxTotalDef = RT_NS_5MIN;
+    uint64_t                cNsMaxTotal = cNsMaxTotalDef;
     uint64_t const          cNsMaxRetry = RT_NS_15SEC;
     uint32_t                cMsMaxOne   = RT_MS_5SEC;
@@ -283 +284 @@
             AssertMsg(rcTerm == VINF_SUCCESS || rcTerm == VERR_NOT_SUPPORTED || rcTerm == VINF_THREAD_IS_TERMINATING,
                       ("rcTerm=%Rrc\n", rcTerm));
-            if (rcTerm == VERR_NOT_SUPPORTED)
+            if (rcTerm == VERR_NOT_SUPPORTED && cNsMaxTotal == cNsMaxTotalDef)
                 cNsMaxTotal = RT_NS_1MIN;
 

trunk/src/VBox/VMM/VMMAll/PDMAllCritSectRw.cpp

@@ -390 +390 @@
 # ifdef IN_RING0
     uint64_t const          tsStart           = RTTimeNanoTS();
-    uint64_t                cNsMaxTotal       = RT_NS_5MIN;
+    uint64_t const          cNsMaxTotalDef    = RT_NS_5MIN;
+    uint64_t                cNsMaxTotal       = cNsMaxTotalDef;
     uint32_t                cMsMaxOne         = RT_MS_5SEC;
     bool                    fNonInterruptible = false;
@@ -455 +456 @@
                 AssertMsg(rcTerm == VINF_SUCCESS || rcTerm == VERR_NOT_SUPPORTED || rcTerm == VINF_THREAD_IS_TERMINATING,
                           ("rcTerm=%Rrc\n", rcTerm));
-                if (rcTerm == VERR_NOT_SUPPORTED)
+                if (rcTerm == VERR_NOT_SUPPORTED && cNsMaxTotal == cNsMaxTotalDef)
                     cNsMaxTotal = RT_NS_1MIN;
 
@@ -1148 +1149 @@
 # ifdef IN_RING0
     uint64_t const          tsStart           = RTTimeNanoTS();
-    uint64_t                cNsMaxTotal       = RT_NS_5MIN;
+    uint64_t const          cNsMaxTotalDef    = RT_NS_5MIN;
+    uint64_t                cNsMaxTotal       = cNsMaxTotalDef;
     uint32_t                cMsMaxOne         = RT_MS_5SEC;
     bool                    fNonInterruptible = false;
@@ -1215 +1217 @@
                 AssertMsg(rcTerm == VINF_SUCCESS || rcTerm == VERR_NOT_SUPPORTED || rcTerm == VINF_THREAD_IS_TERMINATING,
                           ("rcTerm=%Rrc\n", rcTerm));
-                if (rcTerm == VERR_NOT_SUPPORTED)
+                if (rcTerm == VERR_NOT_SUPPORTED && cNsMaxTotal == cNsMaxTotalDef)
                     cNsMaxTotal = RT_NS_1MIN;