Changeset 17195 in vbox for trunk

Timestamp:

Feb 27, 2009 11:02:41 AM (16 years ago)

Author:

vboxsync

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

43486

Message:

VBOX_WITH_PGMPOOL_PAGING_ONLY: deal with hypervisor mappings in guest pae pds that are not yet present

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAll.cpp (modified) (1 diff)
• PGMAllMap.cpp (modified) (2 diffs)

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

@@ -902 +902 @@
             if (CPUMGetGuestCR4(pVM) & X86_CR4_PAE)
             {
-                GCPdPt  = pGstPdpe->u & X86_PDPE_PG_MASK;
-                enmKind = PGMPOOLKIND_PAE_PD_FOR_PAE_PD;
+                if (!pGstPdpe->n.u1Present)
+                {
+                    /* PD not present; guest must reload CR3 to change it.
+                     * No need to monitor anything in this case.
+                     */
+                    Assert(!HWACCMIsEnabled(pVM));
+
+                    GCPdPt  = pGstPdpe->u & X86_PDPE_PG_MASK;
+                    enmKind = PGMPOOLKIND_PAE_PD_PHYS;
+                    pGstPdpe->n.u1Present = 1;
+                }
+                else
+                {
+                    GCPdPt  = pGstPdpe->u & X86_PDPE_PG_MASK;
+                    enmKind = PGMPOOLKIND_PAE_PD_FOR_PAE_PD;
+                }
             }
             else

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

@@ -280 +280 @@
                     {
                         /* 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 */
+                        GstPdpe.u = X86_PDPE_P;   /* rw/us are reserved for PAE pdpte's; accessed bit causes invalid VT-x guest state errors */
                     }
                     else
@@ -289 +289 @@
                             GstPdpe = *pGstPdpe;
                         else
-                            GstPdpe.u  = X86_PDPE_P;   /* rw/us are reserved for PAE pdpte's; accessed bit causes invalid VT-x guest state errors */
+                            GstPdpe.u = X86_PDPE_P;   /* rw/us are reserved for PAE pdpte's; accessed bit causes invalid VT-x guest state errors */
                     }
                     int rc = pgmShwSyncPaePDPtr(pVM, (iPdPt << X86_PDPT_SHIFT), &GstPdpe, &pShwPaePd);