Changeset 37582 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Jun 22, 2011 9:24:45 AM (14 years ago)

Author:

vboxsync

Message:

PDMCritSect: Fixed PDMCritSectIsOwner[Ex] returning true in ring-0/rawmode when it should not.

File:

• trunk/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp (modified) (4 diffs)

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

@@ -210 +210 @@
         ASMAtomicIncS32(&pCritSect->s.Core.cNestings);
         Assert(pCritSect->s.Core.cNestings > 1);
-        ASMAtomicAndU32(&pCritSect->s.Core.fFlags, ~PDMCRITSECT_FLAGS_PENDING_UNLOCK);
         return VINF_SUCCESS;
     }
@@ -418 +417 @@
         ASMAtomicIncS32(&pCritSect->s.Core.cNestings);
         Assert(pCritSect->s.Core.cNestings > 1);
-        ASMAtomicAndU32(&pCritSect->s.Core.fFlags, ~PDMCRITSECT_FLAGS_PENDING_UNLOCK);
         return VINF_SUCCESS;
     }
@@ -683 +681 @@
     if (pCritSect->s.Core.NativeThreadOwner != pVCpu->hNativeThread)
         return false;
-    return (pCritSect->s.Core.fFlags & PDMCRITSECT_FLAGS_PENDING_UNLOCK) == 0;
+    return (pCritSect->s.Core.fFlags & PDMCRITSECT_FLAGS_PENDING_UNLOCK) == 0
+        || pCritSect->s.Core.cNestings > 1;
 #endif
 }
@@ -694 +693 @@
  * @returns false if not owner.
  * @param   pCritSect   The critical section.
- * @param   idCpu       VCPU id
- */
-VMMDECL(bool) PDMCritSectIsOwnerEx(PCPDMCRITSECT pCritSect, VMCPUID idCpu)
+ * @param   pVCpu       The virtual CPU handle.
+ */
+VMMDECL(bool) PDMCritSectIsOwnerEx(PCPDMCRITSECT pCritSect, PVMCPU pVCpu)
 {
 #ifdef IN_RING3
-    NOREF(idCpu);
+    NOREF(pVCpu);
     return RTCritSectIsOwner(&pCritSect->s.Core);
 #else
-    PVM pVM = pCritSect->s.CTX_SUFF(pVM);
-    AssertPtr(pVM);
-    Assert(idCpu < pVM->cCpus);
-    return pCritSect->s.Core.NativeThreadOwner == pVM->aCpus[idCpu].hNativeThread
-        && (pCritSect->s.Core.fFlags & PDMCRITSECT_FLAGS_PENDING_UNLOCK) == 0;
-#endif
-}
-
-
-/**
- * Checks if somebody currently owns the critical section.
- *
- * @returns true if locked.
- * @returns false if not locked.
- *
- * @param   pCritSect   The critical section.
- *
- * @remarks This doesn't prove that no deadlocks will occur later on; it's
- *          just a debugging tool
- */
-VMMDECL(bool) PDMCritSectIsOwned(PCPDMCRITSECT pCritSect)
-{
-    return pCritSect->s.Core.NativeThreadOwner != NIL_RTNATIVETHREAD
-        && (pCritSect->s.Core.fFlags & PDMCRITSECT_FLAGS_PENDING_UNLOCK) == 0;
+    Assert(&pVCpu->CTX_SUFF(pVM)->aCpus[pVCpu->idCpu] == pVCpu);
+    if (pCritSect->s.Core.NativeThreadOwner != pVCpu->hNativeThread)
+        return false;
+    return (pCritSect->s.Core.fFlags & PDMCRITSECT_FLAGS_PENDING_UNLOCK) == 0
+        || pCritSect->s.Core.cNestings > 1;
+#endif
 }