From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from eggs.gnu.org (eggs.gnu.org [IPv6:2001:470:142:3::10]) by sourceware.org (Postfix) with ESMTPS id 505593858D1E for ; Wed, 17 May 2023 21:02:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 505593858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gnu.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gnu.org Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzOIA-0004UB-Uz; Wed, 17 May 2023 17:02:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=In-Reply-To:MIME-Version:References:Subject:To:From: Date; bh=GsixA7NL1AkacCS10aYh7NX17/Uidtvlyi4Flhtsf9E=; b=OsAxtajnY7asyq1f1cju rLJuCGlPkwBNVyhx61nSLdUUuT88O5VI0w2Fa+jMOXQDE5r2z4YsJnZtCnnIU71jRek54TGihpjkD II/qBH5H2LcfS1TJeJv0EIhds+pt2LdlyWbZpgBY8+/8YGynsA9qa7yjV0gdXZP7fj+/XSLjQ2fKw hk4BhiS3Nz3DrCeoBa10n5Iikq8vNRTg/QEkwjKaO1WpQZZI+cpTe18WvmP9t0nNZt5Q6kwbEC3tg s12rnrgRLZ6r9HFjubjJMazUpLPJslrLK3yRvjJdeWWESaJgmd7amVvTQLTlVMuUfMgbLPyau4TRl Ds2mq5YdZPW3Eg==; Received: from 2a01cb008c251f00de41a9fffe47ec49.ipv6.abo.wanadoo.fr ([2a01:cb00:8c25:1f00:de41:a9ff:fe47:ec49] helo=begin.home) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pzOIA-0003xC-OE; Wed, 17 May 2023 17:02:38 -0400 Received: from samy by begin.home with local (Exim 4.96) (envelope-from ) id 1pzOI9-006Lj5-2A; Wed, 17 May 2023 23:02:37 +0200 Date: Wed, 17 May 2023 23:02:37 +0200 From: Samuel Thibault To: Sergey Bugaev Cc: libc-alpha@sourceware.org, bug-hurd@gnu.org Subject: Re: [PATCH 08/10] hurd: Fix setting up pthreads Message-ID: <20230517210237.ird7rk5hijd2zmef@begin> Mail-Followup-To: Sergey Bugaev , libc-alpha@sourceware.org, bug-hurd@gnu.org References: <20230517191436.73636-1-bugaevc@gmail.com> <20230517191436.73636-9-bugaevc@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20230517191436.73636-9-bugaevc@gmail.com> Organization: I am not organized User-Agent: NeoMutt/20170609 (1.8.3) X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,SPF_HELO_PASS,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Applied, thanks! Sergey Bugaev, le mer. 17 mai 2023 22:14:34 +0300, a ecrit: > On x86_64, we have to pass function arguments in registers, not on the > stack. We also have to align the stack pointer in a specific way. Since > sharing the logic with i386 does not bring much benefit, split the file > back into i386- and x86_64-specific versions, and fix the x86_64 version > to set up the thread properly. > > Bonus: i386 keeps doing the extra RPC inside __thread_set_pcsptp to > fetch the state of the thread before setting it; but x86_64 no lnoger > does that. > > Checked on x86_64-gnu and i686-gnu. > > Fixes be6d002ca277ffc90058d382396150cb0e785b9c > "hurd: Set up the basic tree for x86_64-gnu" > > Signed-off-by: Sergey Bugaev > --- > __thread_set_pcsptp is also used by pthread_cancel (), which suffers > from the same issue. Eventually I'd like to remove __thread_set_pcsptp > entirely. > > .../mach/hurd/{x86 => i386}/htl/pt-setup.c | 2 +- > sysdeps/mach/hurd/x86_64/htl/pt-setup.c | 93 +++++++++++++++++++ > 2 files changed, 94 insertions(+), 1 deletion(-) > rename sysdeps/mach/hurd/{x86 => i386}/htl/pt-setup.c (98%) > create mode 100644 sysdeps/mach/hurd/x86_64/htl/pt-setup.c > > diff --git a/sysdeps/mach/hurd/x86/htl/pt-setup.c b/sysdeps/mach/hurd/i386/htl/pt-setup.c > similarity index 98% > rename from sysdeps/mach/hurd/x86/htl/pt-setup.c > rename to sysdeps/mach/hurd/i386/htl/pt-setup.c > index 686124d7..ba108b96 100644 > --- a/sysdeps/mach/hurd/x86/htl/pt-setup.c > +++ b/sysdeps/mach/hurd/i386/htl/pt-setup.c > @@ -1,4 +1,4 @@ > -/* Setup thread stack. Hurd/x86 version. > +/* Setup thread stack. Hurd/i386 version. > Copyright (C) 2000-2023 Free Software Foundation, Inc. > This file is part of the GNU C Library. > > diff --git a/sysdeps/mach/hurd/x86_64/htl/pt-setup.c b/sysdeps/mach/hurd/x86_64/htl/pt-setup.c > new file mode 100644 > index 00000000..7dc62912 > --- /dev/null > +++ b/sysdeps/mach/hurd/x86_64/htl/pt-setup.c > @@ -0,0 +1,93 @@ > +/* Setup thread stack. Hurd/x86_64 version. > + Copyright (C) 2000-2023 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + . */ > + > +#include > +#include > +#include > +#include > + > +#include > +#include > + > +/* Set up the stack for THREAD. Return the stack pointer > + for the new thread. */ > +static void * > +stack_setup (struct __pthread *thread) > +{ > + error_t err; > + uintptr_t bottom, top; > + > + /* Calculate the top of the new stack. */ > + bottom = (uintptr_t) thread->stackaddr; > + top = bottom + thread->stacksize + round_page (thread->guardsize); > + > + if (thread->guardsize) > + { > + err = __vm_protect (__mach_task_self (), (vm_address_t) bottom, > + thread->guardsize, 0, 0); > + assert_perror (err); > + } > + > + return (void *) PTR_ALIGN_DOWN_8_16 (top); > +} > + > +int > +__pthread_setup (struct __pthread *thread, > + void (*entry_point) (struct __pthread *, void *(*)(void *), > + void *), void *(*start_routine) (void *), > + void *arg) > +{ > + error_t err; > + struct i386_thread_state state; > + struct i386_fsgs_base_state fsgs_state; > + > + if (thread->kernel_thread == hurd_thread_self ()) > + /* Fix up the TCB for the main thread. The C library has already > + installed a TCB, which we want to keep using. This TCB must not > + be freed so don't register it in the thread structure. On the > + other hand, it's not yet possible to reliably release a TCB. > + Leave the unused one registered so that it doesn't leak. */ > + return 0; > + > + > + thread->mcontext.pc = entry_point; > + thread->mcontext.sp = stack_setup (thread); > + > + /* Set up the state to call entry_point (thread, start_routine, arg) */ > + memset (&state, 0, sizeof (state)); > + state.ursp = (uintptr_t) thread->mcontext.sp; > + state.rip = (uintptr_t) thread->mcontext.pc; > + state.rdi = (uintptr_t) thread; > + state.rsi = (uintptr_t) start_routine; > + state.rdx = (uintptr_t) arg; > + > + err = __thread_set_state (thread->kernel_thread, i386_THREAD_STATE, > + (thread_state_t) &state, > + i386_THREAD_STATE_COUNT); > + assert_perror (err); > + > + /* Set fs_base to the TCB pointer for the thread. */ > + memset (&fsgs_state, 0, sizeof (fsgs_state)); > + fsgs_state.fs_base = (uintptr_t) thread->tcb; > + err = __thread_set_state (thread->kernel_thread, i386_FSGS_BASE_STATE, > + (thread_state_t) &fsgs_state, > + i386_FSGS_BASE_STATE_COUNT); > + assert_perror (err); > + > + return 0; > +} > -- > 2.40.1 > > -- Samuel --- Pour une évaluation indépendante, transparente et rigoureuse ! Je soutiens la Commission d'Évaluation de l'Inria.