gh-117657: Fix race data race in _Py_IsOwnedByCurrentThread() (#118258)

mpage · web-flow · commit a5eeb832c2bb · 2024-04-26T10:39:08.000-04:00
diff --git a/Include/object.h b/Include/object.h
@@ -303,7 +303,11 @@ _Py_ThreadId(void)
 static inline Py_ALWAYS_INLINE int
 _Py_IsOwnedByCurrentThread(PyObject *ob)
 {
+#ifdef _Py_THREAD_SANITIZER
+    return _Py_atomic_load_uintptr_relaxed(&ob->ob_tid) == _Py_ThreadId();
+#else
     return ob->ob_tid == _Py_ThreadId();
+#endif
 }
 #endif
 
diff --git a/Tools/tsan/suppressions_free_threading.txt b/Tools/tsan/suppressions_free_threading.txt
@@ -14,7 +14,6 @@ race:set_allocator_unlocked
 race:_add_to_weak_set
 race:_in_weak_set
 race:_mi_heap_delayed_free_partial
-race:_Py_IsOwnedByCurrentThread
 race:_PyEval_EvalFrameDefault
 race:_PyFunction_SetVersion
 race:_PyImport_AcquireLock

Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,11 @@ _Py_ThreadId(void)`
`303`	`303`	`static inline Py_ 8000 ALWAYS_INLINE int`
`304`	`304`	`_Py_IsOwnedByCurrentThread(PyObject *ob)`
`305`	`305`	`{`
	`306`	`+#ifdef _Py_THREAD_SANITIZER`
	`307`	`+ return _Py_atomic_load_uintptr_relaxed(&ob->ob_tid) == _Py_ThreadId();`
	`308`	`+#else`
`306`	`309`	`return ob->ob_tid == _Py_ThreadId();`
	`310`	`+#endif`
`307`	`311`	`}`
`308`	`312`	`#endif`
`309`	`313`