Changeset 8853

Timestamp:

05/15/08 15:57:31 (2 months ago)

Author:

vboxsync

Message:

Manual page invalidation or TLB flush is required for AMD-V.

Files:

• trunk/include/VBox/hwaccm.h (modified) (1 diff)
• trunk/src/VBox/VMM/HWACCMInternal.h (modified) (1 diff)
• trunk/src/VBox/VMM/PGMInternal.h (modified) (4 diffs)
• trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp (modified) (2 diffs)
• trunk/src/VBox/VMM/VMMR0/HWACCMR0.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp (modified) (8 diffs)
• trunk/src/VBox/VMM/VMMR0/HWSVMR0.h (modified) (1 diff)

trunk/include/VBox/hwaccm.h

@@ -257 +257 @@
-HWACCMR0DECL(int) HWACCMR0Leave(PVM pVM);
-
+/**
+ * Invalidates a guest page
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM to operate on.
+ * @param   GCVirt      Page to invalidate
+ */
+HWACCMR0DECL(int) HWACCMR0InvalidatePage(PVM pVM, RTGCPTR GCVirt);
+
+/**
+ * Flushes the guest TLB
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM to operate on.
+ */
+HWACCMR0DECL(int) HWACCMR0FlushTLB(PVM pVM);
-
-/** @} */

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -211 +211 @@
-        bool                        fResumeVM;
-        /** Set if erratum 170 affects the AMD cpu. */
+        bool                        fAlwaysFlushTLB;
+        /** Set if we need to flush the TLB during the world switch. */
-        bool                        fForceTLBFlush;
-

trunk/src/VBox/VMM/PGMInternal.h

@@ -36 +36 @@
-#include <VBox/log.h>
-#include <VBox/gmm.h>
+#include <VBox/hwaccm.h>
-#include <iprt/avl.h>
-#include <iprt/assert.h>
@@ -266 +267 @@
-#ifdef IN_GC
-# define PGM_INVL_PG(GCVirt)        ASMInvalidatePage((void *)(GCVirt))
+#elif defined(IN_RING0)
+# define PGM_INVL_PG(GCVirt)        HWACCMR0InvalidatePage(pVM, (RTGCPTR)(GCVirt))
-#else
-# define PGM_INVL_PG(GCVirt)        ((void)0)
@@ -277 +280 @@
-#ifdef IN_GC
-# define PGM_INVL_BIG_PG(GCVirt)    ASMReloadCR3()
+#elif defined(IN_RING0)
+# define PGM_INVL_BIG_PG(GCVirt)    HWACCMR0FlushTLB(pVM)
-#else
-# define PGM_INVL_BIG_PG(GCVirt)    ((void)0)
@@ -286 +291 @@
-#ifdef IN_GC
-# define PGM_INVL_GUEST_TLBS()      ASMReloadCR3()
+#elif defined(IN_RING0)
+# define PGM_INVL_GUEST_TLBS()      HWACCMR0FlushTLB(pVM)
-#else
-# define PGM_INVL_GUEST_TLBS()      ((void)0)

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

