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

Timestamp:

Aug 7, 2021 1:32:25 PM (4 years ago)

Author:

vboxsync

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

146179

Message:

VMM/PDMCritSectRw: Added message and LogRel to pdmCritSectRwCorrupted. bugref:6695

File:

• trunk/src/VBox/VMM/VMMAll/PDMAllCritSectRw.cpp (modified) (10 diffs)

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

@@ -93 +93 @@
 
 
-DECL_NO_INLINE(static, int) pdmCritSectRwCorrupted(PPDMCRITSECTRW pThis)
+DECL_NO_INLINE(static, int) pdmCritSectRwCorrupted(PPDMCRITSECTRW pThis, const char *pszMsg)
 {
     ASMAtomicWriteU32(&pThis->s.Core.u32Magic, PDMCRITSECTRW_MAGIC_CORRUPT);
+    LogRel(("PDMCritSect: %s pCritSect=%p\n", pszMsg, pThis));
     return VERR_PDM_CRITSECTRW_IPE;
 }
@@ -333 +334 @@
                                 u64OldState = u64State = ASMAtomicReadU64(&pThis->s.Core.u64State);
                                 c = (u64State & RTCSRW_CNT_RD_MASK) >> RTCSRW_CNT_RD_SHIFT;
-                                AssertReturn(c > 0, pdmCritSectRwCorrupted(pThis));
+                                AssertReturn(c > 0, pdmCritSectRwCorrupted(pThis, "Invalid read count on bailout"));
                                 c--;
                                 cWait = (u64State & RTCSRW_WAIT_CNT_RD_MASK) >> RTCSRW_WAIT_CNT_RD_SHIFT;
-                                AssertReturn(cWait > 0, pdmCritSectRwCorrupted(pThis));
+                                AssertReturn(cWait > 0, pdmCritSectRwCorrupted(pThis, "Invalid waiting read count on bailout"));
                                 cWait--;
                                 u64State &= ~(RTCSRW_CNT_RD_MASK | RTCSRW_WAIT_CNT_RD_MASK);
@@ -359 +360 @@
 
                         cWait = (u64State & RTCSRW_WAIT_CNT_RD_MASK) >> RTCSRW_WAIT_CNT_RD_SHIFT;
-                        AssertReturn(cWait > 0, pdmCritSectRwCorrupted(pThis));
+                        AssertReturn(cWait > 0, pdmCritSectRwCorrupted(pThis, "Invalid waiting read count"));
                         cWait--;
                         u64State &= ~RTCSRW_WAIT_CNT_RD_MASK;
@@ -657 +658 @@
                                                      == ((uintptr_t)pThis & PAGE_OFFSET_MASK),
                                                   ("%p vs %p\n", pVCpu->pdm.s.apQueuedCritSectRwShrdLeaves[i], pThis),
-                                                  pdmCritSectRwCorrupted(pThis));
+                                                  pdmCritSectRwCorrupted(pThis, "Invalid self pointer"));
                     VMCPU_FF_SET(pVCpu, VMCPU_FF_PDM_CRITSECT);
                     VMCPU_FF_SET(pVCpu, VMCPU_FF_TO_R3);
@@ -693 +694 @@
 #endif
         uint32_t cDepth = ASMAtomicDecU32(&pThis->s.Core.cWriterReads);
-        AssertReturn(cDepth < PDM_CRITSECTRW_MAX_RECURSIONS, pdmCritSectRwCorrupted(pThis));
+        AssertReturn(cDepth < PDM_CRITSECTRW_MAX_RECURSIONS, pdmCritSectRwCorrupted(pThis, "too many writer-read recursions"));
     }
 
@@ -923 +924 @@
                         u64OldState = u64State = ASMAtomicReadU64(&pThis->s.Core.u64State);
                         uint64_t c = (u64State & RTCSRW_CNT_WR_MASK) >> RTCSRW_CNT_WR_SHIFT;
-                        AssertReturn(c > 0, pdmCritSectRwCorrupted(pThis));
+                        AssertReturn(c > 0, pdmCritSectRwCorrupted(pThis, "Invalid write count on bailout"));
                         c--;
                         u64State &= ~RTCSRW_CNT_WR_MASK;
@@ -958 +959 @@
                 u64OldState = u64State = ASMAtomicReadU64(&pThis->s.Core.u64State);
                 uint64_t c = (u64State & RTCSRW_CNT_WR_MASK) >> RTCSRW_CNT_WR_SHIFT;
-                AssertReturn(c > 0, pdmCritSectRwCorrupted(pThis));
+                AssertReturn(c > 0, pdmCritSectRwCorrupted(pThis, "Invalid write count on bailout"));
                 c--;
                 u64State &= ~RTCSRW_CNT_WR_MASK;
@@ -1208 +1209 @@
 
                 uint64_t c = (u64State & RTCSRW_CNT_WR_MASK) >> RTCSRW_CNT_WR_SHIFT;
-                AssertReturn(c > 0, pdmCritSectRwCorrupted(pThis));
+                AssertReturn(c > 0, pdmCritSectRwCorrupted(pThis, "Invalid write count on leave"));
                 c--;
 
@@ -1268 +1269 @@
                                              == ((uintptr_t)pThis & PAGE_OFFSET_MASK),
                                           ("%p vs %p\n", pVCpu->pdm.s.apQueuedCritSectRwExclLeaves[i], pThis),
-                                          pdmCritSectRwCorrupted(pThis));
+                                          pdmCritSectRwCorrupted(pThis, "Invalid self pointer on queue (excl)"));
             VMCPU_FF_SET(pVCpu, VMCPU_FF_PDM_CRITSECT);
             VMCPU_FF_SET(pVCpu, VMCPU_FF_TO_R3);
@@ -1292 +1293 @@
 #endif
         uint32_t const cDepth = ASMAtomicDecU32(&pThis->s.Core.cWriteRecursions);
-        AssertReturn(cDepth != 0 && cDepth < UINT32_MAX, pdmCritSectRwCorrupted(pThis));
+        AssertReturn(cDepth != 0 && cDepth < UINT32_MAX, pdmCritSectRwCorrupted(pThis, "Invalid write recursion value on leave"));
     }