Changeset 74479 in vbox for trunk

Timestamp:

Sep 26, 2018 2:28:55 PM (6 years ago)

Author:

vboxsync

Message:

VMM/CPUM: Nested VMX: bugref:9180 Rather than dereference pVCpu or pass yet another pVM pointer to all the inline nested hwvirt.
helper functions in cpum.h, we cache the hwvirt type in the CPUMCTX structure itself.

Location:

trunk

Files:

• include/VBox/vmm/cpum.mac (modified) (1 diff)
• include/VBox/vmm/cpumctx.h (modified) (3 diffs)
• src/VBox/VMM/include/CPUMInternal.mac (modified) (2 diffs)
• src/VBox/VMM/testcase/tstVMStruct.h (modified) (1 diff)

trunk/include/VBox/vmm/cpum.mac

@@ -280 +280 @@
     alignb 8
     .hwvirt.svm.HCPhysVmcb             RTHCPHYS_RES  1
+    .hwvirt.enmHwvirt                  resd          1
     .hwvirt.fLocalForcedActions        resd          1
     .hwvirt.fGif                       resb          1

trunk/include/VBox/vmm/cpumctx.h

@@ -320 +320 @@
 AssertCompileSizeAlignment(SVMHOSTSTATE, 8);
 AssertCompileSize(SVMHOSTSTATE, 184);
+#endif
+
+
+/**
+ * CPU hardware virtualization types.
+ */
+typedef enum
+{
+    CPUMHWVIRT_NONE = 0,
+    CPUMHWVIRT_VMX,
+    CPUMHWVIRT_SVM,
+    CPUMHWVIRT_32BIT_HACK = 0x7fffffff
+} CPUMHWVIRT;
+#ifndef VBOX_FOR_DTRACE_LIB
+AssertCompileSize(CPUMHWVIRT, 4);
 #endif
 
@@ -624 +639 @@
         } CPUM_UNION_NM(s);
 
-        /** 0x3f0 - A subset of guest force flags that are saved while running the
+        /** 0x3f0 - Hardware virtualization type currently in use. */
+        CPUMHWVIRT              enmHwvirt;
+        /** 0x3f4 - A subset of guest force flags that are saved while running the
          *  nested-guest. */
         uint32_t                fLocalForcedActions;
-        /** 0x3f4 - Global interrupt flag - AMD only (always true on Intel). */
+        /** 0x3f8 - Global interrupt flag - AMD only (always true on Intel). */
         bool                    fGif;
-        /** 0x3f8 - Padding. */
-        uint8_t                 abPadding1[11];
+        /** 0x3fc - Padding. */
+        uint8_t                 abPadding1[7];
     } hwvirt;
     /** @} */
@@ -724 +741 @@
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pvVmwriteBitmapR0, 8);
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pAutoMsrAreaR0,    8);
-AssertCompileMemberOffset(CPUMCTX, hwvirt.fLocalForcedActions, 0x3f0);
-AssertCompileMemberOffset(CPUMCTX, hwvirt.fGif,                0x3f4);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.enmHwvirt,           0x3f0);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.fLocalForcedActions, 0x3f4);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.fGif,                0x3f8);
 AssertCompileMembersAtSameOffset(CPUMCTX, CPUM_UNION_STRUCT_NM(g,qw.) rax, CPUMCTX, CPUM_UNION_NM(g.) aGRegs);
 AssertCompileMembersAtSameOffset(CPUMCTX, CPUM_UNION_STRUCT_NM(g,qw.) rax, CPUMCTX, CPUM_UNION_STRUCT_NM(g,qw2.)  r0);

trunk/src/VBox/VMM/include/CPUMInternal.mac

@@ -253 +253 @@
     alignb 8
     .Guest.hwvirt.svm.HCPhysVmcb             RTHCPHYS_RES 1
+    .Guest.hwvirt.enmHwvirt                  resd         1
     .Guest.hwvirt.fLocalForcedActions        resd         1
     .Guest.hwvirt.fGif                       resb         1
@@ -540 +541 @@
     alignb 8
     .Hyper.hwvirt.svm.HCPhysVmcb             RTHCPHYS_RES 1
+    .Hyper.hwvirt.enmHwvirt                  resd         1
     .Hyper.hwvirt.fLocalForcedActions        resd         1
     .Hyper.hwvirt.fGif                       resb         1

trunk/src/VBox/VMM/testcase/tstVMStruct.h

@@ -166 +166 @@
     GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.pAutoMsrAreaR0);
     GEN_CHECK_OFF(CPUMCTX, hwvirt.vmx.pAutoMsrAreaR3);
+    GEN_CHECK_OFF(CPUMCTX, hwvirt.enmHwvirt);
     GEN_CHECK_OFF(CPUMCTX, hwvirt.fLocalForcedActions);
     GEN_CHECK_OFF(CPUMCTX, hwvirt.fGif);