Changeset 76464 in vbox for trunk/include

Timestamp:

Dec 25, 2018 4:36:48 AM (6 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:9180 Fix MSR initialization issue for exploding VMX features.

Location:

trunk/include/VBox/vmm

Files:

• cpum.h (modified) (1 diff)
• cpum.mac (modified) (1 diff)
• cpumctx.h (modified) (4 diffs)
• hm.h (modified) (2 diffs)
• vmm.h (modified) (1 diff)

trunk/include/VBox/vmm/cpum.h

@@ -949 +949 @@
 
 /**
+ * MSRs.
+ * MSRs which are required while exploding features.
+ */
+typedef struct CPUMMSRS
+{
+    union
+    {
+        VMXMSRS         vmx;
+        SVMMSRS         svm;
+    } hwvirt;
+} CPUMMSRS;
+/** Pointer to an CPUMMSRS struct. */
+typedef CPUMMSRS *PCPUMMSRS;
+/** Pointer to a const CPUMMSRS struct. */
+typedef CPUMMSRS const *PCCPUMMSRS;
+
+
+/**
  * CPU features and quirks.
  * This is mostly exploded CPUID info.

trunk/include/VBox/vmm/cpum.mac

@@ -280 +280 @@
     alignb 8
     .hwvirt.svm.HCPhysVmcb             RTHCPHYS_RES  1
-    .hwvirt.svm.u64Padding0            resb        120
+    .hwvirt.svm.u64Padding0            resq         19
     .hwvirt.enmHwvirt                  resd          1
     .hwvirt.fGif                       resb          1

trunk/include/VBox/vmm/cpumctx.h

@@ -552 +552 @@
                 RTHCPHYS                HCPhysVmcb;
                 /** 0x3f0 - Padding. */
-                uint64_t                u64Padding0[15];
+                uint64_t                u64Padding0[19];
             } svm;
 
@@ -674 +674 @@
         } CPUM_UNION_NM(s);
 
-        /** 0x468 - Hardware virtualization type currently in use. */
+        /** 0x488 - Hardware virtualization type currently in use. */
         CPUMHWVIRT              enmHwvirt;
-        /** 0x46c - Global interrupt flag - AMD only (always true on Intel). */
+        /** 0x48c - Global interrupt flag - AMD only (always true on Intel). */
         bool                    fGif;
         bool                    afPadding1[3];
-        /** 0x470 - A subset of guest force flags that are saved while running the
+        /** 0x490 - A subset of guest force flags that are saved while running the
          *  nested-guest. */
 #ifdef VMCPU_WITH_64_BIT_FFS
@@ -687 +687 @@
         uint32_t                fPadding;
 #endif
-        /* Pad to 64-byte boundary. */
-        uint64_t                u64Align64;
+        /** 0x498 - Pad to 64 byte boundary. */
+        uint8_t                 abPadding0[40];
     } hwvirt;
     /** @} */
@@ -795 +795 @@
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.pvIoBitmapR0,      8);
 AssertCompileMemberAlignment(CPUMCTX, hwvirt.CPUM_UNION_NM(s.) vmx.Msrs,              8);
-AssertCompileMemberOffset(CPUMCTX, hwvirt.enmHwvirt,           0x468);
-AssertCompileMemberOffset(CPUMCTX, hwvirt.fGif,                0x46c);
-AssertCompileMemberOffset(CPUMCTX, hwvirt.fLocalForcedActions, 0x470);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.enmHwvirt,           0x488);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.fGif,                0x48c);
+AssertCompileMemberOffset(CPUMCTX, hwvirt.fLocalForcedActions, 0x490);
 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/include/VBox/vmm/hm.h

@@ -146 +146 @@
  * found in CPUM.
  * @{ */
-VMM_INT_DECL(int)               HMVmxGetHostMsrs(PVM pVM, PVMXMSRS pVmxMsrs);
-VMM_INT_DECL(int)               HMVmxGetHostMsr(PVM pVM, uint32_t idMsr, uint64_t *puValue);
 VMM_INT_DECL(bool)              HMVmxCanExecuteGuest(PVMCPU pVCpu, PCCPUMCTX pCtx);
 VMM_INT_DECL(int)               HMVmxEntryIntInfoInjectTrpmEvent(PVMCPU pVCpu, uint32_t uEntryIntInfo, uint32_t uErrCode,
@@ -218 +216 @@
 VMMR0_INT_DECL(int)             HMR0Init(void);
 VMMR0_INT_DECL(int)             HMR0Term(void);
-VMMR0_INT_DECL(int)             HMR0PreInitVM(PVM pVM);
 VMMR0_INT_DECL(int)             HMR0InitVM(PVM pVM);
 VMMR0_INT_DECL(int)             HMR0TermVM(PVM pVM);

trunk/include/VBox/vmm/vmm.h

@@ -342 +342 @@
     /** Attempt to enable or disable hardware-assisted mode. */
     VMMR0_DO_HM_ENABLE,
-    /** Pre-initialize hardware-assisted VM session. */
-    VMMR0_DO_HM_PRE_INIT,
 
     /** Call PGMR0PhysAllocateHandyPages(). */