Changeset 107703 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Jan 11, 2025 10:55:53 PM (4 months ago)

Author:

vboxsync

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

166799

Message:

VMM/CPUM: Try consolidate the MSR_IA32_ARCH_CAPABILITIES handling in CPUM and do better sanitizing of what's exposed to the guest. jiraref:VBP-947

File:

• trunk/src/VBox/VMM/VMMR0/CPUMR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/CPUMR0.cpp

@@ -361 +361 @@
          * Copy MSR_IA32_ARCH_CAPABILITIES bits over into the host and guest feature
          * structure and as well as the guest MSR.
-         * Note! we assume this happens after the CPUMR3Init is done, so CPUID bits are settled.
+         * Note! We assume this happens after the CPUMR3Init is done, so CPUID bits are settled.
          */
-        pVM->cpum.s.HostFeatures.s.fArchRdclNo             = 0;
-        pVM->cpum.s.HostFeatures.s.fArchIbrsAll            = 0;
-        pVM->cpum.s.HostFeatures.s.fArchRsbOverride        = 0;
-        pVM->cpum.s.HostFeatures.s.fArchVmmNeedNotFlushL1d = 0;
-        pVM->cpum.s.HostFeatures.s.fArchMdsNo              = 0;
-        uint32_t const cStdRange = ASMCpuId_EAX(0);
+        uint64_t       fHostArchVal = 0;
+        bool           fHasArchCap  = false;
+        uint32_t const cStdRange    = ASMCpuId_EAX(0);
         if (   RTX86IsValidStdRange(cStdRange)
             && cStdRange >= 7)
@@ -377 +374 @@
                 && (fFeatures & X86_CPUID_FEATURE_EDX_MSR))
             {
-                /* Host: */
-                uint64_t const fHostArchVal = ASMRdMsr(MSR_IA32_ARCH_CAPABILITIES);
-                uint64_t fArchVal = fHostArchVal;
-                pVM->cpum.s.HostFeatures.s.fArchRdclNo             = RT_BOOL(fArchVal & MSR_IA32_ARCH_CAP_F_RDCL_NO);
-                pVM->cpum.s.HostFeatures.s.fArchIbrsAll            = RT_BOOL(fArchVal & MSR_IA32_ARCH_CAP_F_IBRS_ALL);
-                pVM->cpum.s.HostFeatures.s.fArchRsbOverride        = RT_BOOL(fArchVal & MSR_IA32_ARCH_CAP_F_RSBO);
-                pVM->cpum.s.HostFeatures.s.fArchVmmNeedNotFlushL1d = RT_BOOL(fArchVal & MSR_IA32_ARCH_CAP_F_VMM_NEED_NOT_FLUSH_L1D);
-                pVM->cpum.s.HostFeatures.s.fArchMdsNo              = RT_BOOL(fArchVal & MSR_IA32_ARCH_CAP_F_MDS_NO);
-
-                /* guest: */
-                if (!pVM->cpum.s.GuestFeatures.fArchCap)
-                    fArchVal = 0;
-                else if (!pVM->cpum.s.GuestFeatures.fIbrs)
-                    fArchVal &= ~MSR_IA32_ARCH_CAP_F_IBRS_ALL;
-                VMCC_FOR_EACH_VMCPU_STMT(pVM, pVCpu->cpum.s.GuestMsrs.msr.ArchCaps = fArchVal);
-                pVM->cpum.s.GuestFeatures.fArchRdclNo             = RT_BOOL(fArchVal & MSR_IA32_ARCH_CAP_F_RDCL_NO);
-                pVM->cpum.s.GuestFeatures.fArchIbrsAll            = RT_BOOL(fArchVal & MSR_IA32_ARCH_CAP_F_IBRS_ALL);
-                pVM->cpum.s.GuestFeatures.fArchRsbOverride        = RT_BOOL(fArchVal & MSR_IA32_ARCH_CAP_F_RSBO);
-                pVM->cpum.s.GuestFeatures.fArchVmmNeedNotFlushL1d = RT_BOOL(fArchVal & MSR_IA32_ARCH_CAP_F_VMM_NEED_NOT_FLUSH_L1D);
-                pVM->cpum.s.GuestFeatures.fArchMdsNo              = RT_BOOL(fArchVal & MSR_IA32_ARCH_CAP_F_MDS_NO);
-                LogRel(("CPUM: IA32_ARCH_CAPABILITIES (Host=%#RX64 Guest=%#RX64)\n", fHostArchVal, fArchVal));
+                fHostArchVal = ASMRdMsr(MSR_IA32_ARCH_CAPABILITIES);
+                fHasArchCap  = true;
             }
-            else
-            {
-                pVM->cpum.s.HostFeatures.s.fArchCap = 0;
-                LogRel(("CPUM: IA32_ARCH_CAPABILITIES unsupported\n"));
-            }
-        }
+        }
+        CPUMCpuIdApplyX86HostArchCapabilities(pVM, fHasArchCap, fHostArchVal);
 
         /*