From e11e039e02ef30a98a7928ce6c59cebe096dd753 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Wed, 1 Dec 2021 15:08:07 -0800 Subject: Export of internal Abseil changes -- 08d99ee216b7bfac1c5182db952d4e053e5ebc31 by Abseil Team : Fix race condition reported by tsan on `inline_element_size` in hashtablez. PiperOrigin-RevId: 413520771 GitOrigin-RevId: 08d99ee216b7bfac1c5182db952d4e053e5ebc31 Change-Id: Ibd396803f04a659cfbdb8dc7ec37511643657694 --- absl/container/internal/hashtablez_sampler.h | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'absl/container/internal/hashtablez_sampler.h') diff --git a/absl/container/internal/hashtablez_sampler.h b/absl/container/internal/hashtablez_sampler.h index ee4d293e..0fd9349f 100644 --- a/absl/container/internal/hashtablez_sampler.h +++ b/absl/container/internal/hashtablez_sampler.h @@ -82,16 +82,27 @@ struct HashtablezInfo : public profiling_internal::Sample { std::atomic hashes_bitwise_xor; std::atomic max_reserve; + // One could imagine that inline_element_size could be non-atomic, since it + // *almost* follows the rules for the fields that are set by + // `PrepareForSampling`. However, TSAN reports a race (see b/207323922) in + // which + // A: Thread 1: Register() returns, unlocking init_mu. + // B: Thread 2: Iterate() is called, locking init_mu. + // C: Thread 1: inlined_element_size is stored. + // D: Thread 2: inlined_element_size is accessed (a race). + // A simple solution is to make inline_element_size atomic so that we treat it + // at as we do the other atomic fields. + std::atomic inline_element_size; + // All of the fields below are set by `PrepareForSampling`, they must not be // mutated in `Record*` functions. They are logically `const` in that sense. - // These are guarded by init_mu, but that is not externalized to clients, who - // can only read them during `HashtablezSampler::Iterate` which will hold the - // lock. + // These are guarded by init_mu, but that is not externalized to clients, + // which can read them only during `SampleRecorder::Iterate` which will hold + // the lock. static constexpr int kMaxStackDepth = 64; absl::Time create_time; int32_t depth; void* stack[kMaxStackDepth]; - size_t inline_element_size; }; inline void RecordRehashSlow(HashtablezInfo* info, size_t total_probe_length) { -- cgit v1.2.3