From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 7A46F388552C; Tue, 28 Mar 2023 23:35:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7A46F388552C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1680046500; bh=GNv33lYUqTQ25tPdga8xLh8dA0wS/BjlnyPLnbjUtFQ=; h=From:To:Subject:Date:From; b=Aa6kbO58M+VeW8f1y4DHbaJ5PC7cPBxpeVVSSb57bSSu8yERf4UsV8XsYlmenn2QP ukgItrsnDsEC4mNFldARopV6AErRTwT38US073nEvJroRxfawSMlcQv+J6g1AuZwYm gT2nZjELZHXEv7aScz8u5cnBknZNS42w5qZC3bqA= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-9343] libstdc++: Tweak TSan annotations for std::atomic> X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: 0cec4e9cd44e257b159a28c44d3c215fe51dbbe9 X-Git-Newrev: 45249f88c98d0fcc064ffce8be46f1a8643c2faa Message-Id: <20230328233500.7A46F388552C@sourceware.org> Date: Tue, 28 Mar 2023 23:35:00 +0000 (GMT) List-Id: https://gcc.gnu.org/g:45249f88c98d0fcc064ffce8be46f1a8643c2faa commit r12-9343-g45249f88c98d0fcc064ffce8be46f1a8643c2faa Author: Jonathan Wakely Date: Thu Sep 15 16:57:30 2022 +0100 libstdc++: Tweak TSan annotations for std::atomic> Do not use the __tsan_mutex_not_static flag for annotation functions where it's not a valid flag. Also use the try_lock and try_lock_failed flags to more precisely annotate the CAS loop used to acquire a lock. libstdc++-v3/ChangeLog: * include/bits/shared_ptr_atomic.h (_GLIBCXX_TSAN_MUTEX_PRE_LOCK): Replace with ... (_GLIBCXX_TSAN_MUTEX_TRY_LOCK): ... this, add try_lock flag. (_GLIBCXX_TSAN_MUTEX_TRY_LOCK_FAILED): New macro using try_lock_failed flag (_GLIBCXX_TSAN_MUTEX_POST_LOCK): Rename to ... (_GLIBCXX_TSAN_MUTEX_LOCKED): ... this. (_GLIBCXX_TSAN_MUTEX_PRE_UNLOCK): Remove invalid flag. (_GLIBCXX_TSAN_MUTEX_POST_UNLOCK): Remove invalid flag. (_Sp_atomic::_Atomic_count::lock): Use new macros. (cherry picked from commit ecbdfa8b314e2c17da17511b86371f552bffd441) Diff: --- libstdc++-v3/include/bits/shared_ptr_atomic.h | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/libstdc++-v3/include/bits/shared_ptr_atomic.h b/libstdc++-v3/include/bits/shared_ptr_atomic.h index 385dbbea609..7f30d0ac008 100644 --- a/libstdc++-v3/include/bits/shared_ptr_atomic.h +++ b/libstdc++-v3/include/bits/shared_ptr_atomic.h @@ -32,24 +32,26 @@ #include +// Annotations for the custom locking in atomic>. #if defined _GLIBCXX_TSAN && __has_include() #include #define _GLIBCXX_TSAN_MUTEX_DESTROY(X) \ __tsan_mutex_destroy(X, __tsan_mutex_not_static) -#define _GLIBCXX_TSAN_MUTEX_PRE_LOCK(X) \ - __tsan_mutex_pre_lock(X, __tsan_mutex_not_static) -#define _GLIBCXX_TSAN_MUTEX_POST_LOCK(X) \ +#define _GLIBCXX_TSAN_MUTEX_TRY_LOCK(X) \ + __tsan_mutex_pre_lock(X, __tsan_mutex_not_static|__tsan_mutex_try_lock) +#define _GLIBCXX_TSAN_MUTEX_TRY_LOCK_FAILED(X) __tsan_mutex_post_lock(X, \ + __tsan_mutex_not_static|__tsan_mutex_try_lock_failed, 0) +#define _GLIBCXX_TSAN_MUTEX_LOCKED(X) \ __tsan_mutex_post_lock(X, __tsan_mutex_not_static, 0) -#define _GLIBCXX_TSAN_MUTEX_PRE_UNLOCK(X) \ - __tsan_mutex_pre_unlock(X, __tsan_mutex_not_static) -#define _GLIBCXX_TSAN_MUTEX_POST_UNLOCK(X) \ - __tsan_mutex_post_unlock(X, __tsan_mutex_not_static) +#define _GLIBCXX_TSAN_MUTEX_PRE_UNLOCK(X) __tsan_mutex_pre_unlock(X, 0) +#define _GLIBCXX_TSAN_MUTEX_POST_UNLOCK(X) __tsan_mutex_post_unlock(X, 0) #define _GLIBCXX_TSAN_MUTEX_PRE_SIGNAL(X) __tsan_mutex_pre_signal(X, 0) #define _GLIBCXX_TSAN_MUTEX_POST_SIGNAL(X) __tsan_mutex_post_signal(X, 0) #else #define _GLIBCXX_TSAN_MUTEX_DESTROY(X) -#define _GLIBCXX_TSAN_MUTEX_PRE_LOCK(X) -#define _GLIBCXX_TSAN_MUTEX_POST_LOCK(X) +#define _GLIBCXX_TSAN_MUTEX_TRY_LOCK(X) +#define _GLIBCXX_TSAN_MUTEX_TRY_LOCK_FAILED(X) +#define _GLIBCXX_TSAN_MUTEX_LOCKED(X) #define _GLIBCXX_TSAN_MUTEX_PRE_UNLOCK(X) #define _GLIBCXX_TSAN_MUTEX_POST_UNLOCK(X) #define _GLIBCXX_TSAN_MUTEX_PRE_SIGNAL(X) @@ -423,19 +425,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __current = _M_val.load(memory_order_relaxed); } - _GLIBCXX_TSAN_MUTEX_PRE_LOCK(&_M_val); + _GLIBCXX_TSAN_MUTEX_TRY_LOCK(&_M_val); while (!_M_val.compare_exchange_strong(__current, __current | _S_lock_bit, __o, memory_order_relaxed)) { + _GLIBCXX_TSAN_MUTEX_TRY_LOCK_FAILED(&_M_val); #if __cpp_lib_atomic_wait __detail::__thread_relax(); #endif __current = __current & ~_S_lock_bit; + _GLIBCXX_TSAN_MUTEX_TRY_LOCK(&_M_val); } - _GLIBCXX_TSAN_MUTEX_POST_LOCK(&_M_val); + _GLIBCXX_TSAN_MUTEX_LOCKED(&_M_val); return reinterpret_cast(__current); }