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

Timestamp:

Mar 4, 2025 11:24:21 AM (2 months ago)

Author:

vboxsync

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

167808

Message:

VMM/NEM/Hyper-V: Started implementing a NEM/Hyper-V specific APIC emulation utilizing the LocalApicEmulation feature of Hyper-V, bugref:9993

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• APICR3Nem-win.cpp (added)
• NEMR3Native-win.cpp (modified) (8 diffs)
• PDMDevice.cpp (modified) (1 diff)

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

@@ -163 +163 @@
 static decltype(WHvGetVirtualProcessorRegisters) *  g_pfnWHvGetVirtualProcessorRegisters;
 static decltype(WHvSetVirtualProcessorRegisters) *  g_pfnWHvSetVirtualProcessorRegisters;
+static decltype(WHvSuspendPartitionTime) *          g_pfnWHvSuspendPartitionTime;
+static decltype(WHvResumePartitionTime) *           g_pfnWHvResumePartitionTime;
+decltype(WHvGetVirtualProcessorState) *             g_pfnWHvGetVirtualProcessorState = NULL;
+decltype(WHvSetVirtualProcessorState) *             g_pfnWHvSetVirtualProcessorState = NULL;
+decltype(WHvGetVirtualProcessorInterruptControllerState)  *g_pfnWHvGetVirtualProcessorInterruptControllerState = NULL;
+decltype(WHvSetVirtualProcessorInterruptControllerState)  *g_pfnWHvSetVirtualProcessorInterruptControllerState = NULL;
+decltype(WHvGetVirtualProcessorInterruptControllerState2) *g_pfnWHvGetVirtualProcessorInterruptControllerState2 = NULL;
+decltype(WHvSetVirtualProcessorInterruptControllerState2) *g_pfnWHvSetVirtualProcessorInterruptControllerState2 = NULL;
+decltype(WHvRequestInterrupt) *                     g_pfnWHvRequestInterrupt;
 /** @} */
 
@@ -213 +222 @@
     NEM_WIN_IMPORT(0, false, WHvGetVirtualProcessorRegisters),
     NEM_WIN_IMPORT(0, false, WHvSetVirtualProcessorRegisters),
+    NEM_WIN_IMPORT(0, true,  WHvSuspendPartitionTime),
+    NEM_WIN_IMPORT(0, true,  WHvResumePartitionTime),
+    NEM_WIN_IMPORT(0, true,  WHvRequestInterrupt),
+    NEM_WIN_IMPORT(0, true,  WHvGetVirtualProcessorState),
+    NEM_WIN_IMPORT(0, true,  WHvSetVirtualProcessorState),
+    NEM_WIN_IMPORT(0, true,  WHvGetVirtualProcessorInterruptControllerState),
+    NEM_WIN_IMPORT(0, true,  WHvSetVirtualProcessorInterruptControllerState),
+    NEM_WIN_IMPORT(0, true,  WHvGetVirtualProcessorInterruptControllerState2),
+    NEM_WIN_IMPORT(0, true,  WHvSetVirtualProcessorInterruptControllerState2),
 
     NEM_WIN_IMPORT(1, true,  VidGetHvPartitionId),
@@ -285 +303 @@
 # define WHvGetVirtualProcessorRegisters            g_pfnWHvGetVirtualProcessorRegisters
 # define WHvSetVirtualProcessorRegisters            g_pfnWHvSetVirtualProcessorRegisters
+# define WHvSuspendPartitionTime                    g_pfnWHvSuspendPartitionTime
+# define WHvResumePartitionTime                     g_pfnWHvResumePartitionTime
+# define WHvRequestInterrupt                        g_pfnWHvRequestInterrupt
+# define WHvGetVirtualProcessorState                g_pfnWHvGetVirtualProcessorState
+# define WHvSetVirtualProcessorState                g_pfnWHvSetVirtualProcessorState
+# define WHvGetVirtualProcessorInterruptControllerState     g_pfnWHvGetVirtualProcessorInterruptControllerState
+# define WHvGetVirtualProcessorInterruptControllerState2    g_pfnWHvGetVirtualProcessorInterruptControllerState2
 
 # define VidMessageSlotHandleAndGetNext             g_pfnVidMessageSlotHandleAndGetNext
@@ -585 +610 @@
                 *g_aImports[i].ppfn = NULL;
 
