Changeset 90639 in vbox

Timestamp:

Aug 11, 2021 9:41:42 PM (3 years ago)

Author:

vboxsync

Message:

VMM,VMMDev: Changed my mind, made the alignment requirement for PDMCRITSECTRW 64 bytes instead of 32. Only the VMMDev one needed fixing. bugref:6695

Location:

trunk/src/VBox

Files:

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

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

@@ -127 +127 @@
      *          PDMDEVINS structure. */
     PDMCRITSECT         CritSect;
+#if !defined(VBOX_WITHOUT_TESTING_FEATURES) || defined(DOXYGEN_RUNNING)
+    /** Read write critical section of lock testing.
+     * @remarks At the beginning to satisfy 64 byte alignment requirement.  */
+    PDMCRITSECTRW       CritSectRw;
+#endif
 
     /** mouse capabilities of host and guest */
@@ -366 +371 @@
     /** Handle for the MMIO region used by the testing component. */
     IOMMMIOHANDLE       hMmioTesting;
-    /** Read write critical section of lock testing. */
-    PDMCRITSECTRW       CritSectRw;
 #endif /* !VBOX_WITHOUT_TESTING_FEATURES || DOXYGEN_RUNNING */
     /** @} */
@@ -393 +396 @@
 #ifndef VBOX_WITHOUT_TESTING_FEATURES
 AssertCompileMemberAlignment(VMMDEV, TestingData.Value.u64Value, 8);
-AssertCompileMemberAlignment(VMMDEV, CritSectRw, 32);
+AssertCompileMemberAlignment(VMMDEV, CritSectRw, 64);
 #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),
+    AssertMsgReturn(((uintptr_t)&pCritSect->Core & 63) == 0, ("&Core=%p, must be 64-byte aligned!\n", &pCritSect->Core),
                     VERR_PDM_CRITSECTRW_MISALIGNED);
     AssertMsgReturn(((uintptr_t)&pCritSect->Core.u & (sizeof(pCritSect->Core.u.u128) - 1)) == 0 /* paranoia */,

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

@@ -470 +470 @@
 } IOM;
 #ifdef IOM_WITH_CRIT_SECT_RW
-AssertCompileMemberAlignment(IOM, CritSect, 32);
+AssertCompileMemberAlignment(IOM, CritSect, 64);
 #endif
 /** Pointer to IOM instance data. */

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

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