Update to 2.2.4 (#1883742)
This commit is contained in:
Ryan O'Hara
parent
08daf60b2a
commit
8559f921b0
@ -1,98 +0,0 @@
|
||||
From 10c627ab2ebeb0a38ae8df477a5f2d870ad77f7c Mon Sep 17 00:00:00 2001
|
||||
From: Willy Tarreau <w@1wt.eu>
|
||||
Date: Wed, 9 Sep 2020 17:07:54 +0200
|
||||
Subject: [PATCH 1/2] BUILD: threads: better workaround for late loading of
|
||||
libgcc_s
|
||||
|
||||
Commit 77b98220e ("BUG/MINOR: threads: work around a libgcc_s issue with
|
||||
chrooting") tried to address an issue with libgcc_s being loaded too late.
|
||||
But it turns out that the symbol used there isn't present on armhf, thus
|
||||
it breaks the build.
|
||||
|
||||
Given that the issue manifests itself during pthread_exit(), the safest
|
||||
and most portable way to test this is to call pthread_exit(). For this
|
||||
we create a dummy thread which exits, during the early boot. This results
|
||||
in the relevant library to be loaded if needed, making sure that a later
|
||||
call to pthread_exit() will still work. It was tested to work fine under
|
||||
linux on the following platforms:
|
||||
|
||||
glibc:
|
||||
- armhf
|
||||
- aarch64
|
||||
- x86_64
|
||||
- sparc64
|
||||
- ppc64le
|
||||
|
||||
musl:
|
||||
- mipsel
|
||||
|
||||
Just running the code under strace easily shows the call in the dummy
|
||||
thread, for example here on armhf:
|
||||
|
||||
$ strace -fe trace=file ./haproxy -v 2>&1 | grep gcc_s
|
||||
[pid 23055] open("/lib/libgcc_s.so.1", O_RDONLY|O_CLOEXEC) = 3
|
||||
|
||||
The code was isolated so that it's easy to #ifdef it out if needed.
|
||||
This should be backported where the patch above is backported (likely
|
||||
2.0).
|
||||
|
||||
(cherry picked from commit f734ebfac4c406f245347527bd0e5831a251cc61)
|
||||
Signed-off-by: Willy Tarreau <w@1wt.eu>
|
||||
---
|
||||
src/thread.c | 33 ++++++++++++++++++++++-----------
|
||||
1 file changed, 22 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/src/thread.c b/src/thread.c
|
||||
index 5eb68e33a..eeb0e04f4 100644
|
||||
--- a/src/thread.c
|
||||
+++ b/src/thread.c
|
||||
@@ -189,6 +189,27 @@ static int thread_cpus_enabled()
|
||||
return ret;
|
||||
}
|
||||
|
||||
+/* Depending on the platform and how libpthread was built, pthread_exit() may
|
||||
+ * involve some code in libgcc_s that would be loaded on exit for the first
|
||||
+ * time, causing aborts if the process is chrooted. It's harmless bit very
|
||||
+ * dirty. There isn't much we can do to make sure libgcc_s is loaded only if
|
||||
+ * needed, so what we do here is that during early boot we create a dummy
|
||||
+ * thread that immediately exits. This will lead to libgcc_s being loaded
|
||||
+ * during boot on the platforms where it's required.
|
||||
+ */
|
||||
+static void *dummy_thread_function(void *data)
|
||||
+{
|
||||
+ pthread_exit(NULL);
|
||||
+ return NULL;
|
||||
+}
|
||||
+
|
||||
+static inline void preload_libgcc_s(void)
|
||||
+{
|
||||
+ pthread_t dummy_thread;
|
||||
+ pthread_create(&dummy_thread, NULL, dummy_thread_function, NULL);
|
||||
+ pthread_join(dummy_thread, NULL);
|
||||
+}
|
||||
+
|
||||
__attribute__((constructor))
|
||||
static void __thread_init(void)
|
||||
{
|
||||
@@ -201,17 +222,7 @@ static void __thread_init(void)
|
||||
exit(1);
|
||||
}
|
||||
|
||||
-#if defined(__GNUC__) && (__GNUC__ >= 3) && defined(__GNU_LIBRARY__) && !defined(__clang__)
|
||||
- /* make sure libgcc_s is already loaded, because pthread_exit() may
|
||||
- * may need it on exit after the chroot! _Unwind_Find_FDE() is defined
|
||||
- * there since gcc 3.0, has no side effect, doesn't take any argument
|
||||
- * and seems to be present on all supported platforms.
|
||||
- */
|
||||
- {
|
||||
- extern void _Unwind_Find_FDE(void);
|
||||
- _Unwind_Find_FDE();
|
||||
- }
|
||||
-#endif
|
||||
+ preload_libgcc_s();
|
||||
|
||||
thread_cpus_enabled_at_boot = thread_cpus_enabled();
|
||||
|
||||
--
|
||||
2.26.2
|
||||
|
||||
10
haproxy.spec
10
haproxy.spec
@ -7,8 +7,8 @@
|
||||
%global _hardened_build 1
|
||||
|
||||
Name: haproxy
|
||||
Version: 2.2.3
|
||||
Release: 2%{?dist}
|
||||
Version: 2.2.4
|
||||
Release: 1%{?dist}
|
||||
Summary: HAProxy reverse proxy for high availability environments
|
||||
|
||||
License: GPLv2+
|
||||
@ -21,8 +21,6 @@ Source3: %{name}.logrotate
|
||||
Source4: %{name}.sysconfig
|
||||
Source5: halog.1
|
||||
|
||||
Patch0: 0001-BUILD-threads-workaround-for-late-loading-of-libgcc_s.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: lua-devel
|
||||
BuildRequires: pcre2-devel
|
||||
@ -50,7 +48,6 @@ availability environments. Indeed, it can:
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
regparm_opts=
|
||||
@ -135,6 +132,9 @@ exit 0
|
||||
%{_mandir}/man1/*
|
||||
|
||||
%changelog
|
||||
* Thu Oct 01 2020 Ryan O'Hara <rohara@redhat.com> - 2.2.4-1
|
||||
- Update to 2.2.4 (#1883742)
|
||||
|
||||
* Thu Sep 17 2020 Ryan O'Hara <rohara@redhat.com> - 2.2.3-2
|
||||
- Fix build for late loading of libgcc_s
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (haproxy-2.2.3.tar.gz) = db99a5069537b6a3f161ad0a32ed884e81e27ed471d7c5f74b0655580c3eb1248376c5b252a9b998bead4fc5c05f28fda9e2280b8b05447bc5bc2d3c8fb55825
|
||||
SHA512 (haproxy-2.2.4.tar.gz) = 762b51fdb9609654155ea2feebeb640bdd817481f633f012d767e1481bf888b90790455f0305ea9bbd0aec8363561d183bd510029f1bcce95102328ffbaf8afd
|
||||
|
||||
Loading…
Reference in New Issue
Block a user