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

Timestamp:

Jul 23, 2018 2:25:42 PM (7 years ago)

Author:

vboxsync

Message:

NEM/win: Do CR3 flush/update from ring-0 when we can (requires setjmp for VMMCALLRING3_PGM_MAP_CHUNK). bugref:9044

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/NEMAllNativeTemplate-win.cpp.h (modified) (9 diffs)
• VMMAll/PGMAll.cpp (modified) (1 diff)
• VMMR0/NEMR0Native-win.cpp (modified) (9 diffs)

trunk/src/VBox/VMM/VMMAll/NEMAllNativeTemplate-win.cpp.h

@@ -849 +849 @@
     /* Control registers. */
     bool fMaybeChangedMode = false;
-    bool fFlushTlb         = false;
-    bool fFlushGlobalTlb   = false;
+    bool fUpdateCr3        = false;
     if (fWhat & CPUMCTX_EXTRN_CR_MASK)
     {
@@ -860 +859 @@
                 CPUMSetGuestCR0(pVCpu, aValues[iReg].Reg64);
                 fMaybeChangedMode = true;
-                fFlushTlb = fFlushGlobalTlb = true; /// @todo fix this
             }
             iReg++;
@@ -871 +869 @@
             {
                 CPUMSetGuestCR3(pVCpu, aValues[iReg].Reg64);
-                fFlushTlb = true;
+                fUpdateCr3 = true;
             }
             iReg++;
@@ -881 +879 @@
                 CPUMSetGuestCR4(pVCpu, aValues[iReg].Reg64);
                 fMaybeChangedMode = true;
-                fFlushTlb = fFlushGlobalTlb = true; /// @todo fix this
             }
             iReg++;
@@ -1099 +1096 @@
 
     /* Typical. */
-    if (!fMaybeChangedMode && !fFlushTlb)
+    if (!fMaybeChangedMode && !fUpdateCr3)
         return VINF_SUCCESS;
 
@@ -1108 +1105 @@
     {
         int rc = PGMChangeMode(pVCpu, pVCpu->cpum.GstCtx.cr0, pVCpu->cpum.GstCtx.cr4, pVCpu->cpum.GstCtx.msrEFER);
-        AssertMsg(rc == VINF_SUCCESS, ("rc=%Rrc\n", rc)); NOREF(rc);
-    }
-
-    if (fFlushTlb)
-    {
-        int rc = PGMFlushTLB(pVCpu, pVCpu->cpum.GstCtx.cr3, fFlushGlobalTlb);
-        AssertMsg(rc == VINF_SUCCESS, ("rc=%Rrc\n", rc)); NOREF(rc);
+        AssertMsgReturn(rc == VINF_SUCCESS, ("rc=%Rrc\n", rc), RT_FAILURE_NP(rc) ? rc : VERR_NEM_IPE_1);
+    }
+
+    if (fUpdateCr3)
+    {
+        int rc = PGMUpdateCR3(pVCpu, pVCpu->cpum.GstCtx.cr3);
+        AssertMsgReturn(rc == VINF_SUCCESS, ("rc=%Rrc\n", rc), RT_FAILURE_NP(rc) ? rc : VERR_NEM_IPE_2);
     }
 
@@ -1144 +1141 @@
     AssertReturn(idCpu < pGVM->cCpus, VERR_INVALID_VMCPU_HANDLE);
 
-    return nemR0WinImportState(pGVM, &pGVM->aCpus[idCpu], &pVCpu->cpum.GstCtx, fWhat);
+    return nemR0WinImportState(pGVM, &pGVM->aCpus[idCpu], &pVCpu->cpum.GstCtx, fWhat, true /*fCanUpdateCr3*/);
 # else
     RT_NOREF(pVCpu, fWhat);
