Changeset 32027 in vbox for trunk/src

Timestamp:

Aug 27, 2010 9:17:42 AM (14 years ago)

Author:

vboxsync

Message:

PGM/SyncPage: To be on the safe side, always sync the target page when doing multiple pages.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -1812 +1812 @@
     if (!PdeDst.n.u1Present)
     {
+        LogAlways(("CPU%d: SyncPage: Pde at %RGv changed behind our back! (pPdeDst=%p/%RX64)\n", pVCpu->idCpu, GCPtrPage, pPdeDst, (uint64_t)PdeDst.u));
         AssertMsg(pVM->cCpus > 1, ("Unexpected missing PDE p=%p/%RX64\n", pPdeDst, (uint64_t)PdeDst.u));
-        Log(("CPU%d: SyncPage: Pde at %RGv changed behind our back!\n", pVCpu->idCpu, GCPtrPage));
         return VINF_SUCCESS;    /* force the instruction to be executed again. */
     }
@@ -1889 +1889 @@
                          * deal with locality.
                          */
-                        unsigned        iPTDst    = (GCPtrPage >> SHW_PT_SHIFT) & SHW_PT_MASK;
+                        unsigned        iPTDst      = (GCPtrPage >> SHW_PT_SHIFT) & SHW_PT_MASK;
+                        const unsigned  iPTDstPage  = iPTDst;
 #  if PGM_SHW_TYPE == PGM_TYPE_PAE && PGM_GST_TYPE == PGM_TYPE_32BIT
                         /* Select the right PDE as we're emulating a 4kb page table with 2 shadow page tables. */
-                        const unsigned  offPTSrc  = ((GCPtrPage >> SHW_PD_SHIFT) & 1) * 512;
+                        const unsigned  offPTSrc    = ((GCPtrPage >> SHW_PD_SHIFT) & 1) * 512;
 #  else
-                        const unsigned  offPTSrc  = 0;
+                        const unsigned  offPTSrc    = 0;
 #  endif
-                        const unsigned  iPTDstEnd = RT_MIN(iPTDst + PGM_SYNC_NR_PAGES / 2, RT_ELEMENTS(pPTDst->a));
+                        const unsigned  iPTDstEnd   = RT_MIN(iPTDst + PGM_SYNC_NR_PAGES / 2, RT_ELEMENTS(pPTDst->a));
                         if (iPTDst < PGM_SYNC_NR_PAGES / 2)
                             iPTDst = 0;
@@ -1903 +1904 @@
                         for (; iPTDst < iPTDstEnd; iPTDst++)
                         {
-                            if (!SHW_PTE_IS_P(pPTDst->a[iPTDst]))
+                            if (   !SHW_PTE_IS_P(pPTDst->a[iPTDst])
+                                || iPTDst == iPTDstPage)    /* always sync GCPtrPage */
                             {
                                 GSTPTE PteSrc = pPTSrc->a[offPTSrc + iPTDst];