Changeset 16882 in vbox for trunk

Timestamp:

Feb 18, 2009 10:11:10 AM (16 years ago)

Author:

vboxsync

Message:

VBOX_WITH_PGMPOOL_PAGING_ONLY: deal with missing PDPEs

Location:

trunk/src/VBox/VMM

Files:

• PGMInternal.h (modified) (1 diff)
• VMMAll/PGMAll.cpp (modified) (4 diffs)
• VMMAll/PGMAllMap.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PGMInternal.h

@@ -2983 +2983 @@
 void            pgmMapSetShadowPDEs(PVM pVM, PPGMMAPPING pMap, unsigned iNewPDE);
 int             pgmMapDeactivateCR3(PVM pVM, PPGMPOOLPAGE pShwPageCR3);
-#endif
+int             pgmShwSyncPaePDPtr(PVM pVM, RTGCPTR GCPtr, PX86PDPE pGstPdpe, PX86PDPAE *ppPD);
+#endif
+#ifndef IN_RC
+int             pgmShwSyncLongModePDPtr(PVM pVM, RTGCPTR64 GCPtr, PX86PML4E pGstPml4e, PX86PDPE pGstPdpe, PX86PDPAE *ppPD);
+#endif
+int             pgmShwGetEPTPDPtr(PVM pVM, RTGCPTR64 GCPtr, PEPTPDPT *ppPdpt, PEPTPD *ppPD);
 
 __END_DECLS

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

@@ -70 +70 @@
 *******************************************************************************/
 DECLINLINE(int) pgmShwGetLongModePDPtr(PVM pVM, RTGCPTR64 GCPtr, PX86PML4E *ppPml4e, PX86PDPT *ppPdpt, PX86PDPAE *ppPD);
-DECLINLINE(int) pgmShwSyncLongModePDPtr(PVM pVM, RTGCPTR64 GCPtr, PX86PML4E pGstPml4e, PX86PDPE pGstPdpe, PX86PDPAE *ppPD);
-DECLINLINE(int) pgmShwGetEPTPDPtr(PVM pVM, RTGCPTR64 GCPtr, PEPTPDPT *ppPdpt, PEPTPD *ppPD);
 DECLINLINE(int) pgmShwGetPAEPDPtr(PVM pVM, RTGCPTR GCPtr, PX86PDPT *ppPdpt, PX86PDPAE *ppPD);
 #ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
 DECLINLINE(int) pgmShwGetPaePoolPagePD(PPGM pPGM, RTGCPTR GCPtr, PPGMPOOLPAGE *ppShwPde);
-DECLINLINE(int) pgmShwSyncPaePDPtr(PVM pVM, RTGCPTR GCPtr, PX86PDPE pGstPdpe, PX86PDPAE *ppPD);
 #endif
 
@@ -870 +867 @@
  * @param   ppPD        Receives address of page directory
  */
-DECLINLINE(int) pgmShwSyncPaePDPtr(PVM pVM, RTGCPTR GCPtr, PX86PDPE pGstPdpe, PX86PDPAE *ppPD)
+int pgmShwSyncPaePDPtr(PVM pVM, RTGCPTR GCPtr, PX86PDPE pGstPdpe, PX86PDPAE *ppPD)
 {
     const unsigned iPdPt    = (GCPtr >> X86_PDPT_SHIFT) & X86_PDPT_MASK_PAE;
@@ -976 +973 @@
  * @param   ppPD        Receives address of page directory
  */
-DECLINLINE(int) pgmShwSyncLongModePDPtr(PVM pVM, RTGCPTR64 GCPtr, PX86PML4E pGstPml4e, PX86PDPE pGstPdpe, PX86PDPAE *ppPD)
+int pgmShwSyncLongModePDPtr(PVM pVM, RTGCPTR64 GCPtr, PX86PML4E pGstPml4e, PX86PDPE pGstPdpe, PX86PDPAE *ppPD)
 {
     PPGM           pPGM          = &pVM->pgm.s;
@@ -1164 +1161 @@
  * @param   ppPD        Receives address of page directory
  */
-DECLINLINE(int) pgmShwGetEPTPDPtr(PVM pVM, RTGCPTR64 GCPtr, PEPTPDPT *ppPdpt, PEPTPD *ppPD)
+int pgmShwGetEPTPDPtr(PVM pVM, RTGCPTR64 GCPtr, PEPTPDPT *ppPdpt, PEPTPD *ppPD)
 {
     PPGM           pPGM  = &pVM->pgm.s;

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

@@ -270 +270 @@
                 Assert(pShwPdpt);
                 pShwPaePd = pgmShwGetPaePDPtr(&pVM->pgm.s, (iPdPt << X86_PDPT_SHIFT));
+#ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+                if (!pShwPaePd)
+                {
+                    X86PDPE GstPdpe;
+
+                    if (PGMGetGuestMode(pVM) < PGMMODE_PAE)
+                    {
+                        /* Fake PDPT entry; access control handled on the page table level, so allow everything. */
+                        GstPdpe.u  = X86_PDPE_P;   /* rw/us are reserved for PAE pdpte's; accessed bit causes invalid VT-x guest state errors */
+                    }
+                    else
+                    {
+                        PX86PDPE pGstPdpe;
+                        pGstPdpe = pgmGstGetPaePDPEPtr(&pVM->pgm.s, (iPdPt << X86_PDPT_SHIFT));
+                        AssertFatal(pGstPdpe);
+                        GstPdpe = *pGstPdpe;
+                    }
+                    rc = pgmShwSyncPaePDPtr(pVM, (iPdPt << X86_PDPT_SHIFT), &GstPdpe, &pShwPaePd);
+                }
+#endif
                 AssertFatal(pShwPaePd);