Changeset 107862 in vbox for trunk

Timestamp:

Jan 20, 2025 8:15:00 PM (3 months ago)

Author:

vboxsync

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

167064

Message:

VMM/NEM-win: Export & import IA32_SPEC_CTRL state. jiraref:VBP-947 bugref:10738

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/NEMAllNativeTemplate-win.cpp.h (modified) (3 diffs)
• VMMR3/NEMR3Native-win.cpp (modified) (1 diff)
• include/NEMInternal.h (modified) (1 diff)

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

@@ -347 +347 @@
             ADD_REG64(WHvX64RegisterMsrMtrrFix4kF0000,  pCtxMsrs->msr.MtrrFix4K_F0000);
             ADD_REG64(WHvX64RegisterMsrMtrrFix4kF8000,  pCtxMsrs->msr.MtrrFix4K_F8000);
+            if (pVM->nem.s.fSpeculationControl)
+                ADD_REG64(WHvX64RegisterSpecCtrl, pCtxMsrs->msr.SpecCtrl);
+
 #if 0 /** @todo these registers aren't available? Might explain something.. .*/
             const CPUMCPUVENDOR enmCpuVendor = CPUMGetHostCpuVendor(pVM);
@@ -618 +621 @@
         aenmNames[iReg++] = WHvX64RegisterMsrMtrrFix4kF0000;
         aenmNames[iReg++] = WHvX64RegisterMsrMtrrFix4kF8000;
+        if (pVM->nem.s.fSpeculationControl)
+            aenmNames[iReg++] = WHvX64RegisterSpecCtrl;
         /** @todo look for HvX64RegisterIa32MiscEnable and HvX64RegisterIa32FeatureControl? */
 //#ifdef LOG_ENABLED
@@ -976 +981 @@
             GET_REG64_LOG7(pCtxMsrs->msr.MtrrFix4K_F0000,  WHvX64RegisterMsrMtrrFix4kF0000,  "MSR MTRR_FIX_4K_F0000");
             GET_REG64_LOG7(pCtxMsrs->msr.MtrrFix4K_F8000,  WHvX64RegisterMsrMtrrFix4kF8000,  "MSR MTRR_FIX_4K_F8000");
+            if (pVM->nem.s.fSpeculationControl)
+                GET_REG64_LOG7(pCtxMsrs->msr.SpecCtrl,     WHvX64RegisterSpecCtrl,           "MSR IA32_SPEC_CTRL");
             /** @todo look for HvX64RegisterIa32MiscEnable and HvX64RegisterIa32FeatureControl? */
         }

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

@@ -653 +653 @@
                              "WHvGetCapability/WHvCapabilityCodeFeatures failed: %Rhrc (Last=%#x/%u)",
                              hrc, RTNtLastStatusValue(), RTNtLastErrorValue());
-    if (Caps.Features.AsUINT64 & ~(uint64_t)0)
-        LogRel(("NEM: Warning! Unknown feature definitions: %#RX64\n", Caps.Features.AsUINT64));
+    NEM_LOG_REL_CAP_EX("WHvCapabilityCodeFeatures", "%'#018RX64", Caps.Features.AsUINT64);
+    pVM->nem.s.fSpeculationControl = RT_BOOL(Caps.Features.SpeculationControl);
+    const uint64_t fKnownFeatures = RT_BIT_64(10) - 1U;
+    if (Caps.Features.AsUINT64 & ~fKnownFeatures)
+        LogRel(("NEM: Warning! Unknown feature definitions: %#RX64\n", Caps.Features.AsUINT64 & ~fKnownFeatures));
     /** @todo RECHECK: WHV_CAPABILITY_FEATURES typedef. */
 

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

@@ -263 +263 @@
     /** WHvRunVpExitReasonException is supported. */
     bool                        fExtendedXcptExit : 1;
+    /** Copy of WHV_CAPABILITY_FEATURES::SpeculationControl. */
+    bool                        fSpeculationControl : 1;
 #  ifdef NEM_WIN_WITH_A20
     /** Set if we've started more than one CPU and cannot mess with A20. */