Changeset 8965 in vbox for trunk

Timestamp:

May 20, 2008 3:41:55 PM (17 years ago)

Author:

vboxsync

Message:

Nested paging updates

Location:

trunk

Files:

• include/VBox/pgm.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/HWSVMR0.cpp (modified) (4 diffs)
• src/VBox/VMM/VMMR0/PGMR0.cpp (modified) (2 diffs)

trunk/include/VBox/pgm.h

@@ -451 +451 @@
  */
 PGMR0DECL(int)  PGMR0PhysAllocateHandyPages(PVM pVM);
+PGMR0DECL(int)  PGMR0Trap0eHandlerNestedPaging(PVM pVM, PGMMODE enmShwPagingMode, RTGCUINT uErr, PCPUMCTXCORE pRegFrame, RTGCPHYS pvFault);
 /** @} */
 #endif /* IN_RING0 */

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

@@ -277 +277 @@
 }
 
-
 /**
  * Prefetch a page

trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp

@@ -266 +266 @@
         pVMCB->ctrl.u16InterceptWrCRx = RT_BIT(0) | RT_BIT(3) | RT_BIT(4) | RT_BIT(8);
     else
-        pVMCB->ctrl.u16InterceptWrCRx = RT_BIT(0) | RT_BIT(8);
+        pVMCB->ctrl.u16InterceptWrCRx = RT_BIT(0) | RT_BIT(4) | RT_BIT(8);
 
     /* Intercept all DRx reads and writes. */
@@ -727 +727 @@
     unsigned    cResume = 0;
 
+    STAM_PROFILE_ADV_START(&pVM->hwaccm.s.StatEntry, x);
+
     Assert(!pVM->hwaccm.s.svm.fNestedPaging);
-
-    STAM_PROFILE_ADV_START(&pVM->hwaccm.s.StatEntry, x);
-
     AssertReturn(pCpu->fSVMConfigured, VERR_EM_INTERNAL_ERROR);
 
@@ -1279 +1278 @@
 
     case SVM_EXIT_NPF:
+    {
         /* EXITINFO1 contains fault errorcode; EXITINFO2 contains the guest physical address causing the fault. */
+        uint32_t    errCode        = pVMCB->ctrl.u64ExitInfo1;     /* EXITINFO1 = error code */
+        RTGCPHYS    uFaultAddress  = pVMCB->ctrl.u64ExitInfo2;     /* EXITINFO2 = fault address */
+
         Assert(pVM->hwaccm.s.svm.fNestedPaging);
+
+        Log2(("Page fault at %VGp cr2=%VGv error code %x\n", pCtx->eip, uFaultAddress, errCode));
+        /* Exit qualification contains the linear address of the page fault. */
+        TRPMAssertTrap(pVM, X86_XCPT_PF, TRPM_TRAP);
+        TRPMSetErrorCode(pVM, errCode);
+        TRPMSetFaultAddress(pVM, uFaultAddress);
+
+        /* Handle the pagefault trap for the nested shadow table. */
+        rc = PGMR0Trap0eHandlerNestedPaging(pVM, PGMGetShadowMode(pVM), errCode, CPUMCTX2CORE(pCtx), uFaultAddress);
+        Log2(("PGMR0Trap0eHandlerNestedPaging %VGv returned %Vrc\n", pCtx->eip, rc));
+        if (rc == VINF_SUCCESS)
+        {   /* We've successfully synced our shadow pages, so let's just continue execution. */
+            Log2(("Shadow page fault at %VGv cr2=%VGp error code %x\n", pCtx->eip, uFaultAddress, errCode));
+            STAM_COUNTER_INC(&pVM->hwaccm.s.StatExitShadowPF);
+
+            TRPMResetTrap(pVM);
+
+            STAM_PROFILE_ADV_STOP(&pVM->hwaccm.s.StatExit, x);
+            goto ResumeExecution;
+        }
+
+#ifdef VBOX_STRICT
+        if (rc != VINF_EM_RAW_EMULATE_INSTR)
+            LogFlow(("PGMTrap0eHandlerNestedPaging failed with %d\n", rc));
+#endif
+        /* Need to go back to the recompiler to emulate the instruction. */
+        TRPMResetTrap(pVM);
         break;
+    }
 
     case SVM_EXIT_VINTR:
@@ -1383 +1414 @@
             break;
         case 4:
-            Assert(!pVM->hwaccm.s.svm.fNestedPaging);
             pVM->hwaccm.s.fContextUseFlags |= HWACCM_CHANGED_GUEST_CR4;
             break;

trunk/src/VBox/VMM/VMMR0/PGMR0.cpp

@@ -30 +30 @@
 #include <iprt/assert.h>
 
+__BEGIN_DECLS
+#define PGM_BTH_NAME(name)          PGM_BTH_NAME_32BIT_PROT(name)
+#include "PGMR0Bth.h"
+
+#define PGM_BTH_NAME(name)          PGM_BTH_NAME_PAE_PROT(name)
+#include "PGMR0Bth.h"
+/*
+#define PGM_BTH_NAME(name)          PGM_BTH_NAME_AMD64_PROT(name)
+#include "PGMR0Bth.h"
+*/
+__END_DECLS
 
 
@@ -45 +56 @@
 PGMR0DECL(int) PGMR0PhysAllocateHandyPages(PVM pVM)
 {
-
     return VERR_NOT_IMPLEMENTED;
 }
 
 
