Changeset 93207 in vbox

Timestamp:

Jan 12, 2022 7:14:56 PM (3 years ago)

Author:

vboxsync

Message:

VMM/NEM-win: Just drop the ring-0 bits when NEM/PGM mode is enabled. bugref:10122 bugref:10162

Location:

trunk/src/VBox/VMM

Files:

• Makefile.kmk (modified) (2 diffs)
• VMMR3/NEMR3.cpp (modified) (1 diff)
• VMMR3/NEMR3Native-win.cpp (modified) (7 diffs)
• include/NEMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/Makefile.kmk

@@ -575 +575 @@
 VMMR0_SOURCES.linux.amd64 += VMMR0/NEMR0Native-stubs.cpp
 
+  if 0
 VMMR0_SOURCES.win.amd64 += \
         VMMR0/NEMR0Native-win.cpp \
@@ -580 +581 @@
 VMMR0_DEFS.win.amd64    += VBOX_WITH_NATIVE_NEM VBOX_WITH_NEM_R0
 VMMR0/NEMR0Native-win.cpp_SDKS.win = ReorderCompilerIncs $(VBOX_WINDDK) $(VBOX_WINPSDK_INCS)
+  else
+VMMR0_SOURCES.win.amd64 += VMMR0/NEMR0Native-stubs.cpp
+  endif
 
 VMMR0_SOURCES.darwin.amd64 += \

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

@@ -122 +122 @@
 
 #ifdef RT_OS_WINDOWS
+# ifndef VBOX_WITH_PGM_NEM_MODE
+
     /** @cfgm{/NEM/UseRing0Runloop, bool, true}
      * Whether to use the ring-0 runloop (if enabled in the build) or the ring-3 one.
      * The latter is generally slower.  This option serves as a way out in case
      * something breaks in the ring-0 loop. */
-# ifdef NEM_WIN_USE_RING0_RUNLOOP_BY_DEFAULT
+#  ifdef NEM_WIN_USE_RING0_RUNLOOP_BY_DEFAULT
     bool fUseRing0Runloop = true;
-# else
+#  else
     bool fUseRing0Runloop = false;
-# endif
+#  endif
     rc = CFGMR3QueryBoolDef(pCfgNem, "UseRing0Runloop", &fUseRing0Runloop, fUseRing0Runloop);
     AssertLogRelRCReturn(rc, rc);
     pVM->nem.s.fUseRing0Runloop = fUseRing0Runloop;
+# endif
 #endif
 

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

@@ -1329 +1329 @@
              */
             rc = nemR3WinInitDiscoverIoControlProperties(pVM, pErrInfo);
+#ifndef VBOX_WITH_PGM_NEM_MODE
             if (rc == VERR_NEM_RING3_ONLY)
             {
@@ -1338 +1339 @@
                 rc = VINF_SUCCESS;
             }
+#endif
             if (RT_SUCCESS(rc))
             {
+#ifndef VBOX_WITH_PGM_NEM_MODE
                 /*
                  * Check out our ring-0 capabilities.
                  */
                 rc = SUPR3CallVMMR0Ex(VMCC_GET_VMR0_FOR_CALL(pVM), 0 /*idCpu*/, VMMR0_DO_NEM_INIT_VM, 0, NULL);
+#endif
                 if (RT_SUCCESS(rc))
                 {
@@ -1565 +1569 @@
         hPartitionDevice = NULL;
     }
+#ifndef VBOX_WITH_PGM_NEM_MODE
     if (   hPartitionDevice == NULL
         || hPartitionDevice == (HANDLE)(intptr_t)-1)
         return VMSetError(pVM, VERR_NEM_VM_CREATE_FAILED, RT_SRC_POS,
                           "Failed to get device handle for partition %p: %Rhrc", hPartition, hrc);
+#endif
 
     /* Test the handle. */
     HV_PARTITION_PROPERTY uValue;
     if (!g_pfnVidGetPartitionProperty(hPartitionDevice, HvPartitionPropertyProcessorVendor, &uValue))
+#ifndef VBOX_WITH_PGM_NEM_MODE
         return VMSetError(pVM, VERR_NEM_VM_CREATE_FAILED, RT_SRC_POS,
                           "Failed to get device handle and/or partition ID for %p (hPartitionDevice=%p, Last=%#x/%u)",
                           hPartition, hPartitionDevice, RTNtLastStatusValue(), RTNtLastErrorValue());
+#else
+        hPartitionDevice = INVALID_HANDLE_VALUE;
+#endif
     LogRel(("NEM: HvPartitionPropertyProcessorVendor=%#llx (%lld)\n", uValue, uValue));
 
@@ -1590 +1600 @@
     if (!g_pfnVidGetHvPartitionId(hPartitionDevice, &idHvPartition))
     {
+#ifndef VBOX_WITH_PGM_NEM_MODE
         if (RTNtLastErrorValue() != ERROR_INVALID_FUNCTION) /* Will try get it later in VMMR0_DO_NEM_INIT_VM_PART_2. */
             return VMSetError(pVM, VERR_NEM_VM_CREATE_FAILED, RT_SRC_POS,
@@ -1595 +1606 @@
                               hPartition, hPartitionDevice, RTNtLastStatusValue(), RTNtLastErrorValue());
         LogRel(("NEM: VidGetHvPartitionId failed with ERROR_NOT_SUPPORTED, will try again later from ring-0...\n"));
+#endif
         idHvPartition = HV_PARTITION_ID_INVALID;
     }
@@ -1659 +1671 @@
      * Do some more ring-0 initialization now that we've got the partition handle.
      */
+#ifndef VBOX_WITH_PGM_NEM_MODE
     int rc = VMMR3CallR0Emt(pVM, pVM->apCpusR3[0], VMMR0_DO_NEM_INIT_VM_PART_2, 0, NULL);
+#else
+    int rc = VINF_SUCCESS;
+#endif
     if (RT_SUCCESS(rc))
     {
@@ -1665 +1681 @@
                 hPartitionDevice, pVM->nem.s.idHvPartition));
 
-#if 1
+#ifndef VBOX_WITH_PGM_NEM_MODE
         VMMR3CallR0Emt(pVM, pVM->apCpusR3[0], VMMR0_DO_NEM_UPDATE_STATISTICS, 0, NULL);
         LogRel(("NEM: Memory balance: %#RX64 out of %#RX64 pages in use\n",

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

@@ -223 +223 @@
     /** WHvRunVpExitReasonException is supported. */
     bool                        fExtendedXcptExit : 1;
+# ifndef VBOX_WITH_PGM_NEM_MODE
     /** Set if we're using the ring-0 API to do the work. */
     bool                        fUseRing0Runloop : 1;
+# endif
 # ifdef NEM_WIN_WITH_A20
     /** Set if we've started more than one CPU and cannot mess with A20. */