Changeset 9008

Timestamp:

05/21/08 12:17:41 (8 months ago)

Author:

vboxsync

Message:

Changes for proper flushing of the TLB for physical registration changes.

Files:

• trunk/include/VBox/hwacc_svm.h (modified) (1 diff)
• trunk/include/VBox/hwaccm.h (modified) (1 diff)
• trunk/src/VBox/VMM/Makefile.kmk (modified) (2 diffs)
• trunk/src/VBox/VMM/PGMInternal.h (modified) (3 diffs)
• trunk/src/VBox/VMM/VMMAll/PGMAllHandler.cpp (modified) (5 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) (3 diffs)
• trunk/src/VBox/VMM/VMMR0/HWSVMR0.h (modified) (1 diff)
• trunk/src/VBox/VMM/VMMR0/PGMR0.cpp (modified) (1 diff)

trunk/include/VBox/hwacc_svm.h

@@ -686 +686 @@
-DECLASM(void) SVMInvlpgA(RTGCPTR pPageGC, uint32_t u32ASID);
-
+#ifdef IN_RING0
+
+/**
+ * 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);
+
+#endif /* IN_RING0 */
+
-/** @} */
-

trunk/include/VBox/hwaccm.h

@@ -66 +66 @@
-#define HWACCMIsEnabled(a)    (a->fHWACCMEnabled)
-
+/**
+ * Invalidates a guest page
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM to operate on.
+ * @param   GCVirt      Page to invalidate
+ */
+HWACCMDECL(int) HWACCMInvalidatePage(PVM pVM, RTGCPTR GCVirt);
+
+#ifndef IN_GC
+/**
+ * Flushes the guest TLB
+ *
+ * @returns VBox status code.
+ * @param   pVM         The VM to operate on.
+ */
+HWACCMDECL(int) HWACCMFlushTLB(PVM pVM);
+#else
+/* Nop in GC */
+#define HWACCMFlushTLB(pVM)     do { } while (0)
+#endif
+
-#ifdef IN_RING0
-/** @defgroup grp_hwaccm_r0    The VM Hardware Manager API

trunk/src/VBox/VMM/Makefile.kmk

@@ -102 +102 @@
-        VMMAll/CPUMAllRegs.cpp \
-        VMMAll/DBGFAll.cpp \
+        VMMAll/HWACCMAll.cpp \
-        VMMAll/IOMAll.cpp \
-        VMMAll/IOMAllMMIO.cpp \
@@ -390 +391 @@
-        VMMAll/EMAll.cpp \
-        VMMAll/EMAllA.asm \
+        VMMAll/HWACCMAll.cpp \
-        VMMAll/IOMAll.cpp \
-        VMMAll/IOMAllMMIO.cpp \

trunk/src/VBox/VMM/PGMInternal.h

@@ -268 +268 @@
-# define PGM_INVL_PG(GCVirt)        ASMInvalidatePage((void *)(GCVirt))
-#elif defined(IN_RING0)
-R0
+
-#else
-((void)0
+HWACCMInvalidatePage(pVM, (RTGCPTR)(GCVirt)
-#endif
-
@@ -281 +281 @@
-# define PGM_INVL_BIG_PG(GCVirt)    ASMReloadCR3()
-#elif defined(IN_RING0)
-R0
+
-#else
-((void)0
+HWACCMFlushTLB(pVM
-#endif
-
@@ -292 +292 @@
-# define PGM_INVL_GUEST_TLBS()      ASMReloadCR3()
-#elif defined(IN_RING0)
-R0
+
-#else
-((void)0
+HWACCMFlushTLB(pVM
-#endif
-

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

@@ -166 +166 @@
-        }
-        pVM->pgm.s.fPhysCacheFlushPending = true;
+        HWACCMFlushTLB(pVM);
-#ifndef IN_RING3
-        REMNotifyHandlerPhysicalRegister(pVM, enmType, GCPhys, GCPhysLast - GCPhys + 1, !!pfnHandlerR3);
@@ -298 +299 @@
-         * Clear the page bits and notify the REM about this change.
-         */
+        HWACCMFlushTLB(pVM);
-        pgmHandlerPhysicalResetRamFlags(pVM, pCur);
-        pgmHandlerPhysicalDeregisterNotifyREM(pVM, pCur);
@@ -540 +542 @@
-                                                     pCur->Core.KeyLast - GCPhys + 1, !!pCur->pfnHandlerR3, fRestoreAsRAM);
-#endif
+                    HWACCMFlushTLB(pVM);
-                    pgmUnlock(pVM);
-                    Log(("PGMHandlerPhysicalModify: GCPhysCurrent=%VGp -> GCPhys=%VGp GCPhysLast=%VGp\n",
@@ -631 +634 @@
-
-/**
-t
+
- *
- * @returns VBox status code.
@@ -813 +816 @@
-                }
-                pVM->pgm.s.fPhysCacheFlushPending = true;
+                HWACCMFlushTLB(pVM);
-
-                rc = VINF_SUCCESS;

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

@@ -908 +908 @@
-static int pgmPoolCacheFreeOne(PPGMPOOL pPool, uint16_t iUser)
-{
-def IN_RING0
+ndef IN_GC
-    const PVM pVM = pPool->CTXSUFF(pVM);
-#endif
@@ -1035 +1035 @@
-static int pgmPoolCacheAlloc(PPGMPOOL pPool, RTGCPHYS GCPhys, PGMPOOLKIND enmKind, uint16_t iUser, uint16_t iUserTable, PPPGMPOOLPAGE ppPage)
-{
-def IN_RING0
+ndef IN_GC
-    const PVM pVM = pPool->CTXSUFF(pVM);
-#endif

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

@@ -812 +812 @@
-        return SVMR0RunGuestCode(pVM, pCtx, &HWACCMR0Globals.aCpuInfo[idCpu]);
-    }
-}
-
-/**
- * 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

@@ -266 +266 @@
-        pVMCB->ctrl.u16InterceptWrCRx = RT_BIT(0) | RT_BIT(3) | RT_BIT(4) | RT_BIT(8);
-    else
-4) | RT_BIT(
+
-
-    /* Intercept all DRx reads and writes. */
@@ -1414 +1414 @@
-            break;
-        case 4:
+            Assert(!pVM->hwaccm.s.svm.fNestedPaging);
-            pVM->hwaccm.s.fContextUseFlags |= HWACCM_CHANGED_GUEST_CR4;
-            break;
@@ -1877 +1878 @@
-}
-
-/**
- * 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;
-    STAM_COUNTER_INC(&pVM->hwaccm.s.StatFlushTLBManual);
-    return VINF_SUCCESS;
-}

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

@@ -127 +127 @@
-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. */

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

@@ -82 +82 @@
-
-    /* AMD uses the host's paging mode; Intel's version is on the todo list */
-); //
+
-
-#ifdef VBOX_WITH_STATISTICS