-                LogRel(("NEM:  %s: Failed to import %s!%s: %Rrc",
+                LogRel(("NEM:  %s: Failed to import %s!%s: %Rrc\n",
                         g_aImports[i].fOptional ? "info" : fForced ? "fatal" : "error",
                         s_apszDllNames[g_aImports[i].idxDll], g_aImports[i].pszName, rc2));
@@ -740 +765 @@
         NEM_LOG_REL_CAP_SUB_EX("Unknown features", "%#RX64", Caps.ExtendedVmExits.AsUINT64 & ~fKnownVmExits);
     pVM->nem.s.fSpeculationControl = RT_BOOL(Caps.Features.SpeculationControl);
+    pVM->nem.s.fLocalApicEmulation = RT_BOOL(Caps.Features.LocalApicEmulation);
     /** @todo RECHECK: WHV_CAPABILITY_FEATURES typedef. */
 
@@ -1255 +1281 @@
                              hrc, RTNtLastStatusValue(), RTNtLastErrorValue());
 
-    int rc;
+    int rc = VINF_SUCCESS;
 
     /*
@@ -1281 +1307 @@
         if (SUCCEEDED(hrc))
         {
+            RT_ZERO(Property);
             /*
-             * We'll continue setup in nemR3NativeInitAfterCPUM.
+             * If the APIC is enabled and LocalApicEmulation is supported we'll use Hyper-V's APIC emulation
+             * for best performance.
              */
-            pVM->nem.s.fCreatedEmts     = false;
-            pVM->nem.s.hPartition       = hPartition;
-            LogRel(("NEM: Created partition %p.\n", hPartition));
-            return VINF_SUCCESS;
+            PCFGMNODE pCfgmApic = CFGMR3GetChild(CFGMR3GetRoot(pVM), "/Devices/apic");
+            if (   pCfgmApic
+                && pVM->nem.s.fLocalApicEmulation
+                && 0) /** @todo Finish */
+            {
+                /* If setting this fails log an error but continue. */
+                Property.LocalApicEmulationMode = WHvX64LocalApicEmulationModeXApic;
+                hrc = WHvSetPartitionProperty(hPartition, WHvPartitionPropertyCodeLocalApicEmulationMode  , &Property, sizeof(Property));
+                if (FAILED(hrc))
+                {
+                    LogRel(("NEM: Failed setting WHvPartitionPropertyCodeLocalApicEmulationMode to WHvX64LocalApicEmulationModeXApic: %Rhrc (Last=%#x/%u)",
+                            hrc, RTNtLastStatusValue(), RTNtLastErrorValue()));
+                    pVM->nem.s.fLocalApicEmulation = false;
+                }
+                else
+                {
+                    /* Rewrite the configuration tree to point to our APIC emulation. */
+                    PCFGMNODE pCfgmDev = CFGMR3GetChild(CFGMR3GetRoot(pVM), "/Devices");
+                    Assert(pCfgmDev);
+
+                    PCFGMNODE pCfgmApicHv = NULL;
+                    rc = CFGMR3InsertNode(pCfgmDev, "apic-nem", &pCfgmApicHv);
+                    if (RT_SUCCESS(rc))
+                    {
+                        rc = CFGMR3CopyTree(pCfgmApicHv, pCfgmApic, CFGM_COPY_FLAGS_IGNORE_EXISTING_KEYS | CFGM_COPY_FLAGS_IGNORE_EXISTING_VALUES);
+                        if (RT_SUCCESS(rc))
+                            CFGMR3RemoveNode(pCfgmApic);
+                    }
+
+                    if (RT_FAILURE(rc))
+                        rc = RTErrInfoSetF(pErrInfo, rc, "Failed replace APIC device config with Hyper-V one");
+                }
+            }
+            else
+                pVM->nem.s.fLocalApicEmulation = false;
+
+
+            if (RT_SUCCESS(rc))
+            {
+                /*
+                 * We'll continue setup in nemR3NativeInitAfterCPUM.
+                 */
+                pVM->nem.s.fCreatedEmts     = false;
+                pVM->nem.s.hPartition       = hPartition;
+                LogRel(("NEM: Created partition %p.\n", hPartition));
+                return VINF_SUCCESS;
+            }
         }
 
@@ -1321 +1392 @@
      */
     PCFGMNODE pCfg = CFGMR3GetChild(CFGMR3GetRoot(pVM), "/Devices/apic/0/Config");
+    if (!pCfg)
+        pCfg = CFGMR3GetChild(CFGMR3GetRoot(pVM), "/Devices/apic-nem/0/Config");
     if (pCfg)
     {

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

@@ -721 +721 @@
     int rc = pdmR3DevReg_Register(&RegCB.Core, &g_DeviceAPIC);
     AssertRCReturn(rc, rc);
+
+# if defined(RT_OS_WINDOWS)
+    /* Register the internal VMM APIC device for NEM mode. */
+    rc = pdmR3DevReg_Register(&RegCB.Core, &g_DeviceAPICNem);
+    AssertRCReturn(rc, rc);
+# endif
 #endif