Changeset 87750 in vbox for trunk/src/VBox/VMM/include

Timestamp:

Feb 13, 2021 3:37:09 AM (4 years ago)

Author:

vboxsync

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

142802

Message:

VMM/TM: Further relax memory ordering when signaling update-in-progress in both TMNotifyEndOfExecution and TMNotifyEndOfHalt by ensuring only the EMT writes to the memory. bugref:9941

File:

• trunk/src/VBox/VMM/include/TMInternal.h (modified) (5 diffs)

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

@@ -716 +716 @@
 typedef struct TMCPU
 {
-    /** CPU timestamp ticking enabled indicator (bool). (RDTSC) */
-    bool                        fTSCTicking;
-    bool                        afAlignment0[7]; /**< alignment padding */
     /** The offset between the host tick (TSC/virtual depending on the TSC mode) and
      *  the guest tick. */
@@ -726 +723 @@
     /** The last seen TSC by the guest. */
     uint64_t                    u64TSCLastSeen;
-
-#ifndef VBOX_WITHOUT_NS_ACCOUNTING
-    /** Align  */
-    uint64_t                    au64Alignment[4];
-
-    /** @name Core accounting data.  Must be cache-line aligned.
+    /** CPU timestamp ticking enabled indicator (bool). (RDTSC) */
+    bool                        fTSCTicking;
+#ifdef VBOX_WITHOUT_NS_ACCOUNTING
+    bool                        afAlignment1[7]; /**< alignment padding */
+#else /* !VBOX_WITHOUT_NS_ACCOUNTING */
+
+    /** Set by the timer callback to trigger updating of statistics in
+     *  TMNotifyEndOfExecution. */
+    bool volatile               fUpdateStats;
+    bool                        afAlignment1[6];
+    /** The time not spent executing or halted.
+     * @note Only updated after halting and after the timer runs. */
+    uint64_t                    cNsOtherStat;
+    /** Reasonably up to date total run time value.
+     * @note Only updated after halting and after the timer runs. */
+    uint64_t                    cNsTotalStat;
+# if defined(VBOX_WITH_STATISTICS) || defined(VBOX_WITH_NS_ACCOUNTING_STATS)
+    /** Resettable copy of version of cNsOtherStat.
+    * @note Only updated after halting. */
+    STAMCOUNTER                 StatNsOther;
+    /** Resettable copy of cNsTotalStat.
+     * @note Only updated after halting. */
+    STAMCOUNTER                 StatNsTotal;
+# else
+    uint64_t                    auAlignment2[2];
+# endif
+
+    /** @name Core accounting data.
+     * @note Must be cache-line aligned and only written to by the EMT owning it.
      * @{ */
     /** The cNsXXX generation. */
@@ -742 +762 @@
     /** Set if we're suspended and u64NsTsStartTotal is to be cNsTotal. */
     bool volatile               fSuspended;
-    /** Set by the timer callback to trigger updating of statistics in
-     *  TMNotifyEndOfExecution. */
-    bool volatile               fUpdateStats;
+    bool                        afAlignment;
     /** The nanosecond timestamp of the CPU start or resume.
      * This is recalculated when the VM is started so that
@@ -774 +792 @@
     /** Resettable version of cNsHalted. */
     STAMPROFILE                 StatNsHalted;
-
-    /** Resettable copy of version of cNsOtherStat.
-    * @note Only updated after halting. */
-    STAMCOUNTER                 StatNsOther;
-    /** Resettable copy of cNsTotalStat.
-     * @note Only updated after halting. */
-    STAMCOUNTER                 StatNsTotal;
 # endif
-    /** The time not spent executing or halted.
-     * @note Only updated after halting and after the timer runs. */
-    uint64_t                    cNsOtherStat;
-    /** Reasonably up to date total run time value.
-     * @note Only updated after halting and after the timer runs. */
-    uint64_t                    cNsTotalStat;
 
     /** CPU load state for this virtual CPU (tmR3CpuLoadTimer). */
@@ -798 +803 @@
 AssertCompileMemberAlignment(TMCPU, StatNsExecuting, 64);
 # else
-AssertCompileMemberAlignment(TMCPU, cNsOtherStat, 64);
+AssertCompileMemberAlignment(TMCPU, CpuLoad, 64);
 # endif
 #endif