Changeset 73282 in vbox

Timestamp:

Jul 20, 2018 8:04:26 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

123889

Message:

NEM/win: Kicked out VINF/VERR_NEM_UPDATE_APIC_BASE and VINF/VERR_NEM_CHANGE_PGM_MODE and associated complications. bugref:9044

Location:

trunk

Files:

• include/VBox/err.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/NEMAllNativeTemplate-win.cpp.h (modified) (4 diffs)
• src/VBox/VMM/VMMR0/NEMR0Native-win.cpp (modified) (5 diffs)
• src/VBox/VMM/VMMR3/NEMR3Native-win.cpp (modified) (3 diffs)
• src/VBox/VMM/include/NEMInternal.h (modified) (1 diff)

trunk/include/VBox/err.h

@@ -2827 +2827 @@
 /** Get register caller must flush the TLB. */
 #define VINF_NEM_FLUSH_TLB                          (6809)
-/** Get register caller must change the CPU mode (not an error). */
-#define VERR_NEM_CHANGE_PGM_MODE                    (-6810)
-/** Get register caller must change the CPU mode. */
-#define VINF_NEM_CHANGE_PGM_MODE                    (6810)
-/** Get register caller must update the APIC base (not an error). */
-#define VERR_NEM_UPDATE_APIC_BASE                   (-6811)
-/** Get register caller must update the APIC base. */
-#define VINF_NEM_UPDATE_APIC_BASE                   (6811)
+
+
 /** NEM failed to set TSC. */
 #define VERR_NEM_SET_TSC                            (-6812)

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

@@ -497 +497 @@
         if (rc == VERR_NEM_FLUSH_TLB)
             return PGMFlushTLB(pVCpu, pVCpu->cpum.GstCtx.cr3, true /*fGlobal*/);
-        if (rc == VERR_NEM_CHANGE_PGM_MODE)
-            return PGMChangeMode(pVCpu, pVCpu->cpum.GstCtx.cr0, pVCpu->cpum.GstCtx.cr4, pVCpu->cpum.GstCtx.msrEFER);
         AssertLogRelRCReturn(rc, rc);
         return rc;
@@ -1834 +1832 @@
 #if defined(IN_RING0) && defined(NEM_WIN_TEMPLATE_MODE_OWN_RUN_API)
 /**
- * Wrapper around nemR0WinImportState that converts VERR_NEM_CHANGE_PGM_MODE and
- * VERR_NEM_FLUSH_TBL into informational status codes and logs+asserts statuses.
+ * Wrapper around nemR0WinImportState that converts VERR_NEM_FLUSH_TLB
+ * into informational status codes and logs+asserts statuses.
  *
  * @returns VBox strict status code.
@@ -1853 +1851 @@
     }
 
-    if (rc == VERR_NEM_CHANGE_PGM_MODE || rc == VERR_NEM_FLUSH_TLB || rc == VERR_NEM_UPDATE_APIC_BASE)
+    if (rc == VERR_NEM_FLUSH_TLB)
     {
         Log4(("%s/%u: nemR0WinImportState -> %Rrc\n", pszCaller, pGVCpu->idCpu, -rc));
@@ -4363 +4361 @@
             if (RT_SUCCESS(rc2))
                 pVCpu->cpum.GstCtx.fExtrn &= ~fImport;
-            else if (rc2 == VERR_NEM_CHANGE_PGM_MODE || rc2 == VERR_NEM_FLUSH_TLB || rc2 == VERR_NEM_UPDATE_APIC_BASE)
+            else if (rc2 == VERR_NEM_FLUSH_TLB)
             {
                 pVCpu->cpum.GstCtx.fExtrn &= ~fImport;

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

@@ -1981 +1981 @@
         iReg++;
     }
-    bool fUpdateApicBase = false;
     if (fWhat & CPUMCTX_EXTRN_OTHER_MSRS)
     {
@@ -1991 +1990 @@
                   pVCpu->idCpu, uOldBase, paValues[iReg].Reg64, paValues[iReg].Reg64 ^ uOldBase));
             int rc2 = APICSetBaseMsr(pVCpu, paValues[iReg].Reg64);
-            /** @todo fix me VINF_CPUM_R3_MSR_WRITE / APICSetBaseMsr */
-            if (rc2 == VINF_CPUM_R3_MSR_WRITE)
-            {
-                pVCpu->nem.s.uPendingApicBase = paValues[iReg].Reg64;
-                fUpdateApicBase = true;
-            }
-            else
-                AssertLogRelMsg(rc2 == VINF_SUCCESS, ("rc2=%Rrc [%#RX64]\n", rc2, paValues[iReg].Reg64));
+            AssertLogRelMsg(rc2 == VINF_SUCCESS, ("rc2=%Rrc [%#RX64]\n", rc2, paValues[iReg].Reg64));
         }
         iReg++;
