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

Timestamp:

May 2, 2013 10:58:28 PM (12 years ago)

Author:

vboxsync

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

85488

Message:

VMM/HMVMXR0: More checks on strict builds.

File:

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

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

@@ -3144 +3144 @@
 /**
  * Strict function to validate segment registers.
+ *
+ * @remarks Requires CR0.
  */
 static void hmR0VmxValidateSegmentRegs(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
@@ -3184 +3186 @@
         }
         Assert(pCtx->ss.Attr.n.u2Dpl == (pCtx->ss.Sel & X86_SEL_RPL));
-        /* CR0 might not be up-to-date here always, hence disabled. */
-#if 0
+        Assert(!(pVCpu->hm.s.fContextUseFlags & HM_CHANGED_GUEST_CR0));
         if (!pCtx->cr0 & X86_CR0_PE)
             Assert(!pCtx->ss.Attr.n.u2Dpl);
-#endif
         /* DS, ES, FS, GS - only check for usable selectors, see hmR0VmxWriteSegmentReg(). */
         if (pCtx->ds.Attr.u && pCtx->ds.Attr.u != HMVMX_SEL_UNUSABLE)
@@ -3371 +3371 @@
  *                      before using them.
  *
+ * @remarks Requires CR0 (strict builds validation).
  * @remarks No-long-jump zone!!!
  */
@@ -6394 +6395 @@
     }
 
-    /** @todo if the order of loading is important, inform it via comments here */
+    /*
+     * Load the guest-state into the VMCS.
+     * Any ordering dependency among the sub-functions below must be explicitly stated using comments.
+     * Ideally, assert that the cross-dependent bits are up to date at the point of using it.
+     */
     int rc = hmR0VmxLoadGuestEntryCtls(pVCpu, pMixedCtx);
     AssertLogRelMsgRCReturn(rc, ("hmR0VmxLoadGuestEntryCtls! rc=%Rrc (pVM=%p pVCpu=%p)\n", rc, pVM, pVCpu), rc);
@@ -6407 +6412 @@
     AssertLogRelMsgRCReturn(rc, ("hmR0VmxLoadGuestControlRegs: rc=%Rrc (pVM=%p pVCpu=%p)\n", rc, pVM, pVCpu), rc);
 
+    /* Must be done after CR0 is loaded (strict builds require CR0 for segment register validation checks). */
     rc = hmR0VmxLoadGuestSegmentRegs(pVCpu, pMixedCtx);
     AssertLogRelMsgRCReturn(rc, ("hmR0VmxLoadGuestSegmentRegs: rc=%Rrc (pVM=%p pVCpu=%p)\n", rc, pVM, pVCpu), rc);