Changeset 72820 in vbox for trunk/src/VBox/VMM

Timestamp:

Jul 3, 2018 10:16:28 AM (7 years ago)

Author:

vboxsync

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

123364

Message:

VMM/HMVMXR0,HMSVMR0: Compiler barriers with volatiles for fCtxChanged.

Location:

trunk/src/VBox/VMM/VMMR0

Files:

• HMSVMR0.cpp (modified) (2 diffs)
• HMVMXR0.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/VMMR0/HMSVMR0.cpp

@@ -2512 +2512 @@
      */
     uint64_t const fCtxChanged = ASMAtomicUoReadU64(&pVCpu->hm.s.fCtxChanged);
+    RT_UNTRUSTED_NONVOLATILE_COPY_FENCE();
     AssertMsg(!(fCtxChanged & (HM_CHANGED_ALL_GUEST & ~HM_CHANGED_SVM_HOST_GUEST_SHARED_STATE)),
               ("fCtxChanged=%#RX64\n", fCtxChanged));
@@ -2742 +2743 @@
      */
     uint64_t const fCtxChanged = ASMAtomicUoReadU64(&pVCpu->hm.s.fCtxChanged);
+    RT_UNTRUSTED_NONVOLATILE_COPY_FENCE();
     AssertMsg(!(fCtxChanged & (HM_CHANGED_ALL_GUEST & ~HM_CHANGED_SVM_HOST_GUEST_SHARED_STATE)),
               ("fCtxChanged=%#RX64\n", fCtxChanged));

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -4826 +4826 @@
                 /* Currently, all mode changes sends us back to ring-3, so these should be set. See @bugref{6944}. */
                 uint64_t const fCtxChanged = ASMAtomicUoReadU64(&pVCpu->hm.s.fCtxChanged);
+                RT_UNTRUSTED_NONVOLATILE_COPY_FENCE();
                 AssertMsg(fCtxChanged & (  HM_CHANGED_VMX_EXIT_CTLS
                                          | HM_CHANGED_VMX_ENTRY_CTLS
@@ -4854 +4855 @@
             /* Currently, all mode changes sends us back to ring-3, so these should be set. See @bugref{6944}. */
             uint64_t const fCtxChanged = ASMAtomicUoReadU64(&pVCpu->hm.s.fCtxChanged);
+            RT_UNTRUSTED_NONVOLATILE_COPY_FENCE();
             AssertMsg(fCtxChanged & (  HM_CHANGED_VMX_EXIT_CTLS
                                      | HM_CHANGED_VMX_ENTRY_CTLS
@@ -8169 +8171 @@
     VBOXSTRICTRC rcStrict;
     uint64_t     fCtxChanged = ASMAtomicUoReadU64(&pVCpu->hm.s.fCtxChanged);
+    RT_UNTRUSTED_NONVOLATILE_COPY_FENCE();
     if ((fCtxChanged & (HM_CHANGED_ALL_GUEST & ~HM_CHANGED_VMX_HOST_GUEST_SHARED_STATE)) == HM_CHANGED_GUEST_RIP)
     {
@@ -8198 +8201 @@
     /* All the guest state bits should be loaded except maybe the host context and/or the shared host/guest bits. */
     fCtxChanged = ASMAtomicUoReadU64(&pVCpu->hm.s.fCtxChanged);
+    RT_UNTRUSTED_NONVOLATILE_COPY_FENCE();
     AssertMsg(!(fCtxChanged & (HM_CHANGED_ALL_GUEST & ~HM_CHANGED_VMX_HOST_GUEST_SHARED_STATE)),
               ("fCtxChanged=%#RX64\n", fCtxChanged));