public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Samuel Thibault <sthibaul@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc] hurd: Fix x86_64 _hurd_tls_fork Date: Wed, 17 May 2023 21:01:13 +0000 (GMT) [thread overview] Message-ID: <20230517210113.58353385696A@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=2f8ecb58a59eb82c43214d000842d99644a662d1 commit 2f8ecb58a59eb82c43214d000842d99644a662d1 Author: Sergey Bugaev <bugaevc@gmail.com> Date: Wed May 17 22:14:33 2023 +0300 hurd: Fix x86_64 _hurd_tls_fork It is illegal to call thread_get_state () on mach_thread_self (), so this codepath cannot be used as-is to fork the calling thread's TLS. Fortunately we can use THREAD_SELF (aka %fs:0x0) to find out the value of our fs_base without calling into the kernel. Fixes: f6cf701efc61c9ad910372bda14b9a235db310a8 "hurd: Implement TLS for x86_64" Checked on x86_64-gnu: fork () now works! Signed-off-by: Sergey Bugaev <bugaevc@gmail.com> Message-Id: <20230517191436.73636-8-bugaevc@gmail.com> Diff: --- sysdeps/mach/hurd/x86_64/tls.h | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/sysdeps/mach/hurd/x86_64/tls.h b/sysdeps/mach/hurd/x86_64/tls.h index 35dcef447e..6487ed3580 100644 --- a/sysdeps/mach/hurd/x86_64/tls.h +++ b/sysdeps/mach/hurd/x86_64/tls.h @@ -140,12 +140,25 @@ _hurd_tls_fork (thread_t child, thread_t orig, error_t err; struct i386_fsgs_base_state state; mach_msg_type_number_t state_count = i386_FSGS_BASE_STATE_COUNT; - err = __thread_get_state (orig, i386_FSGS_BASE_STATE, - (thread_state_t) &state, - &state_count); - if (err) - return err; - assert (state_count == i386_FSGS_BASE_STATE_COUNT); + + extern thread_t hurd_thread_self (void); + if (orig != hurd_thread_self ()) + { + err = __thread_get_state (orig, i386_FSGS_BASE_STATE, + (thread_state_t) &state, + &state_count); + if (err) + return err; + assert (state_count == i386_FSGS_BASE_STATE_COUNT); + } + else + { + /* It is illegal to call thread_get_state () on mach_thread_self (). + But we're only interested in the value of fs_base, and since we're + this thread, we know it points to our TCB. */ + state.fs_base = (unsigned long) THREAD_SELF; + state.gs_base = 0; + } return __thread_set_state (child, i386_FSGS_BASE_STATE, (thread_state_t) &state,
reply other threads:[~2023-05-17 21:01 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20230517210113.58353385696A@sourceware.org \ --to=sthibaul@sourceware.org \ --cc=glibc-cvs@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: linkBe 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).