@@ -2166 +2158 @@
 
     /* Typical. */
-    if (!fMaybeChangedMode && !fFlushTlb && !fUpdateApicBase)
+    if (!fMaybeChangedMode && !fFlushTlb)
         return VINF_SUCCESS;
 
@@ -2176 +2168 @@
     {
         rc = PGMChangeMode(pVCpu, pCtx->cr0, pCtx->cr4, pCtx->msrEFER);
-        if (rc == VINF_PGM_CHANGE_MODE)
-        {
-            LogFlow(("nemR0WinImportState: -> VERR_NEM_CHANGE_PGM_MODE!\n"));
-            return VERR_NEM_CHANGE_PGM_MODE;
-        }
         AssertMsg(rc == VINF_SUCCESS, ("rc=%Rrc\n", rc));
     }
@@ -2187 +2174 @@
     {
         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. */
-    }
-
-    if (fUpdateApicBase && rc == VINF_SUCCESS)
-    {
-        LogFlow(("nemR0WinImportState: -> VERR_NEM_UPDATE_APIC_BASE!\n"));
-        rc = VERR_NEM_UPDATE_APIC_BASE;
     }
 

trunk/src/VBox/VMM/VMMR3/NEMR3Native-win.cpp

@@ -1172 +1172 @@
      */
     pVM->nem.s.fA20Enabled = true;
+#if 0
     for (VMCPUID iCpu = 0; iCpu < pVM->cCpus; iCpu++)
     {
         PNEMCPU pNemCpu = &pVM->aCpus[iCpu].nem.s;
-        pNemCpu->uPendingApicBase = UINT64_MAX;
     }
+#endif
 
     /*
@@ -1664 +1665 @@
             {
                 /*
-                 * We deal with VINF_NEM_CHANGE_PGM_MODE, VINF_NEM_FLUSH_TLB and
-                 * VINF_NEM_UPDATE_APIC_BASE  here, since we're running the risk of
+                 * We deal with VINF_NEM_FLUSH_TLB here, since we're running the risk of
                  * getting these while we already got another RC (I/O ports).
-                 *
-                 * The APIC base update and a PGM update can happen at the same time, so
-                 * we don't depend on the status code for that and always checks it first.
                  */
-                /* APIC base: */
-                if (pVCpu->nem.s.uPendingApicBase != UINT64_MAX)
-                {
-                    LogFlow(("nemR3NativeRunGC: calling APICSetBaseMsr(,%RX64)...\n", pVCpu->nem.s.uPendingApicBase));
-                    int rc2 = APICSetBaseMsr(pVCpu, pVCpu->nem.s.uPendingApicBase);
-                    AssertLogRelMsg(rc2 == VINF_SUCCESS, ("rc2=%Rrc [%#RX64]\n", rc2, pVCpu->nem.s.uPendingApicBase));
-                    pVCpu->nem.s.uPendingApicBase = UINT64_MAX;
-                }
-
                 /* Status codes: */
                 VBOXSTRICTRC rcPending = pVCpu->nem.s.rcPending;
                 pVCpu->nem.s.rcPending = VINF_SUCCESS;
