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

Timestamp:

Feb 3, 2021 1:23:13 PM (4 years ago)

Author:

vboxsync

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

142590

Message:

VMM/HM: Moved the 'ForRing3' and 'ForLog' bits to the back of the HM structure. Configuration bits too, except for VMX/SVM specific ones as those fit in alignment space (can be moved later if needed). bugref:9217

File:

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

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

@@ -440 +440 @@
     bool                        afAlignment1[5];
 
-    /** @todo r=bird: for better cache locality for SVM, it would be good to split
-     *        out the non-esssential data (i.e config and for-ring3 bits). */
     struct
     {
@@ -450 +448 @@
         /** The shift mask employed by the VMX-Preemption timer (set by ring-0). */
         uint8_t                     cPreemptTimerShift;
-        bool                        afAlignment1[5];
-
-        /** Pause-loop exiting (PLE) gap in ticks. */
-        uint32_t                    cPleGapTicks;
-        /** Pause-loop exiting (PLE) window in ticks. */
-        uint32_t                    cPleWindowTicks;
-
-        /** Virtual address of the TSS page used for real mode emulation. */
-        R3PTRTYPE(PVBOXTSS)         pRealModeTSS;
-        /** Virtual address of the identity page table used for real mode and protected
-         *  mode without paging emulation in EPT mode. */
-        R3PTRTYPE(PX86PD)           pNonPagingModeEPTPageTable;
+        bool                        fAlignment1;
 
         /** @name Configuration (gets copied if problematic)
@@ -477 +464 @@
         /** @} */
 
-        /** @name For ring-3 consumption
-         * @{ */
-        /** Set if VPID is supported (ring-3 copy). */
-        bool                        fVpidForRing3;
-        /** Whether the CPU supports VMCS fields for swapping EFER (set by ring-0 VMX
-         *  init, for logging). */
-        bool                        fSupportsVmcsEferForRing3;
-        /** Whether to use VMCS shadowing. */
-        bool                        fUseVmcsShadowingForRing3;
-        bool                        fAlignment2;
-
-        /** Host CR4 value (set by ring-0 VMX init, for logging). */
-        uint64_t                    u64HostCr4ForRing3;
-        /** Host SMM monitor control (set by ring-0 VMX init, for logging). */
-        uint64_t                    u64HostSmmMonitorCtlForRing3;
-        /** Host EFER value (set by ring-0 VMX init, for logging and guest NX). */
-        uint64_t                    u64HostMsrEferForRing3;
-
-        /** The first valid host LBR branch-from-IP stack range. */
-        uint32_t                    idLbrFromIpMsrFirstForRing3;
-        /** The last valid host LBR branch-from-IP stack range. */
-        uint32_t                    idLbrFromIpMsrLastForRing3;
-
-        /** The first valid host LBR branch-to-IP stack range. */
-        uint32_t                    idLbrToIpMsrFirstForRing3;
-        /** The last valid host LBR branch-to-IP stack range. */
-        uint32_t                    idLbrToIpMsrLastForRing3;
-
-        /** Host-physical address for a failing VMXON instruction (for diagnostics, ring-3). */
-        RTHCPHYS                    HCPhysVmxEnableError;
-        /** VMX MSR values (only for ring-3 consumption). */
-        VMXMSRS                     MsrsForRing3;
-
-        /** Tagged-TLB flush type (only for ring-3 consumption). */
-        VMXTLBFLUSHTYPE             enmTlbFlushTypeForRing3;
-        /** Flush type to use for INVEPT (only for ring-3 consumption). */
-        VMXTLBFLUSHEPT              enmTlbFlushEptForRing3;
-        /** Flush type to use for INVVPID (only for ring-3 consumption). */
-        VMXTLBFLUSHVPID             enmTlbFlushVpidForRing3;
-        /** @} */
+        /** Pause-loop exiting (PLE) gap in ticks. */
+        uint32_t                    cPleGapTicks;
+        /** Pause-loop exiting (PLE) window in ticks. */
+        uint32_t                    cPleWindowTicks;
+
+        /** Virtual address of the TSS page used for real mode emulation. */
+        R3PTRTYPE(PVBOXTSS)         pRealModeTSS;
+        /** Virtual address of the identity page table used for real mode and protected
+         *  mode without paging emulation in EPT mode. */
+        R3PTRTYPE(PX86PD)           pNonPagingModeEPTPageTable;
     } vmx;
 
