Skip to content

Carry the crc32c TSan fix onto v11.8.1 #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thevar1able merged 1 commit into from
Sep 8, 2026
Merged

Carry the crc32c TSan fix onto v11.8.1 #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions util/crc32c.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include "util/crc32c.h"

#include <array>
#include <atomic>
#include <cstdint>
#include <utility>

Expand Down Expand Up @@ -53,7 +54,7 @@ ASSERT_FEATURE_COMPAT_HEADER();
#endif

#if defined(HAVE_ARM64_CRC)
bool pmull_runtime_flag = false;
std::atomic<bool> pmull_runtime_flag{false};
#endif

namespace ROCKSDB_NAMESPACE::crc32c {
Expand Down Expand Up @@ -377,7 +378,7 @@ std::string IsFastCrc32Supported() {
if (crc32c_runtime_check()) {
has_fast_crc = true;
arch = "Arm64";
pmull_runtime_flag = crc32c_pmull_runtime_check();
pmull_runtime_flag.store(crc32c_pmull_runtime_check(), std::memory_order_relaxed);
} else {
has_fast_crc = false;
arch = "Arm64";
Expand Down Expand Up @@ -1108,7 +1109,7 @@ static inline Function Choose_Extend() {
return isAltiVec() ? ExtendPPCImpl : ExtendImpl<DefaultCRC32>;
#elif defined(HAVE_ARM64_CRC)
if(crc32c_runtime_check()) {
pmull_runtime_flag = crc32c_pmull_runtime_check();
pmull_runtime_flag.store(crc32c_pmull_runtime_check(), std::memory_order_relaxed);
return ExtendARMImpl;
} else {
return ExtendImpl<DefaultCRC32>;
Expand Down
6 changes: 4 additions & 2 deletions util/crc32c_arm64.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@

#include "util/crc32c_arm64.h"

#include <atomic>

#if defined(HAVE_ARM64_CRC)

#if defined(__linux__)
Expand Down Expand Up @@ -49,7 +51,7 @@
} while (0)
#endif

extern bool pmull_runtime_flag;
extern std::atomic<bool> pmull_runtime_flag;

uint32_t crc32c_runtime_check(void) {
#if defined(ROCKSDB_AUXV_GETAUXVAL_PRESENT) || defined(__FreeBSD__)
Expand Down Expand Up @@ -124,7 +126,7 @@ uint32_t crc32c_arm64(uint32_t crc, unsigned char const* data, size_t len) {
* Raspberry Pi supports crc32 but doesn't support pmull.
* Skip Crc32c Parallel computation if no crypto extension available.
*/
if (pmull_runtime_flag) {
if (pmull_runtime_flag.load(std::memory_order_relaxed)) {
/* Macro (HAVE_ARM64_CRYPTO) is used for compiling check */
#ifdef HAVE_ARM64_CRYPTO
/* Crc32c Parallel computation
Expand Down