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

Timestamp:

Dec 21, 2012 10:39:53 AM (12 years ago)

Author:

vboxsync

Message:

VMM/VMMAll, VMMR3: forceflags for updating CR3 and PAE PDPEs.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/HMAll.cpp (modified) (1 diff)
• VMMAll/PGMAll.cpp (modified) (4 diffs)
• VMMR3/EM.cpp (modified) (1 diff)
• include/HMInternal.h (modified) (1 diff)

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

@@ -342 +342 @@
 }
 
+
+/**
+ * Return the PAE PDPE entries.
+ *
+ * @returns Pointer to the PAE PDPE array.
+ * @param   pVCpu       Pointer to the VMCPU.
+ */
+VMMDECL(PX86PDPE) HMGetPaePdpes(PVMCPU pVCpu)
+{
+    return &pVCpu->hm.s.aPdpes[0];
+}
+

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

@@ -1637 +1637 @@
  *
  * @returns VBox status code.
- * @param   pVCpu               The virtual CPU.
- * @param   paPdpes             Where to return the four PDPEs.  The array
+ * @param   pVCpu               Pointer to the VMCPU.
+ * @param   paPdpes             Where to return the four PDPEs. The array
  *                              pointed to must have 4 entries.
  */
@@ -1659 +1659 @@
  *
  * @returns VBox status code.
- * @param   pVCpu               The virtual CPU.
- * @param   paPdpes             The four PDPE values.  The array pointed to
- *                              must have exactly 4 entries.
+ * @param   pVCpu               Pointer to the VMCPU.
+ * @param   paPdpes             The four PDPE values. The array pointed to must
+ *                              have exactly 4 entries.
  *
  * @remarks No-long-jump zone!!!
@@ -1684 +1684 @@
         }
     }
+
+    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_HM_UPDATE_PAE_PDPES);
     return VINF_SUCCESS;
 }
@@ -1969 +1971 @@
         AssertRCSuccess(rc); /* Assumes VINF_PGM_SYNC_CR3 doesn't apply to nested paging. */ /** @todo this isn't true for the mac, but we need hw to test/fix this. */
     }
+
+    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_HM_UPDATE_CR3);
     return rc;
 }

trunk/src/VBox/VMM/VMMR3/EM.cpp

@@ -1380 +1380 @@
         PDMCritSectFF(pVCpu);
 
+    /* Update CR3 (Nested Paging case for HM). */
+    if (VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_HM_UPDATE_CR3))
+    {
+        int rc2 = PGMUpdateCR3(pVCpu, CPUMGetGuestCR3(pVCpu));
+        if (RT_FAILURE(rc2))
+            return rc2;
+        Assert(!VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_HM_UPDATE_CR3));
+    }
+
+    /* Update PAE PDPEs. This must be done *after* PGMUpdateCR3() and used only by the Nested Paging case for HM. */
+    if (VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_HM_UPDATE_PAE_PDPES))
+    {
+        Assert(CPUMIsGuestInPAEMode(pVCpu));
+        PX86PDPE pPdpes = HMGetPaePdpes(pVCpu);
+        AssertPtr(pPdpes);
+
+        int rc2 = PGMGstUpdatePaePdpes(pVCpu, pPdpes);
+        if (RT_FAILURE(rc2))
+            return rc2;
+        Assert(!VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_HM_UPDATE_PAE_PDPES));
+    }
+
     if (VMCPU_FF_ISPENDING(pVCpu, VMCPU_FF_CSAM_PENDING_ACTION))
         CSAMR3DoPendingAction(pVM, pVCpu);

trunk/src/VBox/VMM/include/HMInternal.h

@@ -692 +692 @@
         } s;
     } PendingIO;
+
+    /** The PAE PDPEs used with Nested Paging (only valid when
+     *  VMCPU_FF_HM_UPDATE_PAE_PDPES is set). */
+    X86PDPE                 aPdpes[4];
 
     /** Current shadow paging mode. */