-                if (   rcStrict == VINF_NEM_CHANGE_PGM_MODE
-                    || rcStrict == VINF_PGM_CHANGE_MODE
-                    || rcPending == VINF_NEM_CHANGE_PGM_MODE )
+                if (rcStrict == VINF_NEM_FLUSH_TLB || rcPending == VINF_NEM_FLUSH_TLB)
                 {
-                    LogFlow(("nemR3NativeRunGC: calling PGMChangeMode...\n"));
-                    int rc = PGMChangeMode(pVCpu, CPUMGetGuestCR0(pVCpu), CPUMGetGuestCR4(pVCpu), CPUMGetGuestEFER(pVCpu));
+                    LogFlow(("nemR3NativeRunGC: calling PGMFlushTLB...\n"));
+                    int rc = PGMFlushTLB(pVCpu, CPUMGetGuestCR3(pVCpu), true);
                     AssertRCReturn(rc, rc);
-                    if (   rcStrict == VINF_NEM_CHANGE_PGM_MODE
-                        || rcStrict == VINF_PGM_CHANGE_MODE
-                        || rcStrict == VINF_NEM_FLUSH_TLB)
+                    if (rcStrict == VINF_NEM_FLUSH_TLB)
                     {
                         if (   !VM_FF_IS_PENDING(pVM, VM_FF_HIGH_PRIORITY_POST_MASK | VM_FF_HP_R0_PRE_HM_MASK)
@@ -1704 +1688 @@
                     }
                 }
-                else if (rcStrict == VINF_NEM_FLUSH_TLB || rcPending == VINF_NEM_FLUSH_TLB)
-                {
-                    LogFlow(("nemR3NativeRunGC: calling PGMFlushTLB...\n"));
-                    int rc = PGMFlushTLB(pVCpu, CPUMGetGuestCR3(pVCpu), true);
-                    AssertRCReturn(rc, rc);
-                    if (rcStrict == VINF_NEM_FLUSH_TLB || rcStrict == VINF_NEM_CHANGE_PGM_MODE)
-                    {
-                        if (   !VM_FF_IS_PENDING(pVM, VM_FF_HIGH_PRIORITY_POST_MASK | VM_FF_HP_R0_PRE_HM_MASK)
-                            && !VMCPU_FF_IS_PENDING(pVCpu,   (VMCPU_FF_HIGH_PRIORITY_POST_MASK | VMCPU_FF_HP_R0_PRE_HM_MASK)
-                                                           & ~VMCPU_FF_RESUME_GUEST_MASK))
-                        {
-                            VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_RESUME_GUEST_MASK);
-                            continue;
-                        }
-                        rcStrict = VINF_SUCCESS;
-                    }
-                }
-                else if (rcStrict == VINF_NEM_UPDATE_APIC_BASE || rcPending == VERR_NEM_UPDATE_APIC_BASE)
-                    continue;
                 else
                     AssertMsg(rcPending == VINF_SUCCESS, ("rcPending=%Rrc\n", VBOXSTRICTRC_VAL(rcPending) ));

trunk/src/VBox/VMM/include/NEMInternal.h

@@ -232 +232 @@
     /** Last copy of HV_X64_VP_EXECUTION_STATE::InterruptShadow. */
     bool                        fLastInterruptShadow : 1;
-    /** Pending APIC base value.
-     * This is set to UINT64_MAX when not pending  */
-    uint64_t                    uPendingApicBase;
 # ifdef NEM_WIN_WITH_RING0_RUNLOOP
-    /** Pending VINF_NEM_CHANGE_PGM_MODE, VINF_NEM_FLUSH_TLB or VINF_NEM_UPDATE_APIC_BASE. */
+    /** Pending VINF_NEM_FLUSH_TLB. */
     int32_t                     rcPending;
 # else