@@ -1849 +1846 @@
 DECLINLINE(VBOXSTRICTRC) nemR0WinImportStateStrict(PGVM pGVM, PGVMCPU pGVCpu, PVMCPU pVCpu, uint64_t fWhat, const char *pszCaller)
 {
-    int rc = nemR0WinImportState(pGVM, pGVCpu, &pVCpu->cpum.GstCtx, fWhat);
+    int rc = nemR0WinImportState(pGVM, pGVCpu, &pVCpu->cpum.GstCtx, fWhat, true /*fCanUpdateCr3*/);
     if (RT_SUCCESS(rc))
     {
@@ -4363 +4360 @@
         {
 # ifdef IN_RING0
-            int rc2 = nemR0WinImportState(pGVM, pGVCpu, &pVCpu->cpum.GstCtx, fImport | CPUMCTX_EXTRN_NEM_WIN_EVENT_INJECT);
+            int rc2 = nemR0WinImportState(pGVM, pGVCpu, &pVCpu->cpum.GstCtx, fImport | CPUMCTX_EXTRN_NEM_WIN_EVENT_INJECT,
+                                          true /*fCanUpdateCr3*/);
             if (RT_SUCCESS(rc2))
                 pVCpu->cpum.GstCtx.fExtrn &= ~fImport;

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

@@ -1442 +1442 @@
 VMMDECL(int) PGMShwMakePageWritable(PVMCPU pVCpu, RTGCPTR GCPtr, uint32_t fOpFlags)
 {
-    return pdmShwModifyPage(pVCpu, GCPtr, X86_PTE_RW, ~(uint64_t)0, fOpFlags);
+    if (pVCpu->pgm.s.enmShadowMode != PGMMODE_NONE) /* avoid assertions */
+        return pdmShwModifyPage(pVCpu, GCPtr, X86_PTE_RW, ~(uint64_t)0, fOpFlags);
+    return VINF_SUCCESS;
 }
 

trunk/src/VBox/VMM/VMMR0/NEMR0Native-win.cpp

@@ -85 +85 @@
 #if defined(NEM_WIN_WITH_RING0_RUNLOOP) || defined(NEM_WIN_USE_HYPERCALLS_FOR_REGISTERS)
 NEM_TMPL_STATIC int  nemR0WinExportState(PGVM pGVM, PGVMCPU pGVCpu, PCPUMCTX pCtx);
-NEM_TMPL_STATIC int  nemR0WinImportState(PGVM pGVM, PGVMCPU pGVCpu, PCPUMCTX pCtx, uint64_t fWhat);
+NEM_TMPL_STATIC int  nemR0WinImportState(PGVM pGVM, PGVMCPU pGVCpu, PCPUMCTX pCtx, uint64_t fWhat, bool fCanUpdateCr3);
 NEM_TMPL_STATIC int  nemR0WinQueryCpuTick(PGVM pGVM, PGVMCPU pGVCpu, uint64_t *pcTicks, uint32_t *pcAux);
 NEM_TMPL_STATIC int  nemR0WinResumeCpuTickOnAll(PGVM pGVM, PGVMCPU pGVCpu, uint64_t uPausedTscValue);
@@ -1316 +1316 @@
  *
  * @returns VBox status code.
- * @param   pGVM        The ring-0 VM handle.
- * @param   pGVCpu      The ring-0 VCPU handle.
- * @param   pCtx        The CPU context structure to import into.
- * @param   fWhat       What to import, CPUMCTX_EXTRN_XXX.
+ * @param   pGVM            The ring-0 VM handle.
+ * @param   pGVCpu          The ring-0 VCPU handle.
+ * @param   pCtx            The CPU context structure to import into.
+ * @param   fWhat           What to import, CPUMCTX_EXTRN_XXX.
+ * @param   fCanUpdateCr3   Whether it's safe to update CR3 or not.
  */
-NEM_TMPL_STATIC int nemR0WinImportState(PGVM pGVM, PGVMCPU pGVCpu, PCPUMCTX pCtx, uint64_t fWhat)
+NEM_TMPL_STATIC int nemR0WinImportState(PGVM pGVM, PGVMCPU pGVCpu, PCPUMCTX pCtx, uint64_t fWhat, bool fCanUpdateCr3)
 {
     HV_INPUT_GET_VP_REGISTERS *pInput = (HV_INPUT_GET_VP_REGISTERS *)pGVCpu->nem.s.HypercallData.pbPage;
@@ -1719 +1720 @@
     /* Control registers. */
     bool fMaybeChangedMode = false;
-    bool fFlushTlb         = false;
-    bool fFlushGlobalTlb   = false;
+    bool fUpdateCr3        = false;
     if (fWhat & CPUMCTX_EXTRN_CR_MASK)
     {
@@ -1730 +1730 @@
                 CPUMSetGuestCR0(pVCpu, paValues[iReg].Reg64);
                 fMaybeChangedMode = true;
-                fFlushTlb = fFlushGlobalTlb = true; /// @todo fix this
             }
             iReg++;
@@ -1746 +1745 @@
             {
                 CPUMSetGuestCR3(pVCpu, paValues[iReg].Reg64);
-                fFlushTlb = true;
+                fUpdateCr3 = true;
             }
             iReg++;
@@ -1757 +1756 @@
                 CPUMSetGuestCR4(pVCpu, paValues[iReg].Reg64);
                 fMaybeChangedMode = true;
-                fFlushTlb = fFlushGlobalTlb = true; /// @todo fix this
             }
             iReg++;
@@ -2161 +2159 @@
 
     /* Typical. */
-    if (!fMaybeChangedMode && !fFlushTlb)
+    if (!fMaybeChangedMode && !fUpdateCr3)
         return VINF_SUCCESS;
 
@@ -2171 +2169 @@
     {
         rc = PGMChangeMode(pVCpu, pCtx->cr0, pCtx->cr4, pCtx->msrEFER);
-        AssertMsg(rc == VINF_SUCCESS, ("rc=%Rrc\n", rc));
-    }
-
-    if (fFlushTlb)
-    {
-        LogFlow(("nemR0WinImportState: -> VERR_NEM_FLUSH_TLB!\n"));
-        /** @todo eliminate the VERR_NEM_FLUSH_TLB/VINF_NEM_FLUSH_TLB complication */
-        rc = VERR_NEM_FLUSH_TLB; /* Calling PGMFlushTLB w/o long jump setup doesn't work, ring-3 does it. */
+        AssertMsgReturn(rc == VINF_SUCCESS, ("rc=%Rrc\n", rc), RT_FAILURE_NP(rc) ? rc : VERR_NEM_IPE_1);
+    }
+
+    if (fUpdateCr3)
+    {
+        if (fCanUpdateCr3)
+        {
+            LogFlow(("nemR0WinImportState: -> PGMUpdateCR3!\n"));
+            rc = PGMUpdateCR3(pVCpu, pCtx->cr3);
+            AssertMsgReturn(rc == VINF_SUCCESS, ("rc=%Rrc\n", rc), RT_FAILURE_NP(rc) ? rc : VERR_NEM_IPE_2);
+        }
+        else
+        {
+            LogFlow(("nemR0WinImportState: -> VERR_NEM_FLUSH_TLB!\n"));
+            rc = VERR_NEM_FLUSH_TLB; /* Calling PGMFlushTLB w/o long jump setup doesn't work, ring-3 does it. */
+        }
     }
 
@@ -2213 +2219 @@
          * Call worker.
          */
-        rc = nemR0WinImportState(pGVM, pGVCpu, &pVCpu->cpum.GstCtx, fWhat);
+        rc = nemR0WinImportState(pGVM, pGVCpu, &pVCpu->cpum.GstCtx, fWhat, false /*fCanUpdateCr3*/);
     }
     return rc;