Changeset 70913 in vbox for trunk/include/VBox/vmm

Timestamp:

Feb 8, 2018 3:11:15 PM (7 years ago)

Author:

vboxsync

Message:

CPUM: Infrastructure for speculative execution control.

Location:

trunk/include/VBox/vmm

Files:

• cpum.h (modified) (4 diffs)
• cpumctx.h (modified) (1 diff)

trunk/include/VBox/vmm/cpum.h

@@ -74 +74 @@
     /** The MWait Extensions bits (Std) */
     CPUMCPUIDFEATURE_MWAIT_EXTS,
+    /** The speculation control feature bits. (StExt) */
+    CPUMCPUIDFEATURE_SPEC_CTRL,
     /** 32bit hackishness. */
     CPUMCPUIDFEATURE_32BIT_HACK = 0x7fffffff
@@ -470 +472 @@
     kCpumMsrRdFn_Ia32VmxTrueEntryCtls,      /**< Takes real value as reference. */
     kCpumMsrRdFn_Ia32VmxVmFunc,             /**< Takes real value as reference. */
+    kCpumMsrRdFn_Ia32SpecCtrl,
+    kCpumMsrRdFn_Ia32ArchCapabilities,
 
     kCpumMsrRdFn_Amd64Efer,
@@ -722 +726 @@
     kCpumMsrWrFn_Ia32X2ApicN,
     kCpumMsrWrFn_Ia32DebugInterface,
+    kCpumMsrWrFn_Ia32SpecCtrl,
+    kCpumMsrWrFn_Ia32PredCmd,
 
     kCpumMsrWrFn_Amd64Efer,
@@ -1072 +1078 @@
     uint32_t        fVmx : 1;
 
+    /** Indicates that speculative execution control CPUID bits and
+     *  MSRs are exposed. The details are different for Intel and
+     * AMD but both have similar functionality. */
+    uint32_t        fSpeculationControl : 1;
+
     /** Alignment padding / reserved for future use. */
-    uint32_t        fPadding : 16;
+    uint32_t        fPadding : 15;
 
     /** SVM: Supports Nested-paging. */

trunk/include/VBox/vmm/cpumctx.h

@@ -778 +778 @@
         uint64_t    MtrrFix4K_F8000;    /**< IA32_MTRR_FIX4K_F8000 */
         uint64_t    PkgCStateCfgCtrl;   /**< MSR_PKG_CST_CONFIG_CONTROL */
+        uint64_t    SpecCtrl;           /**< IA32_SPEC_CTRL */
+        uint64_t    ArchCaps;           /**< IA32_ARCH_CAPABILITIES */
     } msr;
     uint64_t    au64[64];