Changeset 8952 in vbox for trunk/src/VBox/VMM

Timestamp:

May 20, 2008 1:16:09 PM (17 years ago)

Author:

vboxsync

Message:

Nested paging updates

Location:

trunk/src/VBox/VMM

Files:

• PGM.cpp (modified) (1 diff)
• VMMR0/HWSVMR0.cpp (modified) (8 diffs)

trunk/src/VBox/VMM/PGM.cpp

@@ -2468 +2468 @@
 
 /**
- * Swtich to different (or relocated in the relocate case) mode data.
+ * Switch to different (or relocated in the relocate case) mode data.
  *
  * @param   pVM         The VM handle.

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

@@ -278 +278 @@
     pVMCB->ctrl.u32InterceptException = HWACCM_SVM_TRAP_MASK;
     if (pVM->hwaccm.s.svm.fNestedPaging)
-        pVMCB->ctrl.u32InterceptException &= ~RT_BIT(14);   /* no longer need to intercept pagefaults. */
+        pVMCB->ctrl.u32InterceptException &= ~RT_BIT(14);   /* no longer need to intercept #PF. */
 
     pVMCB->ctrl.u32InterceptCtrl1 =   SVM_CTRL1_INTERCEPT_INTR
@@ -297 +297 @@
                                     | SVM_CTRL1_INTERCEPT_FERR_FREEZE;  /* Legacy FPU FERR handling. */
                                     ;
+    /* With nested paging we don't care about invlpg anymore. */
+    if (pVM->hwaccm.s.svm.fNestedPaging)
+        pVMCB->ctrl.u32InterceptCtrl1 &= ~SVM_CTRL1_INTERCEPT_INVLPG;
+
     pVMCB->ctrl.u32InterceptCtrl2 =   SVM_CTRL2_INTERCEPT_VMRUN         /* required */
                                     | SVM_CTRL2_INTERCEPT_VMMCALL
@@ -590 +594 @@
 
         /* Note: WP is not relevant in nested paging mode as we catch accesses on the (host) physical level. */
-        /* Note: In nested paging mode the guest is allowed to run with paging disabled; the guest physical to host physical translation is still active. */
+        /* Note: In nested paging mode the guest is allowed to run with paging disabled; the guest physical to host physical translation will remain active. */
         if (!pVM->hwaccm.s.svm.fNestedPaging)
         {
@@ -604 +608 @@
     {
         /* Save our shadow CR3 register. */
-        if (!pVM->hwaccm.s.svm.fNestedPaging)
-            pVMCB->guest.u64CR3 = PGMGetHyperCR3(pVM);
+        if (pVM->hwaccm.s.svm.fNestedPaging)
+        {
+            pVMCB->ctrl.u64NestedPagingCR3  = PGMGetHyperCR3(pVM);
+            pVMCB->guest.u64CR3             = pCtx->cr3;
+        }
         else
-            pVMCB->guest.u64CR3 = pCtx->cr3;
+            pVMCB->guest.u64CR3             = PGMGetHyperCR3(pVM);
     }
 
@@ -636 +643 @@
                 return VERR_PGM_UNSUPPORTED_HOST_PAGING_MODE;
 
-            default:                   /* shut up gcc */
+            default:                    /* shut up gcc */
                 AssertFailed();
                 return VERR_PGM_UNSUPPORTED_HOST_PAGING_MODE;
@@ -1031 +1038 @@
     SVM_READ_SELREG(GS, gs);
 
-    /** @note no reason to sync back the CRx and DRx registers. They can't be changed by the guest. */
+    /* Note: no reason to sync back the CRx and DRx registers. They can't be changed by the guest. */
+    /* Note: only in the nested paging case can CR3 & CR4 be changed by the guest. */ 
+    if (pVM->hwaccm.s.svm.fNestedPaging)
+    {
+        CPUMSetGuestCR3(pVM, pVMCB->guest.u64CR3);
+        CPUMSetGuestCR4(pVM, pVMCB->guest.u64CR4);
+    }
 
     /** @note NOW IT'S SAFE FOR LOGGING! */
@@ -1335 +1348 @@
         STAM_COUNTER_INC(&pVM->hwaccm.s.StatExitInvpg);
 
+        Assert(!pVM->hwaccm.s.svm.fNestedPaging);
+
         /* Truly a pita. Why can't SVM give the same information as VMX? */
         rc = SVMR0InterpretInvpg(pVM, CPUMCTX2CORE(pCtx), pVMCB->ctrl.TLBCtrl.n.u32ASID);
@@ -1364 +1379 @@
             break;
         case 3:
+            Assert(!pVM->hwaccm.s.svm.fNestedPaging);
             pVM->hwaccm.s.fContextUseFlags |= HWACCM_CHANGED_GUEST_CR3;
             break;
         case 4:
+            Assert(!pVM->hwaccm.s.svm.fNestedPaging);
             pVM->hwaccm.s.fContextUseFlags |= HWACCM_CHANGED_GUEST_CR4;
             break;