+/**
+ * #PF Handler for nested paging.
+ *
+ * @returns VBox status code (appropriate for trap handling and GC return).
+ * @param   pVM                 VM Handle.
+ * @param   enmShwPagingMode    Paging mode for the nested page tables
+ * @param   uErr                The trap error code.
+ * @param   pRegFrame           Trap register frame.
+ * @param   pvFault             The fault address.
+ */
+PGMR0DECL(int) PGMR0Trap0eHandlerNestedPaging(PVM pVM, PGMMODE enmShwPagingMode, RTGCUINT uErr, PCPUMCTXCORE pRegFrame, RTGCPHYS pvFault)
+{
+    int rc;
+
+    LogFlow(("PGMTrap0eHandler: uErr=%#x pvFault=%VGp eip=%VGv\n", uErr, pvFault, pRegFrame->eip));
+    STAM_PROFILE_START(&pVM->pgm.s.StatGCTrap0e, a);
+    STAM_STATS({ pVM->pgm.s.CTXSUFF(pStatTrap0eAttribution) = NULL; } );
+
+    /* AMD uses the host's paging mode; Intel's version is on the todo list */
+    Assert(enmShwPagingMode == PGMMODE_32_BIT || enmShwPagingMode == PGMMODE_PAE); // || enmShwPagingMode == PGMMODE_AMD64);
+
+#ifdef VBOX_WITH_STATISTICS
+    /*
+     * Error code stats.
+     */
+    if (uErr & X86_TRAP_PF_US)
+    {
+        if (!(uErr & X86_TRAP_PF_P))
+        {
+            if (uErr & X86_TRAP_PF_RW)
+                STAM_COUNTER_INC(&pVM->pgm.s.StatGCTrap0eUSNotPresentWrite);
+            else
+                STAM_COUNTER_INC(&pVM->pgm.s.StatGCTrap0eUSNotPresentRead);
+        }
+        else if (uErr & X86_TRAP_PF_RW)
+            STAM_COUNTER_INC(&pVM->pgm.s.StatGCTrap0eUSWrite);
+        else if (uErr & X86_TRAP_PF_RSVD)
+            STAM_COUNTER_INC(&pVM->pgm.s.StatGCTrap0eUSReserved);
+        else if (uErr & X86_TRAP_PF_ID)
+            STAM_COUNTER_INC(&pVM->pgm.s.StatGCTrap0eUSNXE);
+        else
+            STAM_COUNTER_INC(&pVM->pgm.s.StatGCTrap0eUSRead);
+    }
+    else
+    {   /* Supervisor */
+        if (!(uErr & X86_TRAP_PF_P))
+        {
+            if (uErr & X86_TRAP_PF_RW)
+                STAM_COUNTER_INC(&pVM->pgm.s.StatGCTrap0eSVNotPresentWrite);
+            else
+                STAM_COUNTER_INC(&pVM->pgm.s.StatGCTrap0eSVNotPresentRead);
+        }
+        else if (uErr & X86_TRAP_PF_RW)
+            STAM_COUNTER_INC(&pVM->pgm.s.StatGCTrap0eSVWrite);
+        else if (uErr & X86_TRAP_PF_ID)
+            STAM_COUNTER_INC(&pVM->pgm.s.StatGCTrap0eSNXE);
+        else if (uErr & X86_TRAP_PF_RSVD)
+            STAM_COUNTER_INC(&pVM->pgm.s.StatGCTrap0eSVReserved);
+    }
+#endif
+
+    /*
+     * Call the worker.
+     */
+    switch(enmShwPagingMode)
+    {
+    case PGMMODE_32_BIT:
+        rc = PGM_BTH_NAME_32BIT_PROT(Trap0eHandler)(pVM, uErr, pRegFrame, pvFault);
+        break;
+    case PGMMODE_PAE:
+        rc = PGM_BTH_NAME_PAE_PROT(Trap0eHandler)(pVM, uErr, pRegFrame, pvFault);
+        break;
+        /*
+    case PGMMODE_AMD64:
+        rc = PGM_BTH_NAME_AMD64_PROT(Trap0eHandler)(pVM, uErr, pRegFrame, pvFault);
+        break;
+        */
+    }
+    if (rc == VINF_PGM_SYNCPAGE_MODIFIED_PDE)
+        rc = VINF_SUCCESS;
+    STAM_STATS({ if (!pVM->pgm.s.CTXSUFF(pStatTrap0eAttribution))
+                    pVM->pgm.s.CTXSUFF(pStatTrap0eAttribution) = &pVM->pgm.s.StatTrap0eMisc; });
+    STAM_PROFILE_STOP_EX(&pVM->pgm.s.StatGCTrap0e, pVM->pgm.s.CTXSUFF(pStatTrap0eAttribution), a);
+    return rc;
+}