Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:15.5:Update
pmdk.21602
pmdk-1.9-fix-missing-sfence.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File pmdk-1.9-fix-missing-sfence.patch of Package pmdk.21602
From 55ec1b24ac89371e1dd0544a17662c738075041e Mon Sep 17 00:00:00 2001 From: Piotr Balcer <piotr.balcer@intel.com> Date: Wed, 1 Sep 2021 14:12:49 +0200 Subject: [PATCH] common: fix missing sfence in non-temporal memcpy The implementation of hardware fencing for non-temporal memcpy variants is done using a function pointer. Some of those pointers are called "barrier" which unfortunately overlaps with a function-like macro that's used for compiler barriers. This meant that a compiler barrier was being used instead of a hardware store barrier. This patch changes the compiler barrier to a static inline function called "compiler_barrier" to avoid name conflicts. Fixes #5292 Reported-by: @Transpeptidase --- src/core/util.h | 15 +++++++++++++-- src/libpmem2/x86_64/memcpy/memcpy_nt_avx.c | 4 ++-- src/libpmem2/x86_64/memcpy/memcpy_nt_avx512f.c | 4 ++-- src/libpmem2/x86_64/memcpy/memcpy_nt_sse2.c | 4 ++-- src/libpmem2/x86_64/memset/memset_nt_avx.c | 4 ++-- src/libpmem2/x86_64/memset/memset_nt_avx512f.c | 4 ++-- src/libpmem2/x86_64/memset/memset_nt_sse2.c | 4 ++-- 7 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/core/util.h b/src/core/util.h index e84b5fb2081..43e43652373 100644 --- a/src/core/util.h +++ b/src/core/util.h @@ -134,13 +134,24 @@ void util_set_alloc_funcs( #ifdef _MSC_VER #define force_inline inline __forceinline #define NORETURN __declspec(noreturn) -#define barrier() _ReadWriteBarrier() #else #define force_inline __attribute__((always_inline)) inline #define NORETURN __attribute__((noreturn)) -#define barrier() asm volatile("" ::: "memory") #endif +/* + * compiler_barrier -- issues a compiler barrier + */ +static force_inline void +compiler_barrier(void) +{ +#ifdef _MSC_VER + _ReadWriteBarrier(); +#else + asm volatile("" ::: "memory"); +#endif +} + #ifdef _MSC_VER typedef UNALIGNED uint64_t ua_uint64_t; typedef UNALIGNED uint32_t ua_uint32_t; diff --git a/src/libpmem2/x86_64/memcpy/memcpy_nt_avx.c b/src/libpmem2/x86_64/memcpy/memcpy_nt_avx.c index ff007fb3c3d..6311bed4f18 100644 --- a/src/libpmem2/x86_64/memcpy/memcpy_nt_avx.c +++ b/src/libpmem2/x86_64/memcpy/memcpy_nt_avx.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSD-3-Clause -/* Copyright 2017-2020, Intel Corporation */ +/* Copyright 2017-2021, Intel Corporation */ #include <immintrin.h> #include <stddef.h> @@ -22,7 +22,7 @@ static force_inline void mm256_stream_si256(char *dest, unsigned idx, __m256i src) { _mm256_stream_si256((__m256i *)dest + idx, src); - barrier(); + compiler_barrier(); } static force_inline void diff --git a/src/libpmem2/x86_64/memcpy/memcpy_nt_avx512f.c b/src/libpmem2/x86_64/memcpy/memcpy_nt_avx512f.c index fb19504e432..4a60b9cd0af 100644 --- a/src/libpmem2/x86_64/memcpy/memcpy_nt_avx512f.c +++ b/src/libpmem2/x86_64/memcpy/memcpy_nt_avx512f.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSD-3-Clause -/* Copyright 2017-2020, Intel Corporation */ +/* Copyright 2017-2021, Intel Corporation */ #include <immintrin.h> #include <stddef.h> @@ -22,7 +22,7 @@ static force_inline void mm512_stream_si512(char *dest, unsigned idx, __m512i src) { _mm512_stream_si512((__m512i *)dest + idx, src); - barrier(); + compiler_barrier(); } static force_inline void diff --git a/src/libpmem2/x86_64/memcpy/memcpy_nt_sse2.c b/src/libpmem2/x86_64/memcpy/memcpy_nt_sse2.c index b633be9da91..05c5cf9bfdc 100644 --- a/src/libpmem2/x86_64/memcpy/memcpy_nt_sse2.c +++ b/src/libpmem2/x86_64/memcpy/memcpy_nt_sse2.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSD-3-Clause -/* Copyright 2017-2020, Intel Corporation */ +/* Copyright 2017-2021, Intel Corporation */ #include <immintrin.h> #include <stddef.h> @@ -21,7 +21,7 @@ static force_inline void mm_stream_si128(char *dest, unsigned idx, __m128i src) { _mm_stream_si128((__m128i *)dest + idx, src); - barrier(); + compiler_barrier(); } static force_inline void diff --git a/src/libpmem2/x86_64/memset/memset_nt_avx.c b/src/libpmem2/x86_64/memset/memset_nt_avx.c index 4a4d5f6a27f..4882b3c589a 100644 --- a/src/libpmem2/x86_64/memset/memset_nt_avx.c +++ b/src/libpmem2/x86_64/memset/memset_nt_avx.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSD-3-Clause -/* Copyright 2017-2020, Intel Corporation */ +/* Copyright 2017-2021, Intel Corporation */ #include <immintrin.h> #include <stddef.h> @@ -17,7 +17,7 @@ static force_inline void mm256_stream_si256(char *dest, unsigned idx, __m256i src) { _mm256_stream_si256((__m256i *)dest + idx, src); - barrier(); + compiler_barrier(); } static force_inline void diff --git a/src/libpmem2/x86_64/memset/memset_nt_avx512f.c b/src/libpmem2/x86_64/memset/memset_nt_avx512f.c index b29402a9331..5db88c5aa04 100644 --- a/src/libpmem2/x86_64/memset/memset_nt_avx512f.c +++ b/src/libpmem2/x86_64/memset/memset_nt_avx512f.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSD-3-Clause -/* Copyright 2017-2020, Intel Corporation */ +/* Copyright 2017-2021, Intel Corporation */ #include <immintrin.h> #include <stddef.h> @@ -18,7 +18,7 @@ static force_inline void mm512_stream_si512(char *dest, unsigned idx, __m512i src) { _mm512_stream_si512((__m512i *)dest + idx, src); - barrier(); + compiler_barrier(); } static force_inline void diff --git a/src/libpmem2/x86_64/memset/memset_nt_sse2.c b/src/libpmem2/x86_64/memset/memset_nt_sse2.c index 5590a65f86d..0793ff5be29 100644 --- a/src/libpmem2/x86_64/memset/memset_nt_sse2.c +++ b/src/libpmem2/x86_64/memset/memset_nt_sse2.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: BSD-3-Clause -/* Copyright 2017-2020, Intel Corporation */ +/* Copyright 2017-2021, Intel Corporation */ #include <immintrin.h> #include <stddef.h> @@ -16,7 +16,7 @@ static force_inline void mm_stream_si128(char *dest, unsigned idx, __m128i src) { _mm_stream_si128((__m128i *)dest + idx, src); - barrier(); + compiler_barrier(); } static force_inline void
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
