b30ff9539f
Upstream commit: 4bdcc1963bc2b5ba5f8e319e402d9eb2cb6096c1 - manual: make setrlimit() description less ambiguous - manual/stdio: Clarify putc and putwc - malloc: add multi-threaded tests for aligned_alloc/calloc/malloc - malloc: avoid global locks in tst-aligned_alloc-lib.c - resolv: Track single-request fallback via _res._flags (bug 31476) - resolv: Do not wait for non-existing second DNS response after error (bug 30081) - resolv: Allow short error responses to match any query (bug 31890) - elf: Fix localplt.awk for DT_RELR-enabled builds (BZ 31978) - Fix usage of _STACK_GROWS_DOWN and _STACK_GROWS_UP defines [BZ 31989] - Linux: Make __rseq_size useful for feature detection (bug 31965) - elf: Make dl-rseq-symbols Linux only - nptl: fix potential merge of __rseq_* relro symbols - s390x: Fix segfault in wcsncmp [BZ #31934] - stdlib: fix arc4random fallback to /dev/urandom (BZ 31612) - math: Provide missing math symbols on libc.a (BZ 31781) - math: Fix isnanf128 static build (BZ 31774) - math: Fix i386 and m68k exp10 on static build (BZ 31775) - math: Fix i386 and m68k fmod/fmodf on static build (BZ 31488) - posix: Fix pidfd_spawn/pidfd_spawnp leak if execve fails (BZ 31695)
138 lines
5.1 KiB
Diff
138 lines
5.1 KiB
Diff
commit e8f521709731ce3ae8d6f1eca30135d5c0606f02
|
|
Author: Florian Weimer <fweimer@redhat.com>
|
|
Date: Mon Jul 8 21:14:00 2024 +0200
|
|
|
|
Linux: Make __rseq_size useful for feature detection (bug 31965)
|
|
|
|
The __rseq_size value is now the active area of struct rseq
|
|
(so 20 initially), not the full struct size including padding
|
|
at the end (32 initially).
|
|
|
|
Update misc/tst-rseq to print some additional diagnostics.
|
|
|
|
Reviewed-by: Michael Jeanson <mjeanson@efficios.com>
|
|
Reviewed-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
|
|
(cherry picked from commit 2e456ccf0c34a056e3ccafac4a0c7effef14d918)
|
|
|
|
diff --git a/manual/threads.texi b/manual/threads.texi
|
|
index e5544ff3da8733f4..25e99c9606dcad77 100644
|
|
--- a/manual/threads.texi
|
|
+++ b/manual/threads.texi
|
|
@@ -1007,8 +1007,12 @@ This variable is either zero (if restartable sequence registration
|
|
failed or has been disabled) or the size of the restartable sequence
|
|
registration. This can be different from the size of @code{struct rseq}
|
|
if the kernel has extended the size of the registration. If
|
|
-registration is successful, @code{__rseq_size} is at least 32 (the
|
|
-initial size of @code{struct rseq}).
|
|
+registration is successful, @code{__rseq_size} is at least 20 (the
|
|
+initially active size of @code{struct rseq}).
|
|
+
|
|
+Previous versions of @theglibc{} set this to 32 even if the kernel only
|
|
+supported the initial area of 20 bytes because the value included unused
|
|
+padding at the end of the restartable sequence area.
|
|
@end deftypevar
|
|
|
|
@deftypevar {unsigned int} __rseq_flags
|
|
diff --git a/sysdeps/nptl/dl-tls_init_tp.c b/sysdeps/nptl/dl-tls_init_tp.c
|
|
index 7eb35fb13384f6ac..7803e19fd16ad803 100644
|
|
--- a/sysdeps/nptl/dl-tls_init_tp.c
|
|
+++ b/sysdeps/nptl/dl-tls_init_tp.c
|
|
@@ -46,10 +46,6 @@ rtld_mutex_dummy (pthread_mutex_t *lock)
|
|
|
|
const unsigned int __rseq_flags;
|
|
|
|
-/* The variables are in .data.relro but are not yet write-protected. */
|
|
-extern unsigned int _rseq_size attribute_hidden;
|
|
-extern ptrdiff_t _rseq_offset attribute_hidden;
|
|
-
|
|
void
|
|
__tls_pre_init_tp (void)
|
|
{
|
|
@@ -106,9 +102,7 @@ __tls_init_tp (void)
|
|
bool do_rseq = true;
|
|
do_rseq = TUNABLE_GET (rseq, int, NULL);
|
|
if (rseq_register_current_thread (pd, do_rseq))
|
|
- {
|
|
- _rseq_size = sizeof (pd->rseq_area);
|
|
- }
|
|
+ _rseq_size = RSEQ_AREA_SIZE_INITIAL_USED;
|
|
|
|
#ifdef RSEQ_SIG
|
|
/* This should be a compile-time constant, but the current
|
|
diff --git a/sysdeps/unix/sysv/linux/rseq-internal.h b/sysdeps/unix/sysv/linux/rseq-internal.h
|
|
index 48eebc1e168fad1e..7ea935b4adab8c20 100644
|
|
--- a/sysdeps/unix/sysv/linux/rseq-internal.h
|
|
+++ b/sysdeps/unix/sysv/linux/rseq-internal.h
|
|
@@ -25,15 +25,34 @@
|
|
#include <stdio.h>
|
|
#include <sys/rseq.h>
|
|
|
|
+/* 32 is the initially required value for the area size. The
|
|
+ actually used rseq size may be less (20 bytes initially). */
|
|
+#define RSEQ_AREA_SIZE_INITIAL 32
|
|
+#define RSEQ_AREA_SIZE_INITIAL_USED 20
|
|
+
|
|
+/* The variables are in .data.relro but are not yet write-protected. */
|
|
+extern unsigned int _rseq_size attribute_hidden;
|
|
+extern ptrdiff_t _rseq_offset attribute_hidden;
|
|
+
|
|
#ifdef RSEQ_SIG
|
|
static inline bool
|
|
rseq_register_current_thread (struct pthread *self, bool do_rseq)
|
|
{
|
|
if (do_rseq)
|
|
{
|
|
+ unsigned int size;
|
|
+#if IS_IN (rtld)
|
|
+ /* Use the hidden symbol in ld.so. */
|
|
+ size = _rseq_size;
|
|
+#else
|
|
+ size = __rseq_size;
|
|
+#endif
|
|
+ if (size < RSEQ_AREA_SIZE_INITIAL)
|
|
+ /* The initial implementation used only 20 bytes out of 32,
|
|
+ but still expected size 32. */
|
|
+ size = RSEQ_AREA_SIZE_INITIAL;
|
|
int ret = INTERNAL_SYSCALL_CALL (rseq, &self->rseq_area,
|
|
- sizeof (self->rseq_area),
|
|
- 0, RSEQ_SIG);
|
|
+ size, 0, RSEQ_SIG);
|
|
if (!INTERNAL_SYSCALL_ERROR_P (ret))
|
|
return true;
|
|
}
|
|
diff --git a/sysdeps/unix/sysv/linux/tst-rseq.c b/sysdeps/unix/sysv/linux/tst-rseq.c
|
|
index 2c90409ba02182e7..08a95331306b2a12 100644
|
|
--- a/sysdeps/unix/sysv/linux/tst-rseq.c
|
|
+++ b/sysdeps/unix/sysv/linux/tst-rseq.c
|
|
@@ -29,6 +29,7 @@
|
|
# include <stdlib.h>
|
|
# include <string.h>
|
|
# include <syscall.h>
|
|
+# include <sys/auxv.h>
|
|
# include <thread_pointer.h>
|
|
# include <tls.h>
|
|
# include "tst-rseq.h"
|
|
@@ -42,7 +43,8 @@ do_rseq_main_test (void)
|
|
TEST_COMPARE (__rseq_flags, 0);
|
|
TEST_VERIFY ((char *) __thread_pointer () + __rseq_offset
|
|
== (char *) &pd->rseq_area);
|
|
- TEST_COMPARE (__rseq_size, sizeof (pd->rseq_area));
|
|
+ /* The current implementation only supports the initial size. */
|
|
+ TEST_COMPARE (__rseq_size, 20);
|
|
}
|
|
|
|
static void
|
|
@@ -52,6 +54,12 @@ do_rseq_test (void)
|
|
{
|
|
FAIL_UNSUPPORTED ("kernel does not support rseq, skipping test");
|
|
}
|
|
+ printf ("info: __rseq_size: %u\n", __rseq_size);
|
|
+ printf ("info: __rseq_offset: %td\n", __rseq_offset);
|
|
+ printf ("info: __rseq_flags: %u\n", __rseq_flags);
|
|
+ printf ("info: getauxval (AT_RSEQ_FEATURE_SIZE): %ld\n",
|
|
+ getauxval (AT_RSEQ_FEATURE_SIZE));
|
|
+ printf ("info: getauxval (AT_RSEQ_ALIGN): %ld\n", getauxval (AT_RSEQ_ALIGN));
|
|
do_rseq_main_test ();
|
|
}
|
|
#else /* RSEQ_SIG */
|