Changeset 16663 in vbox for trunk

Timestamp:

Feb 11, 2009 1:17:20 PM (16 years ago)

Author:

vboxsync

Message:

VBOX_WITH_PGMPOOL_PAGING_ONLY: updates for 32 bits root pd invalidation + minor changes

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp (modified) (6 diffs)

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

@@ -393 +393 @@
                             VM_FF_SET(pPool->CTX_SUFF(pVM), VM_FF_PGM_SYNC_CR3);
                             LogFlow(("pgmPoolMonitorChainChanging: Detected conflict at iShwPdpt=%#x iShw=%#x!\n", iShwPdpt, iShw+i));
+                            break;
                         }
                         else
@@ -418 +419 @@
                                     VM_FF_SET(pPool->CTX_SUFF(pVM), VM_FF_PGM_SYNC_CR3);
                                     LogFlow(("pgmPoolMonitorChainChanging: Detected conflict at iShwPdpt=%#x iShw2=%#x!\n", iShwPdpt, iShw2));
+                                    break;
                                 }
                                 else
@@ -492 +494 @@
                     STAM_COUNTER_INC(&(pPool->CTX_SUFF(pVM)->pgm.s.StatRZGuestCR3WriteConflict));
                     LogFlow(("pgmPoolMonitorChainChanging: Detected conflict at iShw=%#x!\n", iShw));
+                    break;
                 }
+#  ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+                else
+                {
+                    if (uShw.pPD->a[iShw].n.u1Present)
+                    {
+                        LogFlow(("pgmPoolMonitorChainChanging: 32 bit pd iShw=%#x: %RX64 -> freeing it!\n", iShw, uShw.pPD->a[iShw].u));
+                        pgmPoolFree(pPool->CTX_SUFF(pVM),
+                                    uShw.pPD->a[iShw].u & X86_PDE_PAE_PG_MASK,
+                                    pPage->idx,
+                                    iShw);
+                        uShw.pPD->a[iShw].u = 0;
+                    }
+                }
+#  endif
                 /* paranoia / a bit assumptive. */
-                else if (   pCpu
-                         && (off & 3)
-                         && (off & 3) + cbWrite > sizeof(X86PTE))
+                if (   pCpu
+                    && (off & 3)
+                    && (off & 3) + cbWrite > sizeof(X86PTE))
                 {
                     const unsigned iShw2 = (off + cbWrite - 1) / sizeof(X86PTE);
                     if (    iShw2 != iShw
-                        &&  iShw2 < RT_ELEMENTS(uShw.pPD->a)
-                        &&  uShw.pPD->a[iShw2].u & PGM_PDFLAGS_MAPPING)
+                        &&  iShw2 < RT_ELEMENTS(uShw.pPD->a))
                     {
-                        Assert(pgmMapAreMappingsEnabled(&pPool->CTX_SUFF(pVM)->pgm.s));
-                        STAM_COUNTER_INC(&(pPool->CTX_SUFF(pVM)->pgm.s.StatRZGuestCR3WriteConflict));
-                        VM_FF_SET(pPool->CTX_SUFF(pVM), VM_FF_PGM_SYNC_CR3);
-                        LogFlow(("pgmPoolMonitorChainChanging: Detected conflict at iShw2=%#x!\n", iShw2));
+
+                        if (uShw.pPD->a[iShw2].u & PGM_PDFLAGS_MAPPING)
+                        {
+                            Assert(pgmMapAreMappingsEnabled(&pPool->CTX_SUFF(pVM)->pgm.s));
+                            STAM_COUNTER_INC(&(pPool->CTX_SUFF(pVM)->pgm.s.StatRZGuestCR3WriteConflict));
+                            VM_FF_SET(pPool->CTX_SUFF(pVM), VM_FF_PGM_SYNC_CR3);
+                            LogFlow(("pgmPoolMonitorChainChanging: Detected conflict at iShw2=%#x!\n", iShw2));
+                        }
+#  ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
+                        else
+                        {
+                            if (uShw.pPD->a[iShw2].n.u1Present)
+                            {
+                                LogFlow(("pgmPoolMonitorChainChanging: 32 bit pd iShw=%#x: %RX64 -> freeing it!\n", iShw2, uShw.pPD->a[iShw2].u));
+                                pgmPoolFree(pPool->CTX_SUFF(pVM),
+                                            uShw.pPD->a[iShw2].u & X86_PDE_PAE_PG_MASK,
+                                            pPage->idx,
+                                            iShw2);
+                                uShw.pPD->a[iShw2].u = 0;
+                            }
+                        }
+#  endif
                     }
                 }
@@ -583 +617 @@
                     STAM_COUNTER_INC(&(pPool->CTX_SUFF(pVM)->pgm.s.StatRZGuestCR3WriteConflict));
                     LogFlow(("pgmPoolMonitorChainChanging: Detected conflict at iShw=%#x!\n", iShw));
+                    break;
                 }
-#if defined(PGMPOOL_INVALIDATE_UPPER_SHADOW_TABLE_ENTRIES) || defined(VBOX_WITH_PGMPOOL_PAGING_ONLY)
+#ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
                 /*
                  * Causes trouble when the guest uses a PDE to refer to the whole page table level
@@ -625 +660 @@
                         LogFlow(("pgmPoolMonitorChainChanging: Detected conflict at iShw2=%#x!\n", iShw2));
                     }
-#if defined(PGMPOOL_INVALIDATE_UPPER_SHADOW_TABLE_ENTRIES) || defined(VBOX_WITH_PGMPOOL_PAGING_ONLY)
+#ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY
                     else if (uShw.pPDPae->a[iShw2].n.u1Present)
                     {
@@ -673 +708 @@
                         VM_FF_SET(pPool->CTX_SUFF(pVM), VM_FF_PGM_SYNC_CR3);
                         LogFlow(("pgmPoolMonitorChainChanging: Detected conflict at iShw=%#x!\n", iShw));
+                        break;
                     }
 # ifdef VBOX_WITH_PGMPOOL_PAGING_ONLY