Changeset 87538 in vbox

Timestamp:

Feb 2, 2021 3:03:56 PM (4 years ago)

Author:

vboxsync

Message:

VMM/HMSVM: Eliminated HMR0PERVM::svm::fFeatures and made the ring-0 code use g_fHmSvmFeatures instead. bugref:9217

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/HMSVMAll.cpp (modified) (1 diff)
• VMMR0/HMR0.cpp (modified) (3 diffs)
• VMMR0/HMSVMR0.cpp (modified) (7 diffs)
• include/HMInternal.h (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/HMSVMAll.cpp

@@ -184 +184 @@
 {
 #ifdef IN_RING0
-    bool const fVGif    = RT_BOOL(pVM->hmr0.s.svm.fFeatures & X86_CPUID_SVM_FEATURE_EDX_VGIF);
+    bool const fVGif    = RT_BOOL(g_fHmSvmFeatures & X86_CPUID_SVM_FEATURE_EDX_VGIF);
 #else
     bool const fVGif    = RT_BOOL(pVM->hm.s.svm.fFeaturesForRing3 & X86_CPUID_SVM_FEATURE_EDX_VGIF);

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

@@ -134 +134 @@
 uint32_t                g_uHmSvmRev;
 /** SVM feature bits from cpuid 0x8000000a */
-uint32_t                g_uHmSvmFeatures;
+uint32_t                g_fHmSvmFeatures;
 
 
@@ -543 +543 @@
         /* Query AMD features. */
         uint32_t u32Dummy;
-        ASMCpuId(0x8000000a, &g_uHmSvmRev, &g_uHmMaxAsid, &u32Dummy, &g_uHmSvmFeatures);
+        ASMCpuId(0x8000000a, &g_uHmSvmRev, &g_uHmMaxAsid, &u32Dummy, &g_fHmSvmFeatures);
 
         /*
@@ -1199 +1199 @@
     {
         pVM->hm.s.svm.u32Rev            = g_uHmSvmRev;
-        pVM->hm.s.svm.fFeaturesForRing3 = pVM->hmr0.s.svm.fFeatures = g_uHmSvmFeatures;
+        pVM->hm.s.svm.fFeaturesForRing3 = g_fHmSvmFeatures;
         pVM->hm.s.svm.u64MsrHwcr        = g_HmMsrs.u.svm.u64MsrHwcr;
         /* If you need to tweak host MSRs for testing SVM R0 code, do it here. */

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

@@ -867 +867 @@
 {
     PCVMCC pVM = pVCpu->CTX_SUFF(pVM);
-    bool const fHostVmcbCleanBits = RT_BOOL(pVM->hmr0.s.svm.fFeatures & X86_CPUID_SVM_FEATURE_EDX_VMCB_CLEAN);
+    bool const fHostVmcbCleanBits = RT_BOOL(g_fHmSvmFeatures & X86_CPUID_SVM_FEATURE_EDX_VMCB_CLEAN);
     if (!fIsNestedGuest)
         return fHostVmcbCleanBits;
@@ -885 +885 @@
 #ifdef VBOX_WITH_NESTED_HWVIRT_SVM
     if (CPUMIsGuestInSvmNestedHwVirtMode(&pVCpu->cpum.GstCtx))
-        return (pVM->hmr0.s.svm.fFeatures & X86_CPUID_SVM_FEATURE_EDX_DECODE_ASSISTS)
+        return (g_fHmSvmFeatures & X86_CPUID_SVM_FEATURE_EDX_DECODE_ASSISTS)
             &&  pVM->cpum.ro.GuestFeatures.fSvmDecodeAssists;
 #endif
-    return RT_BOOL(pVM->hmr0.s.svm.fFeatures & X86_CPUID_SVM_FEATURE_EDX_DECODE_ASSISTS);
+    return RT_BOOL(g_fHmSvmFeatures & X86_CPUID_SVM_FEATURE_EDX_DECODE_ASSISTS);
 }
 
@@ -903 +903 @@
 #ifdef VBOX_WITH_NESTED_HWVIRT_SVM
     if (CPUMIsGuestInSvmNestedHwVirtMode(&pVCpu->cpum.GstCtx))
-        return (pVM->hmr0.s.svm.fFeatures & X86_CPUID_SVM_FEATURE_EDX_NRIP_SAVE)
+        return (g_fHmSvmFeatures & X86_CPUID_SVM_FEATURE_EDX_NRIP_SAVE)
             &&  pVM->cpum.ro.GuestFeatures.fSvmNextRipSave;
 #endif
-    return RT_BOOL(pVM->hmr0.s.svm.fFeatures & X86_CPUID_SVM_FEATURE_EDX_NRIP_SAVE);
+    return RT_BOOL(g_fHmSvmFeatures & X86_CPUID_SVM_FEATURE_EDX_NRIP_SAVE);
 }
 
@@ -1003 +1003 @@
      * Determin some configuration parameters.
      */
-    bool const fPauseFilter          = RT_BOOL(pVM->hmr0.s.svm.fFeatures & X86_CPUID_SVM_FEATURE_EDX_PAUSE_FILTER);
-    bool const fPauseFilterThreshold = RT_BOOL(pVM->hmr0.s.svm.fFeatures & X86_CPUID_SVM_FEATURE_EDX_PAUSE_FILTER_THRESHOLD);
+    bool const fPauseFilter          = RT_BOOL(g_fHmSvmFeatures & X86_CPUID_SVM_FEATURE_EDX_PAUSE_FILTER);
+    bool const fPauseFilterThreshold = RT_BOOL(g_fHmSvmFeatures & X86_CPUID_SVM_FEATURE_EDX_PAUSE_FILTER_THRESHOLD);
     bool const fUsePauseFilter       = fPauseFilter && pVM->hm.s.svm.cPauseFilter;
 
-    bool const fLbrVirt              = RT_BOOL(pVM->hmr0.s.svm.fFeatures & X86_CPUID_SVM_FEATURE_EDX_LBR_VIRT);
+    bool const fLbrVirt              = RT_BOOL(g_fHmSvmFeatures & X86_CPUID_SVM_FEATURE_EDX_LBR_VIRT);
     bool const fUseLbrVirt           = fLbrVirt && pVM->hm.s.svm.fLbrVirt; /** @todo IEM implementation etc. */
 
 #ifdef VBOX_WITH_NESTED_HWVIRT_SVM
-    bool const fVirtVmsaveVmload     = RT_BOOL(pVM->hmr0.s.svm.fFeatures & X86_CPUID_SVM_FEATURE_EDX_VIRT_VMSAVE_VMLOAD);
+    bool const fVirtVmsaveVmload     = RT_BOOL(g_fHmSvmFeatures & X86_CPUID_SVM_FEATURE_EDX_VIRT_VMSAVE_VMLOAD);
     bool const fUseVirtVmsaveVmload  = fVirtVmsaveVmload && pVM->hm.s.svm.fVirtVmsaveVmload && fNestedPaging;
 
-    bool const fVGif                 = RT_BOOL(pVM->hmr0.s.svm.fFeatures & X86_CPUID_SVM_FEATURE_EDX_VGIF);
+    bool const fVGif                 = RT_BOOL(g_fHmSvmFeatures & X86_CPUID_SVM_FEATURE_EDX_VGIF);
     bool const fUseVGif              = fVGif && pVM->hm.s.svm.fVGif;
 #endif
@@ -1366 +1366 @@
             else
             {
-                if (pVM->hmr0.s.svm.fFeatures & X86_CPUID_SVM_FEATURE_EDX_FLUSH_BY_ASID)
+                if (g_fHmSvmFeatures & X86_CPUID_SVM_FEATURE_EDX_FLUSH_BY_ASID)
                     pVmcb->ctrl.TLBCtrl.n.u8TLBFlush = SVM_TLB_FLUSH_SINGLE_CONTEXT;
                 else
@@ -2053 +2053 @@
 
             HMSVM_ASSERT_NOT_IN_NESTED_GUEST(pCtx);                                /* Nested VGIF is not supported yet. */
-            Assert(pVM->hmr0.s.svm.fFeatures & X86_CPUID_SVM_FEATURE_EDX_VGIF);    /* Physical hardware supports VGIF. */
+            Assert(g_fHmSvmFeatures & X86_CPUID_SVM_FEATURE_EDX_VGIF);    /* Physical hardware supports VGIF. */
             Assert(HMIsSvmVGifActive(pVM));                                        /* Outer VM has enabled VGIF. */
             NOREF(pVM);
@@ -4106 +4106 @@
      */
     PVMCC pVM = pVCpu->CTX_SUFF(pVM);
-    if (RT_UNLIKELY(   !pVM->hmr0.s.svm.fFeatures
+    if (RT_UNLIKELY(   !g_fHmSvmFeatures
                     &&  pVCpu->hm.s.Event.fPending
                     &&  SVM_EVENT_GET_TYPE(pVCpu->hm.s.Event.u64IntInfo) == SVM_EVENT_NMI))

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

@@ -689 +689 @@
         bool                        fAlwaysFlushTLB;
         bool                        afAlignment0[3];
-        /** SVM feature bits from cpuid 0x8000000a, safe ring-0 copy. */
-        uint32_t                    fFeatures;
     } svm;
 } HMR0PERVM;
@@ -1452 +1450 @@
 extern bool             g_fHmSvmSupported;
 extern uint32_t         g_uHmSvmRev;
-extern uint32_t         g_uHmSvmFeatures;
+extern uint32_t         g_fHmSvmFeatures;
 
 extern SUPHWVIRTMSRS    g_HmMsrs;