From: Samuel Thibault <samuel.thibault@gnu.org>
To: Sergey Bugaev <bugaevc@gmail.com>
Cc: libc-alpha@sourceware.org, bug-hurd@gnu.org
Subject: Re: [RFC PATCH glibc 05/34] hurd: Remove __hurd_threadvar_stack_{offset,mask}
Date: Mon, 3 Apr 2023 00:53:31 +0200 [thread overview]
Message-ID: <20230402225331.rebb4f25cl45f7ug@begin> (raw)
In-Reply-To: <20230319151017.531737-6-bugaevc@gmail.com>
Applied, thanks!
Sergey Bugaev, le dim. 19 mars 2023 18:09:48 +0300, a ecrit:
> Noone is or should be using __hurd_threadvar_stack_{offset,mask}, we
> have proper TLS now. These two remaining variables are never set to
> anything other than zero, so any code that would try to use them as
> described would just dereference a zero pointer and crash. So remove
> them entirely.
>
> Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
> ---
> hurd/Versions | 5 -----
> hurd/hurd/threadvar.h | 15 ---------------
> sysdeps/mach/hurd/Versions | 3 ---
> sysdeps/mach/hurd/_Fork.c | 20 ++------------------
> sysdeps/mach/hurd/i386/libc.abilist | 2 --
> sysdeps/mach/hurd/x86/init-first.c | 3 ---
> 6 files changed, 2 insertions(+), 46 deletions(-)
>
> diff --git a/hurd/Versions b/hurd/Versions
> index 7e4f1c56..3d8b412d 100644
> --- a/hurd/Versions
> +++ b/hurd/Versions
> @@ -1,8 +1,5 @@
> libc {
> GLIBC_2.0 {
> - # variables used in macros & inline functions
> - __hurd_threadvar_stack_mask; __hurd_threadvar_stack_offset;
> -
> # functions used in libmachuser and libhurduser
> _S_catch_exception_raise;
> _S_catch_exception_raise_state;
> @@ -129,8 +126,6 @@ libc {
> _hurd_fd_error_signal; _hurd_fd_error;
> __hurd_dfail; __hurd_sockfail;
> _hurd_port_locked_set;
> - __hurd_threadvar_location_from_sp;
> - __hurd_threadvar_location;
> _hurd_userlink_link; _hurd_userlink_unlink; _hurd_userlink_clear;
> }
> GLIBC_2.29 {
> diff --git a/hurd/hurd/threadvar.h b/hurd/hurd/threadvar.h
> index 2a94f4de..f5c6a278 100644
> --- a/hurd/hurd/threadvar.h
> +++ b/hurd/hurd/threadvar.h
> @@ -22,21 +22,6 @@
> #include <features.h>
> #include <tls.h>
>
> -/* The per-thread variables are found by ANDing this mask
> - with the value of the stack pointer and then adding this offset.
> -
> - In the multi-threaded case, cthreads initialization sets
> - __hurd_threadvar_stack_mask to ~(cthread_stack_size - 1), a mask which
> - finds the base of the fixed-size cthreads stack; and
> - __hurd_threadvar_stack_offset to a small offset that skips the data
> - cthreads itself maintains at the base of each thread's stack.
> -
> - In the single-threaded or libpthread case, __hurd_threadvar_stack_mask is
> - zero, so the stack pointer is ignored. */
> -
> -extern unsigned long int __hurd_threadvar_stack_mask;
> -extern unsigned long int __hurd_threadvar_stack_offset;
> -
> /* The variables __hurd_sigthread_stack_base and
> __hurd_sigthread_stack_end define the bounds of the stack used by the
> signal thread, so that thread can always be specifically identified. */
> diff --git a/sysdeps/mach/hurd/Versions b/sysdeps/mach/hurd/Versions
> index d75e674b..bf2e870a 100644
> --- a/sysdeps/mach/hurd/Versions
> +++ b/sysdeps/mach/hurd/Versions
> @@ -33,9 +33,6 @@ libc {
>
> ld {
> GLIBC_2.0 {
> - # variables that must be shared with libc
> - __hurd_threadvar_stack_mask; __hurd_threadvar_stack_offset;
> -
> # functions that must be shared with libc
> __close; __getpid;
> __mmap; __open; __read; __sbrk; __strtoul_internal;
> diff --git a/sysdeps/mach/hurd/_Fork.c b/sysdeps/mach/hurd/_Fork.c
> index 4984cecd..77cd2917 100644
> --- a/sysdeps/mach/hurd/_Fork.c
> +++ b/sysdeps/mach/hurd/_Fork.c
> @@ -482,25 +482,9 @@ retry:
> (natural_t *) &state, &statecount))
> LOSE;
> #ifdef STACK_GROWTH_UP
> - if (__hurd_sigthread_stack_base == 0)
> - {
> - state.SP &= __hurd_threadvar_stack_mask;
> - state.SP += __hurd_threadvar_stack_offset;
> - }
> - else
> - state.SP = __hurd_sigthread_stack_base;
> + state.SP = __hurd_sigthread_stack_base;
> #else
> - if (__hurd_sigthread_stack_end == 0)
> - {
> - /* The signal thread has a stack assigned by pthread.
> - The threadvar_stack variables conveniently tell us how
> - to get to the highest address in the stack, just below
> - the per-thread variables. */
> - state.SP &= __hurd_threadvar_stack_mask;
> - state.SP += __hurd_threadvar_stack_offset;
> - }
> - else
> - state.SP = __hurd_sigthread_stack_end;
> + state.SP = __hurd_sigthread_stack_end;
> #endif
> MACHINE_THREAD_STATE_SET_PC (&state,
> (unsigned long int) _hurd_msgport_receive);
> diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
> index ed0c4789..da1cad67 100644
> --- a/sysdeps/mach/hurd/i386/libc.abilist
> +++ b/sysdeps/mach/hurd/i386/libc.abilist
> @@ -279,8 +279,6 @@ GLIBC_2.2.6 __gettimeofday F
> GLIBC_2.2.6 __gmtime_r F
> GLIBC_2.2.6 __h_errno_location F
> GLIBC_2.2.6 __hurd_fail F
> -GLIBC_2.2.6 __hurd_threadvar_stack_mask D 0x4
> -GLIBC_2.2.6 __hurd_threadvar_stack_offset D 0x4
> GLIBC_2.2.6 __isalnum_l F
> GLIBC_2.2.6 __isalpha_l F
> GLIBC_2.2.6 __isascii_l F
> diff --git a/sysdeps/mach/hurd/x86/init-first.c b/sysdeps/mach/hurd/x86/init-first.c
> index 75a5c842..6ca27155 100644
> --- a/sysdeps/mach/hurd/x86/init-first.c
> +++ b/sysdeps/mach/hurd/x86/init-first.c
> @@ -34,9 +34,6 @@
> extern void __mach_init (void);
> extern void __init_misc (int, char **, char **);
>
> -unsigned long int __hurd_threadvar_stack_offset;
> -unsigned long int __hurd_threadvar_stack_mask;
> -
> extern int __libc_argc attribute_hidden;
> extern char **__libc_argv attribute_hidden;
> extern char **_dl_argv;
> --
> 2.39.2
>
--
Samuel
---
Pour une évaluation indépendante, transparente et rigoureuse !
Je soutiens la Commission d'Évaluation de l'Inria.
next prev parent reply other threads:[~2023-04-02 22:53 UTC|newest]
Thread overview: 140+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-19 15:09 [RFC PATCH 00/34] The rest of the x86_64-gnu port Sergey Bugaev
2023-03-19 15:09 ` [RFC PATCH gnumach 01/34] Add i386_fsgs_base_state Sergey Bugaev
2023-04-02 22:43 ` Samuel Thibault
2023-03-19 15:09 ` [RFC PATCH gnumach 02/34] Remove bootstrap.defs Sergey Bugaev
2023-04-02 22:43 ` Samuel Thibault
2023-04-03 9:39 ` Sergey Bugaev
2023-03-19 15:09 ` [RFC PATCH gnumach 03/34] Make exception subcode a long Sergey Bugaev
2023-04-02 22:45 ` Samuel Thibault
2023-04-03 9:32 ` Sergey Bugaev
2023-04-06 2:11 ` Flávio Cruz
2023-04-10 23:52 ` Samuel Thibault
2023-03-19 15:09 ` [RFC PATCH glibc 04/34] hurd: " Sergey Bugaev
2023-04-02 22:52 ` Samuel Thibault
2023-03-19 15:09 ` [RFC PATCH glibc 05/34] hurd: Remove __hurd_threadvar_stack_{offset,mask} Sergey Bugaev
2023-04-02 22:53 ` Samuel Thibault [this message]
2023-03-19 15:09 ` [RFC PATCH glibc 06/34] hurd: Swap around two function calls Sergey Bugaev
2023-04-02 22:54 ` Samuel Thibault
2023-03-19 15:09 ` [RFC PATCH glibc 07/34] hurd: Fix file name in #error Sergey Bugaev
2023-04-02 22:55 ` Samuel Thibault
2023-03-19 15:09 ` [RFC PATCH glibc 08/34] hurd: Disable O_TRUNC and FS_RETRY_MAGICAL in rtld Sergey Bugaev
2023-04-02 22:57 ` Samuel Thibault
2023-03-19 15:09 ` [RFC PATCH glibc 09/34] hurd: Fix _hurd_setup_sighandler () signature Sergey Bugaev
2023-04-02 22:58 ` Samuel Thibault
2023-03-19 15:09 ` [RFC PATCH glibc 10/34] stdio-common: Fix building when !IS_IN (libc) Sergey Bugaev
2023-04-02 23:01 ` Samuel Thibault
2023-03-19 15:09 ` [RFC PATCH glibc 11/34] mach, hurd: Drop __libc_lock_self0 Sergey Bugaev
2023-04-02 23:02 ` Samuel Thibault
2023-03-19 15:09 ` [RFC PATCH glibc 12/34] hurd: More 64-bit integer casting fixes Sergey Bugaev
2023-04-02 23:03 ` Samuel Thibault
2023-03-19 15:09 ` [RFC PATCH glibc 13/34] x86-64: Disable prefer_map_32bit_exec tunable on non-Linux Sergey Bugaev
2023-04-02 23:09 ` Samuel Thibault
2023-04-03 10:10 ` Sergey Bugaev
2023-04-03 19:02 ` H.J. Lu
2023-04-03 20:11 ` Sergey Bugaev
2023-03-19 15:09 ` [RFC PATCH glibc 14/34] hurd: Move rtld-strncpy-c.c out of mach/hurd/ Sergey Bugaev
2023-04-02 23:10 ` Samuel Thibault
2023-03-19 15:09 ` [RFC PATCH glibc 15/34] hurd: Use uintptr_t for register values in trampoline.c Sergey Bugaev
2023-04-02 23:13 ` Samuel Thibault
2023-03-19 15:09 ` [RFC PATCH glibc 16/34] hurd: Add sys/ucontext.h and sigcontext.h for x86_64 Sergey Bugaev
2023-04-10 18:39 ` Samuel Thibault
2023-04-10 19:07 ` Sergey Bugaev
2023-04-10 19:21 ` Samuel Thibault
2023-04-10 18:58 ` Samuel Thibault
2023-04-10 19:13 ` Sergey Bugaev
2023-04-10 19:21 ` Samuel Thibault
2023-04-10 21:50 ` Sergey Bugaev
2023-04-10 22:23 ` Samuel Thibault
2023-03-19 15:10 ` [RFC PATCH glibc 17/34] hurd: Implement x86_64/intr-msg.h Sergey Bugaev
2023-04-10 18:41 ` Samuel Thibault
2023-03-19 15:10 ` [RFC PATCH glibc 18/34] hurd: Port trampoline.c to x86_64 Sergey Bugaev
2023-04-03 11:56 ` [PATCH v2 18.0/34] Alignment-respecting x86_64 trampoline.c Sergey Bugaev
2023-04-03 11:56 ` [PATCH v2 18.1/34] hurd: Do not declare local variables volatile Sergey Bugaev
2023-04-10 18:42 ` Samuel Thibault
2023-04-03 11:56 ` [PATCH v2 18.2/34] hurd: Port trampoline.c to x86_64 Sergey Bugaev
2023-04-10 19:04 ` Samuel Thibault
2023-04-10 21:33 ` Sergey Bugaev
2023-03-19 15:10 ` [RFC PATCH glibc 19/34] hurd: Move a couple of singal-related files to x86 Sergey Bugaev
2023-04-02 23:15 ` Samuel Thibault
2023-03-19 15:10 ` [RFC PATCH glibc 20/34] htl: Add tcb-offsets.sym for x86_64 Sergey Bugaev
2023-04-02 23:16 ` Samuel Thibault
2023-03-19 15:10 ` [RFC PATCH glibc 21/34] x86_64: Add rtld-stpncpy & rtld-strncpy Sergey Bugaev
2023-04-02 23:18 ` Samuel Thibault
2023-03-19 15:10 ` [RFC PATCH glibc 22/34] htl: Implement thread_set_pcsptp for x86_64 Sergey Bugaev
2023-04-02 23:19 ` Samuel Thibault
2023-03-19 15:10 ` [RFC PATCH glibc 23/34] elf: Stop including tls.h in ldsodefs.h Sergey Bugaev
2023-04-02 23:20 ` Samuel Thibault
2023-04-03 9:26 ` Sergey Bugaev
2023-04-10 21:26 ` Samuel Thibault
2023-03-19 15:10 ` [RFC PATCH glibc 24/34] hurd: Only check for TLS initialization inside rtld or in static builds Sergey Bugaev
2023-04-10 21:33 ` Samuel Thibault
2023-04-11 18:57 ` Samuel Thibault
2023-04-11 19:18 ` Samuel Thibault
2023-04-11 20:03 ` Samuel Thibault
2023-04-11 20:27 ` Sergey Bugaev
2023-04-11 21:23 ` Samuel Thibault
2023-04-12 8:36 ` Sergey Bugaev
2023-04-12 9:00 ` Samuel Thibault
2023-04-12 10:42 ` Sergey Bugaev
2023-04-12 10:45 ` Samuel Thibault
2023-04-12 17:18 ` Sergey Bugaev
2023-04-12 23:46 ` Samuel Thibault
2023-04-13 10:02 ` Sergey Bugaev
2023-04-13 10:10 ` Samuel Thibault
2023-04-13 12:17 ` Sergey Bugaev
2023-04-13 21:47 ` Samuel Thibault
2023-04-13 22:21 ` Samuel Thibault
2023-04-14 8:29 ` Sergey Bugaev
2023-04-14 8:36 ` Samuel Thibault
2023-04-14 8:53 ` Sergey Bugaev
2023-04-14 9:09 ` Samuel Thibault
2023-04-14 9:23 ` Sergey Bugaev
2023-04-14 9:31 ` Samuel Thibault
2023-04-17 7:16 ` Samuel Thibault
2023-04-14 17:34 ` Samuel Thibault
2023-04-14 19:52 ` Sergey Bugaev
2023-03-19 15:10 ` [RFC PATCH glibc 25/34] hurd: Improve reply port handling when exiting signal handlers Sergey Bugaev
2023-04-10 22:03 ` Samuel Thibault
2023-04-11 7:44 ` Sergey Bugaev
2023-04-11 20:15 ` Samuel Thibault
2023-04-11 20:35 ` Sergey Bugaev
2023-04-12 22:54 ` Samuel Thibault
2023-03-19 15:10 ` [RFC PATCH glibc 26/34] hurd: Remove __hurd_local_reply_port Sergey Bugaev
2023-04-10 22:07 ` Samuel Thibault
2023-04-10 22:35 ` Samuel Thibault
2023-04-11 8:00 ` Sergey Bugaev
2023-04-11 20:18 ` Samuel Thibault
2023-04-13 11:58 ` [RFC PATCH glibc v2 " Sergey Bugaev
2023-04-13 13:12 ` Samuel Thibault
2023-04-13 13:20 ` Sergey Bugaev
2023-04-13 21:28 ` Samuel Thibault
2023-04-14 17:33 ` Samuel Thibault
2023-04-14 20:29 ` Sergey Bugaev
2023-04-15 6:45 ` Samuel Thibault
2023-04-15 7:34 ` Sergey Bugaev
2023-04-15 7:42 ` Samuel Thibault
2023-03-19 15:10 ` [RFC PATCH glibc 27/34] hurd: Don't leak __hurd_reply_port0 Sergey Bugaev
2023-04-10 22:25 ` Samuel Thibault
2023-03-19 15:10 ` [RFC PATCH glibc 28/34] hurd: Implement _hurd_longjmp_thread_state for x86_64 Sergey Bugaev
2023-04-02 23:23 ` Samuel Thibault
2023-03-19 15:10 ` [RFC PATCH glibc 29/34] hurd: Add vm_param.h " Sergey Bugaev
2023-04-02 23:24 ` Samuel Thibault
2023-03-19 15:10 ` [RFC PATCH glibc 30/34] hurd: Implement longjmp " Sergey Bugaev
2023-03-19 15:10 ` [RFC PATCH glibc 31/34] hurd: Microoptimize _hurd_self_sigstate () Sergey Bugaev
2023-04-02 23:26 ` Samuel Thibault
2023-03-19 15:10 ` [RFC PATCH glibc 32/34] hurd: Implement sigreturn for x86_64 Sergey Bugaev
2023-04-03 11:47 ` [PATCH v2] " Sergey Bugaev
2023-03-19 15:10 ` [RFC PATCH glibc 33/34] hurd: Create abilist files for lib{mach,hurd}user Sergey Bugaev
2023-03-19 15:19 ` Samuel Thibault
2023-03-19 15:39 ` Sergey Bugaev
2023-03-19 15:43 ` Samuel Thibault
2023-03-19 15:10 ` [RFC PATCH glibc 34/34] hurd: Add expected abilist files for x86_64 Sergey Bugaev
2023-03-19 18:04 ` Florian Weimer
2023-03-19 20:14 ` [PATCH v2] " Sergey Bugaev
2023-03-20 6:30 ` Florian Weimer
2023-03-19 16:44 ` [RFC PATCH 00/34] The rest of the x86_64-gnu port Luca
2023-03-20 5:03 ` Flávio Cruz
2023-04-02 23:30 ` Samuel Thibault
2023-04-10 19:20 ` Samuel Thibault
2023-04-10 21:24 ` Sergey Bugaev
2023-04-10 21:27 ` Samuel Thibault
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=20230402225331.rebb4f25cl45f7ug@begin \
--to=samuel.thibault@gnu.org \
--cc=bug-hurd@gnu.org \
--cc=bugaevc@gmail.com \
--cc=libc-alpha@sourceware.org \
/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).