Changeset 72793 in vbox

Timestamp:

Jul 2, 2018 11:08:44 AM (7 years ago)

Author:

vboxsync

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

123335

Message:

VMM/HMVMXR0: Oops, don't Log with interrupts disabled.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -5952 +5952 @@
  * @param   pSelReg     Pointer to the segment selector.
  *
- * @remarks No-long-jump zone!!!
+ * @remarks Called with interrupts and/or preemption disabled, try not to assert and
+ *          do not log!
  *
  * @remarks Never call this function directly!!! Use the
@@ -6005 +6006 @@
         pSelReg->Attr.u &= X86DESCATTR_UNUSABLE | X86DESCATTR_L    | X86DESCATTR_D  | X86DESCATTR_G
                          | X86DESCATTR_DPL      | X86DESCATTR_TYPE | X86DESCATTR_DT;
-
+#ifdef VBOX_STRICT
+        VMMRZCallRing3Disable(pVCpu);
         Log4Func(("Unusable idxSel=%#x attr=%#x -> %#x\n", idxSel, u32Sel, pSelReg->Attr.u));
-#ifdef DEBUG_bird
+# ifdef DEBUG_bird
         AssertMsg((u32Attr & ~X86DESCATTR_P) == pSelReg->Attr.u,
                   ("%#x: %#x != %#x (sel=%#x base=%#llx limit=%#x)\n",
                    idxSel, u32Sel, pSelReg->Attr.u, pSelReg->Sel, pSelReg->u64Base, pSelReg->u32Limit));
+# endif
+        VMMRZCallRing3Enable(pVCpu);
 #endif
     }
@@ -6087 +6091 @@
  * @param   pVCpu   The cross context virtual CPU structure.
  *
- * @remarks Called with interrupts and/or preemption disabled, should not assert!
+ * @remarks Called with interrupts and/or preemption disabled, try not to assert and
+ *          do not log!
  * @remarks Do -not- call this function directly, use hmR0VmxImportGuestState()
  *          instead!!!
@@ -10080 +10085 @@
         rcStrict = rc2;
     }
+    Assert(!ASMAtomicUoReadU64(&pCtx->fExtrn));
     Assert(!VMMRZCallRing3IsNotificationSet(pVCpu));
     return rcStrict;