[Devel] [PATCH RHEL10 COMMIT] Revert "lib/zlib: use atomic GCOV counters to prevent crash in inflate_fast"

Konstantin Khorenko khorenko at virtuozzo.com
Wed Apr 22 17:23:20 MSK 2026


The commit is pushed to "branch-rh10-6.12.0-55.52.1.5.x.vz10-ovz" and will appear at git at bitbucket.org:openvz/vzkernel.git
after rh10-6.12.0-55.52.1.5.21.vz10
------>
commit d381ce5380dccab97a638f4044671e52533e7888
Author: Konstantin Khorenko <khorenko at virtuozzo.com>
Date:   Wed Apr 22 15:51:55 2026 +0200

    Revert "lib/zlib: use atomic GCOV counters to prevent crash in inflate_fast"
    
    This reverts commit bee6c41d735d71beb080326986df157159520e27.
    
    We will fix the origin issue in another way which has been accepted by
    mainstream.
    
    https://virtuozzo.atlassian.net/browse/VSTOR-127788
    https://virtuozzo.atlassian.net/browse/VSTOR-128012
    
    Signed-off-by: Konstantin Khorenko <khorenko at virtuozzo.com>
---
 lib/zlib_deflate/Makefile | 6 ------
 lib/zlib_dfltcc/Makefile  | 6 ------
 lib/zlib_inflate/Makefile | 7 -------
 3 files changed, 19 deletions(-)

diff --git a/lib/zlib_deflate/Makefile b/lib/zlib_deflate/Makefile
index dc0b3e5660e9e..2622e03c0b942 100644
--- a/lib/zlib_deflate/Makefile
+++ b/lib/zlib_deflate/Makefile
@@ -7,12 +7,6 @@
 # decompression code.
 #
 
-# Force atomic GCOV counter updates to prevent GCC from merging global
-# counters with loop induction variables (see lib/zlib_inflate/Makefile).
-ifdef CONFIG_GCOV_KERNEL
-ccflags-y += -fprofile-update=atomic
-endif
-
 obj-$(CONFIG_ZLIB_DEFLATE) += zlib_deflate.o
 
 zlib_deflate-objs := deflate.o deftree.o deflate_syms.o
diff --git a/lib/zlib_dfltcc/Makefile b/lib/zlib_dfltcc/Makefile
index fb08749d2ee7b..66e1c96387c40 100644
--- a/lib/zlib_dfltcc/Makefile
+++ b/lib/zlib_dfltcc/Makefile
@@ -6,12 +6,6 @@
 # This is the code for s390 zlib hardware support.
 #
 
-# Force atomic GCOV counter updates to prevent GCC from merging global
-# counters with loop induction variables (see lib/zlib_inflate/Makefile).
-ifdef CONFIG_GCOV_KERNEL
-ccflags-y += -fprofile-update=atomic
-endif
-
 obj-$(CONFIG_ZLIB_DFLTCC) += zlib_dfltcc.o
 
 zlib_dfltcc-objs := dfltcc.o dfltcc_deflate.o dfltcc_inflate.o
diff --git a/lib/zlib_inflate/Makefile b/lib/zlib_inflate/Makefile
index 8707c649adda5..27327d3e9f541 100644
--- a/lib/zlib_inflate/Makefile
+++ b/lib/zlib_inflate/Makefile
@@ -14,13 +14,6 @@
 # uncompression can be done without blocking on allocation).
 #
 
-# Force atomic GCOV counter updates to prevent GCC from merging global
-# counters with loop induction variables — concurrent inflate_fast()
-# execution on multiple CPUs causes out-of-bounds writes otherwise.
-ifdef CONFIG_GCOV_KERNEL
-ccflags-y += -fprofile-update=atomic
-endif
-
 obj-$(CONFIG_ZLIB_INFLATE) += zlib_inflate.o
 
 zlib_inflate-objs := inffast.o inflate.o infutil.o \


More information about the Devel mailing list