Changeset 28123 in vbox

Timestamp:

Apr 9, 2010 8:02:25 AM (15 years ago)

Author:

vboxsync

Message:

Simplified hypervisor conflict check

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• PGMAllBth.h (modified) (1 diff)
• PGMAllPool.cpp (modified) (1 diff)

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

@@ -153 +153 @@
      * where our hypervisor is currently mapped, then we'll create a #PF storm in the guest.
      */
-    if ((uErr & (X86_TRAP_PF_P | X86_TRAP_PF_RW)) == (X86_TRAP_PF_P | X86_TRAP_PF_RW))
-    {
-        pgmLock(pVM);
-#  if PGM_SHW_TYPE == PGM_TYPE_32BIT
-        const unsigned  iPDDst = pvFault >> SHW_PD_SHIFT;
-        PX86PD          pPDDst = pgmShwGet32BitPDPtr(&pVCpu->pgm.s);
-#  else /* PGM_SHW_TYPE == PGM_TYPE_PAE */
-        const unsigned  iPDDst = (pvFault >> SHW_PD_SHIFT) & SHW_PD_MASK;   /* pPDDst index, not used with the pool. */
-
-        PX86PDPAE       pPDDst;
-#   if PGM_GST_TYPE != PGM_TYPE_PAE
-        X86PDPE         PdpeSrc;
-
-        /* Fake PDPT entry; access control handled on the page table level, so allow everything. */
-        PdpeSrc.u  = X86_PDPE_P;   /* rw/us are reserved for PAE pdpte's; accessed bit causes invalid VT-x guest state errors */
-#   endif
-        rc = pgmShwSyncPaePDPtr(pVCpu, pvFault, &PdpeSrc, &pPDDst);
-        if (rc != VINF_SUCCESS)
-        {
-            pgmUnlock(pVM);
-            AssertRC(rc);
-            return rc;
-        }
-        Assert(pPDDst);
-#  endif
-        if (pPDDst->a[iPDDst].u & PGM_PDFLAGS_MAPPING)
-        {
-            pgmUnlock(pVM);
-            /* Force a CR3 sync to check for conflicts and emulate the instruction. */
-            VMCPU_FF_SET(pVCpu, VMCPU_FF_PGM_SYNC_CR3);
-            return VINF_EM_RAW_EMULATE_INSTR;
-        }
-        pgmUnlock(pVM);
+    if (    (uErr & (X86_TRAP_PF_P | X86_TRAP_PF_RW)) == (X86_TRAP_PF_P | X86_TRAP_PF_RW)
+        &&  MMHyperIsInsideArea(pVM, pvFault))
+    {
+        /* Force a CR3 sync to check for conflicts and emulate the instruction. */
+        VMCPU_FF_SET(pVCpu, VMCPU_FF_PGM_SYNC_CR3);
+        return VINF_EM_RAW_EMULATE_INSTR;
     }
 # endif

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

@@ -1150 +1150 @@
 
     /*
-     * Incremental page table updates should weight more than random ones.
+     * Incremental page table updates should weigh more than random ones.
      * (Only applies when started from offset 0)
      */