@@ -908 +908 @@
-static int pgmPoolCacheFreeOne(PPGMPOOL pPool, uint16_t iUser)
-{
+#ifdef IN_RING0
+    const PVM pVM = pPool->CTXSUFF(pVM);
+#endif
-    Assert(pPool->iAgeHead != pPool->iAgeTail); /* We shouldn't be here if there < 2 cached entries! */
-    STAM_COUNTER_INC(&pPool->StatCacheFreeUpOne);
@@ -1032 +1035 @@
-static int pgmPoolCacheAlloc(PPGMPOOL pPool, RTGCPHYS GCPhys, PGMPOOLKIND enmKind, uint16_t iUser, uint16_t iUserTable, PPPGMPOOLPAGE ppPage)
-{
+#ifdef IN_RING0
+    const PVM pVM = pPool->CTXSUFF(pVM);
+#endif
-    /*
-     * Look up the GCPhys in the hash.

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

@@ -807 +807 @@
-        return SVMR0RunGuestCode(pVM, pCtx);
-    }
+}
+
+/**
+ * Invalidates a guest page
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM to operate on.
+ * @param   GCVirt      Page to invalidate
+ */
+HWACCMR0DECL(int) HWACCMR0InvalidatePage(PVM pVM, RTGCPTR GCVirt)
+{
+    if (pVM->hwaccm.s.svm.fSupported)
+        return SVMR0InvalidatePage(pVM, GCVirt);
+
+    return VINF_SUCCESS;
+}
+
+/**
+ * Flushes the guest TLB
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM to operate on.
+ */
+HWACCMR0DECL(int) HWACCMR0FlushTLB(PVM pVM)
+{
+    if (pVM->hwaccm.s.svm.fSupported)
+        return SVMR0FlushTLB(pVM);
+
+    return VINF_SUCCESS;
-}
-

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

@@ -170 +170 @@
-    {
-        Log(("SVMR0InitVM: AMD cpu with erratum 170 family %x model %x stepping %x\n", u32Family, u32Model, u32Stepping));
-ForceTLBFlush
+AlwaysFlushTLB
-    }
-
@@ -681 +681 @@
-    uint64_t    exitCode = (uint64_t)SVM_EXIT_INVALID;
-    SVM_VMCB   *pVMCB;
-    bool        fForceTLBFlush = false;
-    bool        fGuestStateSynced = false;
-    unsigned    cResume = 0;
@@ -768 +767 @@
-    STAM_PROFILE_ADV_START(&pVM->hwaccm.s.StatInGC, x);
-
-
-
-
+
+
-    {
-        pVMCB->ctrl.TLBCtrl.n.u1TLBFlush = 1;
@@ -778 +776 @@
-
-    /* In case we execute a goto ResumeExecution later on. */
-
-
+     
+pVM->hwaccm.s.svm.
-
-    Assert(sizeof(pVM->hwaccm.s.svm.pVMCBPhys) == 8);
@@ -1287 +1285 @@
-
-            /** @note Force a TLB flush. SVM requires us to do it manually. */
-
+pVM->hwaccm.s.svm.
-        }
-        if (rc == VINF_SUCCESS)
@@ -1599 +1597 @@
-
-    /* Force a TLB flush on VM entry. */
+    pVM->hwaccm.s.svm.fForceTLBFlush = true;
+
-    pVM->hwaccm.s.svm.fResumeVM = false;
-
@@ -1654 +1654 @@
-    }
-    Assert(rc == VERR_REM_FLUSHED_PAGES_OVERFLOW);
-(rc == VERR_REM_FLUSHED_PAGES_OVERFLOW) ? VERR_EM_INTERPRETER : 
+
-}
-
@@ -1703 +1703 @@
-}
-
+
+/**
+ * Invalidates a guest page
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM to operate on.
+ * @param   GCVirt      Page to invalidate
+ */
+HWACCMR0DECL(int) SVMR0InvalidatePage(PVM pVM, RTGCPTR GCVirt)
+{
+    SVM_VMCB   *pVMCB;
+
+    Log2(("SVMR0InvalidatePage %VGv\n", GCVirt));
+    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);
+
+    SVMInvlpgA(GCVirt, pVMCB->ctrl.TLBCtrl.n.u32ASID);
+    return VINF_SUCCESS;
+}
+
+/**
+ * Flushes the guest TLB
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM to operate on.
+ */
+HWACCMR0DECL(int) SVMR0FlushTLB(PVM pVM)
+{
+    Log2(("SVMR0FlushTLB\n"));
+    pVM->hwaccm.s.svm.fForceTLBFlush = true;
+
+    return VINF_SUCCESS;
+}

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

@@ -125 +125 @@
-HWACCMR0DECL(int) SVMR0LoadGuestState(PVM pVM, CPUMCTX *pCtx);
-
+/**
+ * Invalidates a guest page
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM to operate on.
+ * @param   GCVirt      Page to invalidate
+ */
+HWACCMR0DECL(int) SVMR0InvalidatePage(PVM pVM, RTGCPTR GCVirt);
+
+/**
+ * Flushes the guest TLB
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM to operate on.
+ */
+HWACCMR0DECL(int) SVMR0FlushTLB(PVM pVM);
+
-
-/* Convert hidden selector attribute word between VMX and SVM formats. */