Changeset 71290 in vbox

Timestamp:

Mar 9, 2018 3:32:56 PM (7 years ago)

Author:

vboxsync

Message:

VMM: Better GVM alignment; assert padding sanity.

Location:

trunk

Files:

• include/VBox/vmm/gvm.h (modified) (5 diffs)
• src/VBox/VMM/VMMAll/AllPdbTypeHack.cpp (modified) (2 diffs)

trunk/include/VBox/vmm/gvm.h

@@ -43 +43 @@
     /** VCPU id (0 - (pVM->cCpus - 1). */
     VMCPUID         idCpu;
+    /** Padding. */
+    uint32_t        uPadding;
 
     /** Handle to the EMT thread. */
@@ -53 +55 @@
     /** Pointer to the corresponding cross context VM structure. */
     PVM             pVM;
+
+    /** Padding so gvmm starts on a 64 byte boundrary. */
+    uint8_t         abPadding[HC_ARCH_BITS == 32 ? 4*4 + 24 : 24];
 
     /** The GVMM per vcpu data. */
@@ -74 +79 @@
 #endif
 } GVMCPU;
+AssertCompileMemberOffset(GVMCPU, gvmm,   64);
+#ifdef VBOX_WITH_NEM_R0
+AssertCompileMemberOffset(GVMCPU, nem,    64 + 64);
+AssertCompileSize(        GVMCPU,         64 + 64 + 64);
+#else
+AssertCompileSize(        GVMCPU,         64 + 64);
+#endif
 
 /** @} */
@@ -106 +118 @@
      * Same same as VM::cCpus. */
     uint32_t        cCpus;
-    uint8_t         abPadding[HC_ARCH_BITS == 32 ? 16 : 4];
+    /** Padding so gvmm starts on a 64 byte boundrary.   */
+    uint8_t         abPadding[HC_ARCH_BITS == 32 ? 12 + 28 : 28];
 
     /** The GVMM per vm data. */
@@ -149 +162 @@
     GVMCPU          aCpus[1];
 } GVM;
-AssertCompileMemberOffset(GVM, gvmm,   40);
-AssertCompileMemberOffset(GVM, gmm,    40 + 256);
+AssertCompileMemberOffset(GVM, gvmm,   64);
+AssertCompileMemberOffset(GVM, gmm,    64 + 256);
 #ifdef VBOX_WITH_NEM_R0
-AssertCompileMemberOffset(GVM, nem,    40 + 256 + 512);
-AssertCompileMemberOffset(GVM, rawpci, 40 + 256 + 512 + 128);
-AssertCompileMemberOffset(GVM, aCpus,  40 + 256 + 512 + 128 + 64);
+AssertCompileMemberOffset(GVM, nem,    64 + 256 + 512);
+AssertCompileMemberOffset(GVM, rawpci, 64 + 256 + 512 + 128);
+AssertCompileMemberOffset(GVM, aCpus,  64 + 256 + 512 + 128 + 64);
 #else
-AssertCompileMemberOffset(GVM, rawpci, 40 + 256 + 512);
-AssertCompileMemberOffset(GVM, aCpus,  40 + 256 + 512 + 64);
+AssertCompileMemberOffset(GVM, rawpci, 64 + 256 + 512);
+AssertCompileMemberOffset(GVM, aCpus,  64 + 256 + 512 + 64);
 #endif
 

trunk/src/VBox/VMM/VMMAll/AllPdbTypeHack.cpp

@@ -53 +53 @@
 #include "../include/NEMInternal.h"
 #include "../include/REMInternal.h"
-#include "../VMMR0/GMMR0Internal.h"
 #ifndef IN_RC
+# include "../VMMR0/GMMR0Internal.h"
 # include "../VMMR0/GVMMR0Internal.h"
 #endif
@@ -65 +65 @@
 # include <VBox/vmm/uvm.h>
 #endif
-#include <VBox/vmm/gvm.h>
+#ifndef IN_RC
+# include <VBox/vmm/gvm.h>
+#endif