Changeset 87539 in vbox

Timestamp:

Feb 2, 2021 3:10:58 PM (4 years ago)

Author:

vboxsync

Message:

VMM/HMSVM: Replaced HMR0PERVM::fHostKernelFeatures with a new global variable g_fHmHostKernelFeatures. bugref:9217

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/HMR0.cpp (modified) (3 diffs)
• VMMR0/HMVMXR0.cpp (modified) (1 diff)
• include/HMInternal.h (modified) (2 diffs)

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

@@ -102 +102 @@
  * enabled and disabled each time it's used to execute guest code. */
 static bool             g_fHmGlobalInit;
-
+/** Host kernel flags that HM might need to know (SUPKERNELFEATURES_XXX). */
+uint32_t                g_fHmHostKernelFeatures;
 /** Maximum allowed ASID/VPID (inclusive).
  * @todo r=bird: This is exclusive for VT-x according to source code comment.
@@ -610 +611 @@
     g_fHmSvmSupported  = false;
     g_uHmMaxAsid       = 0;
+
+    /*
+     * Get host kernel features that HM might need to know in order
+     * to co-operate and function properly with the host OS (e.g. SMAP).
+     */
+    g_fHmHostKernelFeatures = SUPR0GetKernelFeatures();
 
     /*
@@ -1235 +1242 @@
         AssertReturn(!pVCpu->hmr0.s.uCurrentAsid, VERR_HM_IPE_3);
     }
-
-    /*
-     * Get host kernel features that HM might need to know in order
-     * to co-operate and function properly with the host OS (e.g. SMAP).
-     *
-     * Technically, we could do this as part of the pre-init VM procedure
-     * but it shouldn't be done later than this point so we do it here.
-     */
-    pVM->hmr0.s.fHostKernelFeatures = SUPR0GetKernelFeatures();
 
     /*

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

@@ -4802 +4802 @@
 
         /* If the host has made GDT read-only, we would need to temporarily toggle CR0.WP before writing the GDT. */
-        PVMCC pVM = pVCpu->CTX_SUFF(pVM);
-        if (pVM->hmr0.s.fHostKernelFeatures & SUPKERNELFEATURES_GDT_READ_ONLY)
+        if (g_fHmHostKernelFeatures & SUPKERNELFEATURES_GDT_READ_ONLY)
             fRestoreHostFlags |= VMX_RESTORE_HOST_GDT_READ_ONLY;
-        if (pVM->hmr0.s.fHostKernelFeatures & SUPKERNELFEATURES_GDT_NEED_WRITABLE)
+        if (g_fHmHostKernelFeatures & SUPKERNELFEATURES_GDT_NEED_WRITABLE)
         {
             /* The GDT is read-only but the writable GDT is available. */

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

@@ -637 +637 @@
     /** Set if we can support 64-bit guests or not. */
     bool                        fAllow64BitGuests;
-    bool                        afAlignment0[2+4];
+    bool                        afAlignment0[2];
 
     /** The maximum number of resumes loops allowed in ring-0 (safety precaution).
      * This number is set much higher when RTThreadPreemptIsPending is reliable. */
     uint32_t                    cMaxResumeLoops;
-
-    /** Host kernel flags that HM might need to know (SUPKERNELFEATURES_XXX). */
-    uint32_t                    fHostKernelFeatures;
 
     /** VT-x specific data. */
@@ -1442 +1439 @@
 #ifdef IN_RING0
 extern bool             g_fHmVmxSupported;
+extern uint32_t         g_fHmHostKernelFeatures;
 extern uint32_t         g_uHmMaxAsid;
 extern bool             g_fHmVmxUsePreemptTimer;