@@ -541 +498 @@
         uint16_t                    cPauseFilterThresholdTicks;
         uint32_t                    u32Alignment2;
-
-        /** @name For ring-3 consumption
-         * @{ */
-        /** SVM revision. */
-        uint32_t                    u32Rev;
-        /** SVM feature bits from cpuid 0x8000000a, ring-3 copy. */
-        uint32_t                    fFeaturesForRing3;
-        /** HWCR MSR (for diagnostics). */
-        uint64_t                    u64MsrHwcr;
-        /** @} */
     } svm;
 
@@ -566 +513 @@
     /** Size of the guest patch memory block. */
     uint32_t                    cbGuestPatchMem;
-
-    /** Last recorded error code during HM ring-0 init. */
-    int32_t                     rcInit;
-
-    /** Maximum ASID allowed.
-     * This is mainly for the release log.  */
-    uint32_t                    uMaxAsidForLog;
-    /** World switcher flags (HM_WSF_XXX) for the release log. */
-    uint32_t                    fWorldSwitcherForLog;
+    uint32_t                    u32Alignment2;
+
+    /** For ring-3 use only. */
+    struct
+    {
+        /** Last recorded error code during HM ring-0 init. */
+        int32_t                     rcInit;
+        uint32_t                    u32Alignment3;
+
+        /** Maximum ASID allowed.
+         * This is mainly for the release log.  */
+        uint32_t                    uMaxAsid;
+        /** World switcher flags (HM_WSF_XXX) for the release log. */
+        uint32_t                    fWorldSwitcher;
+
+        struct
+        {
+            /** Set if VPID is supported (ring-3 copy). */
+            bool                        fVpid;
+            /** Whether the CPU supports VMCS fields for swapping EFER (set by ring-0 VMX
+             *  init, for logging). */
+            bool                        fSupportsVmcsEfer;
+            /** Whether to use VMCS shadowing. */
+            bool                        fUseVmcsShadowing;
+            bool                        fAlignment2;
+
+            /** Host CR4 value (set by ring-0 VMX init, for logging). */
+            uint64_t                    u64HostCr4;
+            /** Host SMM monitor control (set by ring-0 VMX init, for logging). */
+            uint64_t                    u64HostSmmMonitorCtl;
+            /** Host EFER value (set by ring-0 VMX init, for logging and guest NX). */
+            uint64_t                    u64HostMsrEfer;
+
+            /** The first valid host LBR branch-from-IP stack range. */
+            uint32_t                    idLbrFromIpMsrFirst;
+            /** The last valid host LBR branch-from-IP stack range. */
+            uint32_t                    idLbrFromIpMsrLast;
+
+            /** The first valid host LBR branch-to-IP stack range. */
+            uint32_t                    idLbrToIpMsrFirst;
+            /** The last valid host LBR branch-to-IP stack range. */
+            uint32_t                    idLbrToIpMsrLast;
+
+            /** Host-physical address for a failing VMXON instruction (for diagnostics, ring-3). */
+            RTHCPHYS                    HCPhysVmxEnableError;
+            /** VMX MSR values (only for ring-3 consumption). */
+            VMXMSRS                     Msrs;
+
+            /** Tagged-TLB flush type (only for ring-3 consumption). */
+            VMXTLBFLUSHTYPE             enmTlbFlushType;
+            /** Flush type to use for INVEPT (only for ring-3 consumption). */
+            VMXTLBFLUSHEPT              enmTlbFlushEpt;
+            /** Flush type to use for INVVPID (only for ring-3 consumption). */
+            VMXTLBFLUSHVPID             enmTlbFlushVpid;
+        } vmx;
+
+        struct
+        {
+            /** SVM revision. */
+            uint32_t                    u32Rev;
+            /** SVM feature bits from cpuid 0x8000000a, ring-3 copy. */
+            uint32_t                    fFeatures;
+            /** HWCR MSR (for diagnostics). */
+            uint64_t                    u64MsrHwcr;
+        } svm;
+    } ForR3;
 
     /** @name Configuration not used (much) after VM setup
@@ -637 +641 @@
 AssertCompileMemberAlignment(HM, vmx,                 8);
 AssertCompileMemberAlignment(HM, svm,                 8);
+AssertCompileMemberAlignment(HM, StatTprPatchSuccess, 8);
+AssertCompile(RTASSERT_OFFSET_OF(HM, PatchTree) <= 64); /* First cache line has the essentials for both VT-x and SVM operation. */