Changeset 9115 in vbox for trunk

Timestamp:

May 26, 2008 11:18:34 AM (17 years ago)

Author:

vboxsync

Message:

HWACCM: Invalidate pages changed by PGMHandlerPhysicalPageTempOff.
Note that PGMHandlerPhysicalPageReset will trigger a TLB flush.

Location:

trunk

Files:

• include/VBox/hwacc_svm.h (modified) (1 diff)
• include/VBox/hwaccm.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/HWACCMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAllHandler.cpp (modified) (1 diff)
• src/VBox/VMM/VMMR0/HWSVMR0.cpp (modified) (1 diff)

trunk/include/VBox/hwacc_svm.h

@@ -697 +697 @@
 HWACCMR0DECL(int) SVMR0InvalidatePage(PVM pVM, RTGCPTR GCVirt);
 
+/**
+ * Invalidates a guest page by physical address
+ *
+ * NOTE: Assumes the current instruction references this physical page though a virtual address!!
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM to operate on.
+ * @param   GCPhys      Page to invalidate
+ */
+HWACCMR0DECL(int) SVMR0InvalidatePhysPage(PVM pVM, RTGCPHYS GCPhys);
+
 #endif /* IN_RING0 */
 

trunk/include/VBox/hwaccm.h

@@ -85 +85 @@
 
 /**
+ * Invalidates a guest page by physical address
+ *
+ * NOTE: Assumes the current instruction references this physical page though a virtual address!!
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM to operate on.
+ * @param   GCPhys      Page to invalidate
+ */
+HWACCMDECL(int) HWACCMInvalidatePhysPage(PVM pVM, RTGCPHYS GCPhys);
+
+/**
  * Checks if nested paging is enabled
  *

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

@@ -90 +90 @@
 }
 
+
+/**
+ * Invalidates a guest page by physical address
+ *
+ * NOTE: Assumes the current instruction references this physical page though a virtual address!!
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM to operate on.
+ * @param   GCPhys      Page to invalidate
+ */
+HWACCMDECL(int) HWACCMInvalidatePhysPage(PVM pVM, RTGCPHYS GCPhys)
+{
+    if (!HWACCMIsNestedPagingActive(pVM))
+        return VINF_SUCCESS;
+
+#ifdef IN_RING0
+    /* @todo Intel for nested paging */
+    if (pVM->hwaccm.s.svm.fSupported)
+    {
+        SVMR0InvalidatePhysPage(pVM, GCPhys);
+    }
+#else
+    HWACCMFlushTLB(pVM);
+#endif
+    return VINF_SUCCESS;
+}

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

@@ -889 +889 @@
             AssertRCReturn(rc, rc);
             PGM_PAGE_SET_HNDL_PHYS_STATE(pPage, PGM_PAGE_HNDL_PHYS_STATE_DISABLED);
+#ifdef IN_RING0
+            HWACCMInvalidatePhysPage(pVM, GCPhysPage);
+#endif
             return VINF_SUCCESS;
         }

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

@@ -1919 +1919 @@
 }
 
+
+/**
+ * Invalidates a guest page by physical address
+ *
+ * NOTE: Assumes the current instruction references this physical page though a virtual address!!
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM to operate on.
+ * @param   GCPhys      Page to invalidate
+ */
+HWACCMR0DECL(int) SVMR0InvalidatePhysPage(PVM pVM, RTGCPHYS GCPhys)
+{
+    bool fFlushPending = pVM->hwaccm.s.svm.fAlwaysFlushTLB | pVM->hwaccm.s.svm.fForceTLBFlush;
+
+    /* Skip it if a TLB flush is already pending. */
+    if (!fFlushPending)
+    {
+        CPUMCTX    *pCtx;
+        int         rc;
+        SVM_VMCB   *pVMCB;
+
+        rc = CPUMQueryGuestCtxPtr(pVM, &pCtx);
+        AssertRCReturn(rc, rc);
+
+        Log2(("SVMR0InvalidatePhysPage %VGp\n", GCPhys));
+        AssertReturn(pVM, VERR_INVALID_PARAMETER);
+        Assert(pVM->hwaccm.s.svm.fSupported);
+
+        pVMCB = (SVM_VMCB *)pVM->hwaccm.s.svm.pVMCB;
+        AssertMsgReturn(pVMCB, ("Invalid pVMCB\n"), VERR_EM_INTERNAL_ERROR);
+
+        return SVMR0InterpretInvpg(pVM, CPUMCTX2CORE(pCtx), pVMCB->ctrl.TLBCtrl.n.u32ASID);
+    }
+    return VINF_SUCCESS;
+}