Merge branch 'wip/tsan/misc' into wip/tsan/all

4 files changed, 10 insertions, 6 deletions

diff --git a/rts/SMPClosureOps.h b/rts/SMPClosureOps.h
index 3191a8c600..2df88db06c 100644
--- a/rts/SMPClosureOps.h
+++ b/rts/SMPClosureOps.h
@@ -62,12 +62,12 @@ EXTERN_INLINE StgInfoTable *reallyLockClosure(StgClosure *p)
             info = xchg((P_)(void *)&p->header.info, (W_)&stg_WHITEHOLE_info);
             if (info != (W_)&stg_WHITEHOLE_info) return (StgInfoTable *)info;
 #if defined(PROF_SPIN)
-            ++whitehole_lockClosure_spin;
+            NONATOMIC_ADD(&whitehole_lockClosure_spin, 1);
 #endif
             busy_wait_nop();
         } while (++i < SPIN_COUNT);
 #if defined(PROF_SPIN)
-        ++whitehole_lockClosure_yield;
+        NONATOMIC_ADD(&whitehole_lockClosure_yield, 1);
 #endif
         yieldThread();
     } while (1);
diff --git a/rts/Schedule.c b/rts/Schedule.c
index b97da30848..67177f2d98 100644
--- a/rts/Schedule.c
+++ b/rts/Schedule.c
@@ -2040,12 +2040,14 @@ forkProcess(HsStablePtr *entry
     ACQUIRE_LOCK(&sm_mutex);
     ACQUIRE_LOCK(&stable_ptr_mutex);
     ACQUIRE_LOCK(&stable_name_mutex);
-    ACQUIRE_LOCK(&task->lock);
 
     for (i=0; i < n_capabilities; i++) {
         ACQUIRE_LOCK(&capabilities[i]->lock);
     }
 
+    // Take task lock after capability lock to avoid order inversion (#17275).
+    ACQUIRE_LOCK(&task->lock);
+
 #if defined(THREADED_RTS)
     ACQUIRE_LOCK(&all_tasks_mutex);
 #endif
diff --git a/rts/ThreadPaused.c b/rts/ThreadPaused.c
index 3404c20418..13fc2b4ca0 100644
--- a/rts/ThreadPaused.c
+++ b/rts/ThreadPaused.c
@@ -331,7 +331,7 @@ threadPaused(Capability *cap, StgTSO *tso)
             if (cur_bh_info != bh_info) {
                 bh_info = cur_bh_info;
 #if defined(PROF_SPIN)
-                ++whitehole_threadPaused_spin;
+                NONATOMIC_ADD(&whitehole_threadPaused_spin, 1);
 #endif
                 busy_wait_nop();
                 goto retry;
diff --git a/rts/posix/GetTime.c b/rts/posix/GetTime.c
index 0128e3bc8b..7d53f95401 100644
--- a/rts/posix/GetTime.c
+++ b/rts/posix/GetTime.c
@@ -85,7 +85,9 @@ Time getCurrentThreadCPUTime(void)
        defined(CLOCK_PROCESS_CPUTIME_ID) &&  \
        defined(HAVE_SYSCONF)
     static bool have_checked_usability = false;
-    if (!have_checked_usability) {
+    // The RELAXED operation is fine here as it's okay if we do the check below
+    // more than once.
+    if (!RELAXED_LOAD(&have_checked_usability)) {
         // The Linux clock_getres(2) manpage claims that some early versions of
         // Linux will return values which are uninterpretable in the presence
         // of migration across CPUs. They claim that clock_getcpuclockid(0)
@@ -95,7 +97,7 @@ Time getCurrentThreadCPUTime(void)
             sysErrorBelch("getCurrentThreadCPUTime: no supported");
             stg_exit(EXIT_FAILURE);
         }
-        have_checked_usability = true;
+        RELAXED_STORE(&have_checked_usability, true);
     }
     return getClockTime(CLOCK_THREAD_CPUTIME_ID);
 #else