Changeset 92120 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Oct 28, 2021 12:31:35 AM (3 years ago)

Author:

vboxsync

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

147939

Message:

VMM/NEM/win: New approach to A20: Reschedule to IEM. Logging. bugref:10122

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• NEMR3.cpp (modified) (2 diffs)
• NEMR3Native-win.cpp (modified) (11 diffs)

trunk/src/VBox/VMM/VMMR3/NEMR3.cpp

@@ -406 +406 @@
 
 
+#ifndef VBOX_WITH_NATIVE_NEM
 VMMR3_INT_DECL(bool) NEMR3CanExecuteGuest(PVM pVM, PVMCPU pVCpu)
 {
-    Assert(VM_IS_NEM_ENABLED(pVM));
-#ifdef VBOX_WITH_NATIVE_NEM
-    return nemR3NativeCanExecuteGuest(pVM, pVCpu);
-#else
-    NOREF(pVM); NOREF(pVCpu);
+    RT_NOREF(pVM, pVCpu);
     return false;
-#endif
-}
+}
+#endif
 
 
@@ -441 +438 @@
 
 
+#ifndef VBOX_WITH_NATIVE_NEM
 VMMR3_INT_DECL(void) NEMR3NotifySetA20(PVMCPU pVCpu, bool fEnabled)
 {
-#ifdef VBOX_WITH_NATIVE_NEM
-    if (pVCpu->pVMR3->bMainExecutionEngine == VM_EXEC_ENGINE_NATIVE_API)
-        nemR3NativeNotifySetA20(pVCpu, fEnabled);
-#else
-    NOREF(pVCpu); NOREF(fEnabled);
-#endif
-}
-
+    RT_NOREF(pVCpu, fEnabled);
+}
+#endif
+

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

@@ -1279 +1279 @@
      * Some state init.
      */
+#ifdef NEM_WIN_WITH_A20
     pVM->nem.s.fA20Enabled = true;
+#endif
 #if 0
     for (VMCPUID idCpu = 0; idCpu < pVM->cCpus; idCpu++)
@@ -1814 +1816 @@
 void nemR3NativeReset(PVM pVM)
 {
+#if 0
     /* Unfix the A20 gate. */
     pVM->nem.s.fA20Fixed = false;
+#else
+    RT_NOREF(pVM);
+#endif
 }
 
@@ -1828 +1834 @@
 void nemR3NativeResetCpu(PVMCPU pVCpu, bool fInitIpi)
 {
+#ifdef NEM_WIN_WITH_A20
     /* Lock the A20 gate if INIT IPI, make sure it's enabled.  */
     if (fInitIpi && pVCpu->idCpu > 0)
@@ -1837 +1844 @@
         pVM->nem.s.fA20Fixed   = true;
     }
+#else
+    RT_NOREF(pVCpu, fInitIpi);
+#endif
 }
 
@@ -1886 +1896 @@
 
 
-bool nemR3NativeCanExecuteGuest(PVM pVM, PVMCPU pVCpu)
-{
-    NOREF(pVM); NOREF(pVCpu);
+VMMR3_INT_DECL(bool) NEMR3CanExecuteGuest(PVM pVM, PVMCPU pVCpu)
+{
+    Assert(VM_IS_NEM_ENABLED(pVM));
+
+#ifndef NEM_WIN_WITH_A20
+    /*
+     * Only execute when the A20 gate is enabled because this lovely Hyper-V
+     * blackbox does not seem to have any way to enable or disable A20.
+     */
+    RT_NOREF(pVM);
+    return PGMPhysIsA20Enabled(pVCpu);
+#else
+    RT_NOREF(pVM, pVCpu);
     return true;
+#endif
 }
 
@@ -2023 +2044 @@
         *pu2State = NEM_WIN_PAGE_STATE_UNMAPPED;
     }
+    RT_NOREF(pvRam);
 
 #else
@@ -2206 +2228 @@
 
 
+#ifdef NEM_WIN_WITH_A20
 /**
  * Unmaps a page from Hyper-V for the purpose of emulating A20 gate behavior.
@@ -2220 +2243 @@
                                      nemR3WinUnsetForA20CheckerCallback, NULL);
 }
+#endif
 
 
@@ -2232 +2256 @@
  * @param   fEnabled        Whether it was enabled (true) or disabled.
  */
-void nemR3NativeNotifySetA20(PVMCPU pVCpu, bool fEnabled)
+VMMR3_INT_DECL(void) NEMR3NotifySetA20(PVMCPU pVCpu, bool fEnabled)
 {
     Log(("nemR3NativeNotifySetA20: fEnabled=%RTbool\n", fEnabled));
+    Assert(VM_IS_NEM_ENABLED(pVCpu->CTX_SUFF(pVM)));
+#ifdef NEM_WIN_WITH_A20
     PVM pVM = pVCpu->CTX_SUFF(pVM);
     if (!pVM->nem.s.fA20Fixed)
@@ -2242 +2268 @@
             nemR3WinUnmapPageForA20Gate(pVM, pVCpu, GCPhys);
     }
+#else
+    RT_NOREF(pVCpu, fEnabled);
+#endif
 }
 
@@ -2446 +2475 @@
  *   (e.g. possiblity of two CPUs with different A20 status).
  *
- *   Workaround: Only do A20 on CPU 0, restricting the emulation to HMA.  We
- *   unmap all pages related to HMA (0x100000..0x10ffff) when the A20 state
- *   changes, lazily syncing the right pages back when accessed.
+ *   Workaround #1 (obsolete): Only do A20 on CPU 0, restricting the emulation
+ *   to HMA. We unmap all pages related to HMA (0x100000..0x10ffff) when the A20
+ *   state changes, lazily syncing the right pages back when accessed.
+ *
+ *   Workaround #2 (used): Use IEM when the A20 gate is disabled.
  *
  *