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

Timestamp:

Mar 10, 2018 12:53:26 AM (7 years ago)

Author:

vboxsync

Message:

NEM: Updates for build 17115 and fixes for AMD-V. bugref:9044

File:

• trunk/src/VBox/VMM/VMMR3/NEMR3Native-win.cpp (modified) (19 diffs)

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

@@ -54 +54 @@
 #include <iprt/path.h>
 #include <iprt/string.h>
+#include <iprt/system.h>
 
 
@@ -71 +72 @@
 /** VID I/O control detection: Fake timeout input. */
 #define NEM_WIN_IOCTL_DETECTOR_FAKE_TIMEOUT         UINT32_C(0x00080286)
+
+
+/*********************************************************************************************************************************
+*   Structures and Typedefs                                                                                                      *
+*********************************************************************************************************************************/
+#ifndef NEM_WIN_USE_17110_PLUS_WDK
+typedef HRESULT (WINAPI *PFNWHVGETCAPABILITY_17110)(WHV_CAPABILITY_CODE, void *, uint32_t, uint32_t *);
+typedef HRESULT (WINAPI *PFNWHVSETPARTITIONPROPERTY_17110)(WHV_PARTITION_HANDLE, WHV_PARTITION_PROPERTY_CODE, void *, uint32_t);
+#endif
 
 
@@ -111 +121 @@
 #endif
 /** @} */
+
+/** The Windows build number. */
+static uint32_t g_uBuildNo = 17110;
+
 
 
@@ -212 +226 @@
 
 # define VidMessageSlotHandleAndGetNext             g_pfnVidMessageSlotHandleAndGetNext
-# define VidStartVirtualProcessor                    g_pfnVidStartVirtualProcessor
+# define VidStartVirtualProcessor                   g_pfnVidStartVirtualProcessor
 # define VidStopVirtualProcessor                    g_pfnVidStopVirtualProcessor
 
@@ -512 +526 @@
 
 /**
+ * Wrapper for different WHvGetCapability signatures.
+ */
+DECLINLINE(HRESULT) WHvGetCapabilityWrapper(WHV_CAPABILITY_CODE enmCap, WHV_CAPABILITY *pOutput, uint32_t cbOutput)
+{
+#ifdef NEM_WIN_USE_17110_PLUS_WDK
+    return g_pfnWHvGetCapability(enmCap, pOutput, cbOutput, NULL);
+#else
+    if (g_uBuildNo >= 17110)
+    {
+        PFNWHVGETCAPABILITY_17110 pfnNewVersion = (PFNWHVGETCAPABILITY_17110)g_pfnWHvGetCapability;
+        return pfnNewVersion(enmCap, &pOutput->HypervisorPresent, cbOutput - RT_OFFSETOF(WHV_CAPABILITY, HypervisorPresent), NULL);
+    }
+    return g_pfnWHvGetCapability(enmCap, pOutput, cbOutput);
+#endif
+}
+
+
+/**
  * Worker for nemR3NativeInit that gets the hypervisor capabilities.
  *
@@ -543 +575 @@
     RT_ZERO(Caps);
     SetLastError(0);
-    HRESULT hrc = WHvGetCapability(WHvCapabilityCodeHypervisorPresent, &Caps, sizeof(Caps));
+    HRESULT hrc = WHvGetCapabilityWrapper(WHvCapabilityCodeHypervisorPresent, &Caps, sizeof(Caps));
     DWORD   rcWin = GetLastError();
     if (FAILED(hrc))
@@ -563 +595 @@
      */
     RT_ZERO(Caps);
