Changeset 94909 in vbox

Timestamp:

May 8, 2022 3:41:38 PM (3 years ago)

Author:

vboxsync

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

151317

Message:

VMM/CPUM: Added fBmi1, fBmi2, fAbm, fTbm, fRdRand, and fRdSeed to the CPU features. bugref:9898

Location:

trunk

Files:

• include/VBox/vmm/cpum.h (modified) (5 diffs)
• src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/cpum.h

@@ -1105 +1105 @@
     /** Supports read/write FSGSBASE instructions. */
     uint32_t        fFsGsBase : 1;
+    /** Support BMI1 instructions (ANDN, BEXTR, BLSI, BLSMSK, BLSR, and TZCNT). */
+    uint32_t        fBmi1 : 1;
+    /** Support BMI2 instructions (BZHI, MULX, PDEP, PEXT, RORX, SARX, SHRX,
+     * and SHLX). */
+    uint32_t        fBmi2 : 1;
+    /** Support RDRAND instruction. */
+    uint32_t        fRdRand : 1;
+    /** Support RDSEED instruction. */
+    uint32_t        fRdSeed : 1;
 
     /** Supports AMD 3DNow instructions. */
@@ -1125 +1134 @@
     /** AMD64: Supports XOP (similar to VEX3/AVX). */
     uint32_t        fXop : 1;
+    /** AMD64: Supports ABM, i.e. the LZCNT instruction. */
+    uint32_t        fAbm : 1;
+    /** AMD64: Supports TBM (BEXTR, BLCFILL, BLCI, BLCIC, BLCMSK, BLCS,
+     *  BLSFILL, BLSIC, T1MSKC, and TZMSK). */
+    uint32_t        fTbm : 1;
 
     /** Indicates that FPU instruction and data pointers may leak.
@@ -1158 +1172 @@
     uint32_t        fArchMdsNo : 1;
 
-    /** Alignment padding / reserved for future use. */
-    uint32_t        fPadding : 7;
-
+    /** Alignment padding / reserved for future use (96 bits total, plus 12 bytes
+     *  prior to the bit fields -> total of 24 bytes) */
+    uint32_t        fPadding0 : 1;
+    uint32_t        fPadding1;
+
+
+    /** @name SVM
+     * @{ */
     /** SVM: Supports Nested-paging. */
     uint32_t        fSvmNestedPaging : 1;
@@ -1189 +1208 @@
     /** SVM: Supports GMET (Guest Mode Execute Trap Extension). */
     uint32_t        fSvmGmet : 1;
-    /** SVM: Padding / reserved for future features. */
+    /** SVM: Padding / reserved for future features (64 bits total w/ max ASID). */
     uint32_t        fSvmPadding0 : 18;
     /** SVM: Maximum supported ASID. */
     uint32_t        uSvmMaxAsid;
+    /** @} */
+
 
     /** VMX: Maximum physical address width. */
-    uint8_t         cVmxMaxPhysAddrWidth;
-    /** VMX: Padding / reserved for future. */
-    uint8_t         abVmxPadding[3];
-    /** VMX: Padding / reserved for future.  */
-    uint32_t        fVmxPadding0;
+    uint32_t        cVmxMaxPhysAddrWidth : 8;
 
     /** @name VMX basic controls.
@@ -1378 +1395 @@
 
     /** VMX: Padding / reserved for future features. */
-    uint32_t        fVmxPadding1 : 25;
+    uint32_t        fVmxPadding0 : 17;
+    /** VMX: Padding / reserved for future, making it a total of 128 bits.  */
+    uint32_t        fVmxPadding1;
 } CPUMFEATURES;
 #ifndef VBOX_FOR_DTRACE_LIB

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

@@ -1955 +1955 @@
         pFeatures->fClFlush             = RT_BOOL(pStd1Leaf->uEdx & X86_CPUID_FEATURE_EDX_CLFSH);
         pFeatures->fPcid                = RT_BOOL(pStd1Leaf->uEcx & X86_CPUID_FEATURE_ECX_PCID);
+        pFeatures->fRdRand              = RT_BOOL(pStd1Leaf->uEcx & X86_CPUID_FEATURE_ECX_RDRAND);
         pFeatures->fVmx                 = RT_BOOL(pStd1Leaf->uEcx & X86_CPUID_FEATURE_ECX_VMX);
         if (pFeatures->fVmx)
@@ -1968 +1969 @@
             pFeatures->fClFlushOpt          = RT_BOOL(pSxfLeaf0->uEbx & X86_CPUID_STEXT_FEATURE_EBX_CLFLUSHOPT);
             pFeatures->fInvpcid             = RT_BOOL(pSxfLeaf0->uEbx & X86_CPUID_STEXT_FEATURE_EBX_INVPCID);
+            pFeatures->fBmi1                = RT_BOOL(pSxfLeaf0->uEbx & X86_CPUID_STEXT_FEATURE_EBX_BMI1);
+            pFeatures->fBmi2                = RT_BOOL(pSxfLeaf0->uEbx & X86_CPUID_STEXT_FEATURE_EBX_BMI2);
+            pFeatures->fRdSeed              = RT_BOOL(pSxfLeaf0->uEbx & X86_CPUID_STEXT_FEATURE_EBX_RDSEED);
 
             pFeatures->fIbpb                = RT_BOOL(pSxfLeaf0->uEdx & X86_CPUID_STEXT_FEATURE_EDX_IBRS_IBPB);
@@ -2020 +2024 @@
             pFeatures->fAmdMmxExts      = RT_BOOL(pExtLeaf->uEdx & X86_CPUID_AMD_FEATURE_EDX_AXMMX);
             pFeatures->fXop             = RT_BOOL(pExtLeaf->uEcx & X86_CPUID_AMD_FEATURE_ECX_XOP);
+            pFeatures->fAbm             = RT_BOOL(pExtLeaf->uEcx & X86_CPUID_AMD_FEATURE_ECX_ABM);
+            pFeatures->fTbm             = RT_BOOL(pExtLeaf->uEcx & X86_CPUID_AMD_FEATURE_ECX_TBM);
             pFeatures->fSvm             = RT_BOOL(pExtLeaf->uEcx & X86_CPUID_AMD_FEATURE_ECX_SVM);
             if (pFeatures->fSvm)