From: Florian Weimer <fweimer@redhat.com>
To: libc-alpha@sourceware.org
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Subject: [PATCH] nptl: Unconditionally use a 32-byte rseq area
Date: Thu, 20 Jul 2023 12:39:45 +0200 [thread overview]
Message-ID: <87tttyooi6.fsf@oldenburg.str.redhat.com> (raw)
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.
Tested on x86_64-linux-gnu. Built with build-many-glibcs.py.
This needs to be backported all the way to glibc 2.35.
---
nptl/descr.h | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/nptl/descr.h b/nptl/descr.h
index d06abd6ad9..abc9282ef7 100644
--- a/nptl/descr.h
+++ b/nptl/descr.h
@@ -405,8 +405,19 @@ 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. */
base-commit: 3edc4ff2ceff4a59587ebecb94148d3bcfa1df62
next reply other threads:[~2023-07-20 10:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-20 10:39 Florian Weimer [this message]
2023-07-20 10:40 ` Florian Weimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87tttyooi6.fsf@oldenburg.str.redhat.com \
--to=fweimer@redhat.com \
--cc=libc-alpha@sourceware.org \
--cc=mathieu.desnoyers@efficios.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).