mongodb: Fix aarch64 build with gcc12
PATCH 1/1 mongodb: Fix aarch64 build with gcc12
Signed-off-by Khem Raj <[email protected]>
--- ...just-the-cache-alignment-assumptions.patch | 45 +++++++++++++++++++ .../recipes-dbs/mongodb/mongodb_git.bb | 1 + 2 files changed, 46 insertions(+) create mode 100644 meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-server-Adjust-the-cache-alignment-assumptions.patch
meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb/0001-server-Adjust-the-cache-alignment-assumptions.patch new file +45 -0
@@ -0,0 +1,45 @@ +From 5c9e0d0fc9188bab0ae09c9c33df01938b0c1b6c Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Thu, 14 Apr 2022 09:25:33 -0700 +Subject: [PATCH] server: Adjust the cache alignment assumptions + +aarch64 has 256 for hardware_destructive_interference_size and gcc 12 +has added a warning to complain about mismatches which results in +static_assert failures + +In file included from src/mongo/s/commands/cluster_find_cmd.cpp:39: +src/mongo/db/stats/counters.h:185:47: error: static assertion failed: cache line spill + 185 | static_assert(sizeof(decltype(_together)) <= stdx::hardware_constructive_interference_size, + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The structure need to ensure true sharing for both the elements +so align it to hardware_constructive_interference_size instead + +Upstream-Status: Reported [https://jira.mongodb.org/browse/SERVER-65664] + +Signed-off-by: Khem Raj <[email protected]> +--- + src/mongo/db/stats/counters.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/mongo/db/stats/counters.h b/src/mongo/db/stats/counters.h +index aa11c84c2f1..710d75a672f 100644 +--- a/src/mongo/db/stats/counters.h ++++ b/src/mongo/db/stats/counters.h +@@ -178,10 +178,10 @@ private: + // These two counters are always incremented at the same time, so + // we place them on the same cache line. + struct Together { +- AtomicWord<long long> logicalBytesIn{0}; +- AtomicWord<long long> requests{0}; ++ alignas(std::hardware_constructive_interference_size) AtomicWord<long long> logicalBytesIn{0}; ++ alignas(std::hardware_constructive_interference_size) AtomicWord<long long> requests{0}; + }; +- CacheAligned<Together> _together{}; ++ Together _together{}; + static_assert(sizeof(decltype(_together)) <= stdx::hardware_constructive_interference_size, + "cache line spill"); + +-- +2.35.2 +
meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb +1 -0
@@ -31,6 +31,7 @@ SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4;protocol=https \ file://ppc64_ARCH_BITS.patch \ file://PTHREAD_STACK_MIN.patch \ file://0001-add-explict-static_cast-size_t-to-maxMemoryUsageByte.patch \ + file://0001-server-Adjust-the-cache-alignment-assumptions.patch \ " SRC_URI:append:libc-musl ="\ file://0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch \
Signature · 1 line
2.35.2