Changeset 87515 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Feb 1, 2021 7:13:42 PM (4 years ago)

Author:

vboxsync

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

142540

Message:

VMM/HM: Make a R0 copy of HM::fNestedPaging on setup. Moved pGuestPatchMem and friends down to the patching array. bugref:9217

File:

• trunk/src/VBox/VMM/include/HMInternal.h (modified) (4 diffs)

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

@@ -430 +430 @@
 typedef struct HM
 {
-    /** Set if nested paging is enabled. */
-    bool                        fNestedPaging;
+    /** Set if nested paging is enabled.
+     * Config value that is copied to HMR0PERVM::fNestedPaging on setup. */
+    bool                        fNestedPagingCfg;
     /** Set when we've initialized VMX or SVM. */
     bool                        fInitialized;
@@ -466 +467 @@
     bool                        fMdsClearOnSched;
     /** Alignment padding. */
-    bool                        afPaddingMinus1[7];
-
-    /** Maximum ASID allowed. */
-    uint32_t                    uMaxAsid;
+    bool                        afPaddingMinus1[3];
+
     /** 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;
 
+    /** Maximum ASID allowed. */
+    uint32_t                    uMaxAsid;
+
     /** Host kernel flags that HM might need to know (SUPKERNELFEATURES_XXX). */
     uint32_t                    fHostKernelFeatures;
-
-    /** Size of the guest patch memory block. */
-    uint32_t                    cbGuestPatchMem;
-    /** Guest allocated memory for patching purposes. */
-    RTGCPTR                     pGuestPatchMem;
-    /** Current free pointer inside the patch block. */
-    RTGCPTR                     pFreeGuestPatchMem;
 
     struct
@@ -632 +627 @@
     HMTPRPATCH                  aPatches[64];
 
+    /** Guest allocated memory for patching purposes. */
+    RTGCPTR                     pGuestPatchMem;
+    /** Current free pointer inside the patch block. */
+    RTGCPTR                     pFreeGuestPatchMem;
+    /** Size of the guest patch memory block. */
+    uint32_t                    cbGuestPatchMem;
+
     /** Last recorded error code during HM ring-0 init. */
     int32_t                     rcInit;
-    uint32_t                    u32Alignment2;
 
     STAMCOUNTER                 StatTprPatchSuccess;
@@ -654 +655 @@
 typedef struct HMR0PERVM
 {
+    /** Set if nested paging is enabled. */
+    bool                        fNestedPaging;
+
+    bool                        afAlignment0[7];
+
     /** SVM specific data. */
     struct HMR0SVMVM