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

Timestamp:

Feb 22, 2018 3:38:35 PM (7 years ago)

Author:

vboxsync

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

120973

Message:

Added speculation control settings to API, refined implementation.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• CPUMR3CpuId.cpp (modified) (3 diffs)
• HM.cpp (modified) (2 diffs)

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

@@ -1750 +1750 @@
             pFeatures->fIbrs                = pFeatures->fIbpb;
             pFeatures->fStibp               = RT_BOOL(pSxfLeaf0->uEdx & X86_CPUID_STEXT_FEATURE_EDX_STIBP);
+#if 0   // Disabled until IA32_ARCH_CAPABILITIES support can be tested
             pFeatures->fArchCap             = RT_BOOL(pSxfLeaf0->uEdx & X86_CPUID_STEXT_FEATURE_EDX_ARCHCAP);
+#endif
         }
 
@@ -4314 +4316 @@
 
         /* Check if speculation control is enabled. */
-        rc = CFGMR3QueryBoolDef(CFGMR3GetRoot(pVM), "EnableSpecCtrl", &fEnable, false);
+        rc = CFGMR3QueryBoolDef(pCpumCfg, "SpecCtrl", &fEnable, false);
         AssertRCReturn(rc, rc);
         if (fEnable)
@@ -4621 +4623 @@
                 {
                     pLeaf->uEdx |= X86_CPUID_STEXT_FEATURE_EDX_IBRS_IBPB;
+                    pVM->cpum.s.GuestFeatures.fIbrs = 1;
                     if (pVM->cpum.s.HostFeatures.fStibp)
+                    {
                         pLeaf->uEdx |= X86_CPUID_STEXT_FEATURE_EDX_STIBP;
+                        pVM->cpum.s.GuestFeatures.fStibp = 1;
+                    }
 
                     /* Make sure we have the speculation control MSR... */

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

@@ -464 +464 @@
                               "|IBPBOnVMExit"
                               "|IBPBOnVMEntry"
+                              "|SpecCtrlByHost"
                               "|TPRPatchingEnabled"
                               "|64bitEnabled"
@@ -649 +650 @@
      * Costly paranoia setting. */
     rc = CFGMR3QueryBoolDef(pCfgHm, "IBPBOnVMEntry", &pVM->hm.s.fIbpbOnVmEntry, false);
+    AssertLogRelRCReturn(rc, rc);
+
+    /** @cfgm{/HM/SpecCtrlByHost, bool}
+     * Another expensive paranoia setting. */
+    rc = CFGMR3QueryBoolDef(pCfgHm, "SpecCtrlByHost", &pVM->hm.s.fSpecCtrlByHost, false);
     AssertLogRelRCReturn(rc, rc);