Changeset 90638 in vbox

Timestamp:

Aug 11, 2021 9:35:56 PM (4 years ago)

Author:

vboxsync

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

146250

Message:

VMM,VMMDev: Force 32-byte alignment of PDMCRITSECTRW so all members that are being updated atomically are in the same cacheline. This also ensures that the 128-bit union is correctly aligned. bugref:6695

Location:

trunk

Files:

• include/VBox/err.h (modified) (1 diff)
• src/VBox/Devices/VMMDev/VMMDevState.h (modified) (1 diff)
• src/VBox/VMM/VMMR3/PDMCritSect.cpp (modified) (1 diff)
• src/VBox/VMM/include/IOMInternal.h (modified) (3 diffs)
• src/VBox/VMM/include/TMInternal.h (modified) (1 diff)

trunk/include/VBox/err.h

@@ -1613 +1613 @@
 /** Internal error in read-write critical section. */
 #define VERR_PDM_CRITSECTRW_IPE                     (-7205)
+/** Misaligned read/write critical section. */
+#define VERR_PDM_CRITSECTRW_MISALIGNED              (-7206)
 /** @} */
 

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -393 +393 @@
 #ifndef VBOX_WITHOUT_TESTING_FEATURES
 AssertCompileMemberAlignment(VMMDEV, TestingData.Value.u64Value, 8);
+AssertCompileMemberAlignment(VMMDEV, CritSectRw, 32);
 #endif
 

trunk/src/VBox/VMM/VMMR3/PDMCritSect.cpp

@@ -251 +251 @@
     VM_ASSERT_EMT(pVM);
     Assert(pCritSect->Core.u32Magic != RTCRITSECTRW_MAGIC);
+    AssertMsgReturn(((uintptr_t)&pCritSect->Core & 31) == 0, ("&Core=%p, must be 32-byte aligned!\n", &pCritSect->Core),
+                    VERR_PDM_CRITSECTRW_MISALIGNED);
+    AssertMsgReturn(((uintptr_t)&pCritSect->Core.u & (sizeof(pCritSect->Core.u.u128) - 1)) == 0 /* paranoia */,
+                    ("&Core.u=%p, must be 16-byte aligned!\n", &pCritSect->Core.u),
+                    VERR_PDM_CRITSECTRW_MISALIGNED);
 
     /*

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

@@ -384 +384 @@
 typedef struct IOM
 {
+    /** Lock serializing EMT access to IOM. */
+#ifdef IOM_WITH_CRIT_SECT_RW
+    PDMCRITSECTRW                   CritSect;
+#else
+    PDMCRITSECT                     CritSect;
+#endif
+
     /** @name I/O ports
      * @note The updating of these variables is done exclusively from EMT(0).
@@ -438 +445 @@
     /** @} */
 
-
-    /** Lock serializing EMT access to IOM. */
-#ifdef IOM_WITH_CRIT_SECT_RW
-    PDMCRITSECTRW                   CritSect;
-#else
-    PDMCRITSECT                     CritSect;
-#endif
-
     /** @name I/O Port statistics.
      * @{ */
@@ -470 +469 @@
     /** @} */
 } IOM;
+#ifdef IOM_WITH_CRIT_SECT_RW
+AssertCompileMemberAlignment(IOM, CritSect, 32);
+#endif
 /** Pointer to IOM instance data. */
 typedef IOM *PIOM;

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

@@ -320 +320 @@
     PDMCRITSECTRW           AllocLock;
 } TMTIMERQUEUE;
+AssertCompileMemberAlignment(TMTIMERQUEUE, AllocLock, 32);
 AssertCompileSizeAlignment(TMTIMERQUEUE, 64);
 /** Pointer to a timer queue. */