-    hrc = WHvGetCapability(WHvCapabilityCodeExtendedVmExits, &Caps, sizeof(Caps));
+    hrc = WHvGetCapabilityWrapper(WHvCapabilityCodeExtendedVmExits, &Caps, sizeof(Caps));
     if (FAILED(hrc))
         return RTErrInfoSetF(pErrInfo, VERR_NEM_INIT_FAILED,
@@ -583 +615 @@
      */
     RT_ZERO(Caps);
-    hrc = WHvGetCapability(WHvCapabilityCodeFeatures, &Caps, sizeof(Caps));
+    hrc = WHvGetCapabilityWrapper(WHvCapabilityCodeFeatures, &Caps, sizeof(Caps));
     if (FAILED(hrc))
         return RTErrInfoSetF(pErrInfo, VERR_NEM_INIT_FAILED,
@@ -596 +628 @@
      */
     RT_ZERO(Caps);
-    hrc = WHvGetCapability(WHvCapabilityCodeProcessorVendor, &Caps, sizeof(Caps));
+    hrc = WHvGetCapabilityWrapper(WHvCapabilityCodeProcessorVendor, &Caps, sizeof(Caps));
     if (FAILED(hrc))
         return RTErrInfoSetF(pErrInfo, VERR_NEM_INIT_FAILED,
@@ -621 +653 @@
      */
     RT_ZERO(Caps);
-    hrc = WHvGetCapability(WHvCapabilityCodeProcessorFeatures, &Caps, sizeof(Caps));
+    hrc = WHvGetCapabilityWrapper(WHvCapabilityCodeProcessorFeatures, &Caps, sizeof(Caps));
     if (FAILED(hrc))
         return RTErrInfoSetF(pErrInfo, VERR_NEM_INIT_FAILED,
@@ -680 +712 @@
      */
     RT_ZERO(Caps);
-    hrc = WHvGetCapability(WHvCapabilityCodeProcessorClFlushSize, &Caps, sizeof(Caps));
+    hrc = WHvGetCapabilityWrapper(WHvCapabilityCodeProcessorClFlushSize, &Caps, sizeof(Caps));
     if (FAILED(hrc))
         return RTErrInfoSetF(pErrInfo, VERR_NEM_INIT_FAILED,
@@ -710 +742 @@
             {
                 RT_ZERO(Caps);
-                hrc = WHvGetCapability((WHV_CAPABILITY_CODE)i, &Caps, sizeof(Caps));
+                hrc = WHvGetCapabilityWrapper((WHV_CAPABILITY_CODE)i, &Caps, sizeof(Caps));
                 if (SUCCEEDED(hrc))
                     LogRel(("NEM: Warning! Unknown capability %#x returning: %.*Rhxs\n", i, sizeof(Caps), &Caps));
@@ -977 +1009 @@
 
 /**
+ * Wrapper for different WHvSetPartitionProperty signatures.
+ */
+DECLINLINE(HRESULT) WHvSetPartitionPropertyWrapper(WHV_PARTITION_HANDLE hPartition, WHV_PARTITION_PROPERTY_CODE enmProp,
+                                                   WHV_PARTITION_PROPERTY *pInput, uint32_t cbInput)
+{
+#ifdef NEM_WIN_USE_17110_PLUS_WDK
+    return g_pfnWHvSetPartitionProperty(hPartition, enmProp, pInput, cbInput, NULL);
+#else
+    pInput->PropertyCode = enmProp;
+    if (g_uBuildNo >= 17110)
+    {
+        PFNWHVSETPARTITIONPROPERTY_17110 pfnNewVersion = (PFNWHVSETPARTITIONPROPERTY_17110)g_pfnWHvSetPartitionProperty;
+        return pfnNewVersion(hPartition, enmProp, &pInput->ExtendedVmExits,
+                             cbInput - RT_UOFFSETOF(WHV_PARTITION_PROPERTY, ExtendedVmExits));
+    }
+    return g_pfnWHvSetPartitionProperty(hPartition, pInput, cbInput);
+#endif
+}
+
+
+/**
  * Creates and sets up a Hyper-V (exo) partition.
  *
@@ -1012 +1065 @@
     WHV_PARTITION_PROPERTY Property;
     RT_ZERO(Property);
-    Property.PropertyCode   = WHvPartitionPropertyCodeProcessorCount;
     Property.ProcessorCount = pVM->cCpus;
-    hrc = WHvSetPartitionProperty(hPartition, &Property, sizeof(Property));
+    hrc = WHvSetPartitionPropertyWrapper(hPartition, WHvPartitionPropertyCodeProcessorCount, &Property, sizeof(Property));
     if (SUCCEEDED(hrc))
     {
         RT_ZERO(Property);
-        Property.PropertyCode                  = WHvPartitionPropertyCodeExtendedVmExits;
+#if 0
         Property.ExtendedVmExits.X64CpuidExit  = pVM->nem.s.fExtendedCpuIdExit;
         Property.ExtendedVmExits.X64MsrExit    = pVM->nem.s.fExtendedMsrExit;
         Property.ExtendedVmExits.ExceptionExit = pVM->nem.s.fExtendedXcptExit;
-        hrc = WHvSetPartitionProperty(hPartition, &Property, sizeof(Property));
+#endif
+        hrc = WHvSetPartitionPropertyWrapper(hPartition, WHvPartitionPropertyCodeExtendedVmExits, &Property, sizeof(Property));
         if (SUCCEEDED(hrc))
         {
@@ -1065 +1118 @@
 int nemR3NativeInit(PVM pVM, bool fFallback, bool fForced)
 {
+    g_uBuildNo = RTSystemGetNtBuildNo();
+
     /*
      * Error state.
@@ -1159 +1214 @@
      * Continue setting up the partition now that we've got most of the CPUID feature stuff.
      */
-
-    /* Not sure if we really need to set the vendor. */
     WHV_PARTITION_PROPERTY Property;
+    HRESULT                hrc;
+
+#if 0
+    /* Not sure if we really need to set the vendor.
+       Update: Apparently we don't. WHvPartitionPropertyCodeProcessorVendor was removed in 17110. */
     RT_ZERO(Property);
-    Property.PropertyCode    = WHvPartitionPropertyCodeProcessorVendor;
     Property.ProcessorVendor = pVM->nem.s.enmCpuVendor == CPUMCPUVENDOR_AMD ? WHvProcessorVendorAmd
                              : WHvProcessorVendorIntel;
-    HRESULT hrc = WHvSetPartitionProperty(hPartition, &Property, sizeof(Property));
+    hrc = WHvSetPartitionPropertyWrapper(hPartition, WHvPartitionPropertyCodeProcessorVendor, &Property, sizeof(Property));
     if (FAILED(hrc))
         return VMSetError(pVM, VERR_NEM_VM_CREATE_FAILED, RT_SRC_POS,
                           "Failed to set WHvPartitionPropertyCodeProcessorVendor to %u: %Rhrc (Last=%#x/%u)",
                           Property.ProcessorVendor, hrc, RTNtLastStatusValue(), RTNtLastErrorValue());
+#endif
 
     /* Not sure if we really need to set the cache line flush size. */
     RT_ZERO(Property);
-    Property.PropertyCode         = WHvPartitionPropertyCodeProcessorClFlushSize;
     Property.ProcessorClFlushSize = pVM->nem.s.cCacheLineFlushShift;
-    hrc = WHvSetPartitionProperty(hPartition, &Property, sizeof(Property));
+    hrc = WHvSetPartitionPropertyWrapper(hPartition, WHvPartitionPropertyCodeProcessorClFlushSize, &Property, sizeof(Property));
     if (FAILED(hrc))
         return VMSetError(pVM, VERR_NEM_VM_CREATE_FAILED, RT_SRC_POS,
@@ -1189 +1246 @@
     /* Set the partition property. */
     RT_ZERO(Property);
-    Property.PropertyCode               = WHvPartitionPropertyCodeProcessorFeatures;
     Property.ProcessorFeatures.AsUINT64 = pVM->nem.s.uCpuFeatures.u64;
-    hrc = WHvSetPartitionProperty(hPartition, &Property, sizeof(Property));
+    hrc = WHvSetPartitionPropertyWrapper(hPartition, WHvPartitionPropertyCodeProcessorFeatures, &Property, sizeof(Property));
     if (FAILED(hrc))
         return VMSetError(pVM, VERR_NEM_VM_CREATE_FAILED, RT_SRC_POS,
@@ -2491 +2547 @@
  *        information getters.
  *
+ *   Update: All concerns have been addressed in build 17110.
+ *
  *
  * - The WHvGetPartitionProperty function uses the same weird design as
  *   WHvGetCapability, see above.
+ *
+ *   Update: All concerns have been addressed in build 17110.
  *
  *
@@ -2512 +2572 @@
  *        and others for typical pattern for generic information setters and
  *        getters.
+ *
+ *   Update: All concerns have been addressed in build 17110.
+ *
  *
  *