mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-09 14:50:05 +00:00
nptl: Unconditionally use a 32-byte rseq area
If the kernel headers provide a larger struct rseq, we used that size as the argument to the rseq system call. As a result, rseq registration would fail on older kernels which only accept size 32.
This commit is contained in:
parent
f7f181c12c
commit
2c6b4b272e
18
nptl/descr.h
18
nptl/descr.h
@ -34,7 +34,6 @@
|
||||
#include <bits/types/res_state.h>
|
||||
#include <kernel-features.h>
|
||||
#include <tls-internal-struct.h>
|
||||
#include <sys/rseq.h>
|
||||
#include <internal-sigset.h>
|
||||
|
||||
#ifndef TCB_ALIGNMENT
|
||||
@ -405,14 +404,25 @@ struct pthread
|
||||
/* Used on strsignal. */
|
||||
struct tls_internal_t tls_state;
|
||||
|
||||
/* rseq area registered with the kernel. */
|
||||
struct rseq rseq_area;
|
||||
/* rseq area registered with the kernel. Use a custom definition
|
||||
here to isolate from kernel struct rseq changes. The
|
||||
implementation of sched_getcpu needs acccess to the cpu_id field;
|
||||
the other fields are unused and not included here. */
|
||||
union
|
||||
{
|
||||
struct
|
||||
{
|
||||
uint32_t cpu_id_start;
|
||||
uint32_t cpu_id;
|
||||
};
|
||||
char pad[32]; /* Original rseq area size. */
|
||||
} rseq_area __attribute__ ((aligned (32)));
|
||||
|
||||
/* Amount of end padding, if any, in this structure.
|
||||
This definition relies on rseq_area being last. */
|
||||
#define PTHREAD_STRUCT_END_PADDING \
|
||||
(sizeof (struct pthread) - offsetof (struct pthread, rseq_area) \
|
||||
+ sizeof (struct rseq))
|
||||
+ sizeof ((struct pthread) {}.rseq_area))
|
||||
} __attribute ((aligned (TCB_ALIGNMENT)));
|
||||
|
||||
static inline bool
|
||||
|
Loading…
Reference in New Issue
Block a user