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

Timestamp:

Dec 27, 2013 2:44:05 PM (11 years ago)

Author:

vboxsync

Message:

VMMRZCallRing3Disable,VMMRZCallRing3Enable: Made them preemption aware. ASSUMING that this only applies to ring-0 as we're normally running with interrupts disabled in raw-mode.

File:

• trunk/src/VBox/VMM/VMMRZ/VMMRZ.cpp (modified) (5 diffs)

trunk/src/VBox/VMM/VMMRZ/VMMRZ.cpp

@@ -26 +26 @@
 
 #include <iprt/assert.h>
+#include <iprt/asm-amd64-x86.h>
 #include <iprt/string.h>
 
@@ -128 +129 @@
 {
     VMCPU_ASSERT_EMT(pVCpu);
+#if defined(LOG_ENABLED) && defined(IN_RING0)
+    RTCCUINTREG fFlags = ASMIntDisableFlags(); /* preemption consistency. */
+#endif
+
     Assert(pVCpu->vmm.s.cCallRing3Disabled < 16);
-    if (++pVCpu->vmm.s.cCallRing3Disabled == 1)
+    if (ASMAtomicIncU32(&pVCpu->vmm.s.cCallRing3Disabled) == 1) /** @todo replace with unordered variant (ASMAtomicUoIncU32). */
     {
         /** @todo it might make more sense to just disable logging here, then we
@@ -142 +147 @@
 #endif
     }
+
+#if defined(LOG_ENABLED) && defined(IN_RING0)
+    ASMSetFlags(fFlags);
+#endif
 }
 
@@ -154 +163 @@
 {
     VMCPU_ASSERT_EMT(pVCpu);
+#if defined(LOG_ENABLED) && defined(IN_RING0)
+    RTCCUINTREG fFlags = ASMIntDisableFlags(); /* preemption consistency. */
+#endif
+
     Assert(pVCpu->vmm.s.cCallRing3Disabled > 0);
-    if (--pVCpu->vmm.s.cCallRing3Disabled == 0)
+    if (ASMAtomicDecU32(&pVCpu->vmm.s.cCallRing3Disabled) == 0) /** @todo replace with unordered variant (ASMAtomicUoDecU32). */
     {
 #ifdef IN_RC
@@ -166 +179 @@
 #endif
     }
+
+#if defined(LOG_ENABLED) && defined(IN_RING0)
+    ASMSetFlags(fFlags);
+#endif
 }