From patchwork Tue Aug 8 11:17:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 73807 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 789D53853D15 for ; Tue, 8 Aug 2023 11:17:55 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from sonata.ens-lyon.org (sonata.ens-lyon.org [140.77.166.138]) by sourceware.org (Postfix) with ESMTPS id 28092385700C for ; Tue, 8 Aug 2023 11:17:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 28092385700C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=bounce.ens-lyon.org Received: from localhost (localhost [127.0.0.1]) by sonata.ens-lyon.org (Postfix) with ESMTP id D19D22010B; Tue, 8 Aug 2023 13:17:12 +0200 (CEST) Received: from sonata.ens-lyon.org ([127.0.0.1]) by localhost (sonata.ens-lyon.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oArPmGs8dxx2; Tue, 8 Aug 2023 13:17:12 +0200 (CEST) Received: from begin.home (lfbn-bor-1-1163-184.w92-158.abo.wanadoo.fr [92.158.138.184]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by sonata.ens-lyon.org (Postfix) with ESMTPSA id 6A08320107; Tue, 8 Aug 2023 13:17:12 +0200 (CEST) Received: from samy by begin.home with local (Exim 4.96) (envelope-from ) id 1qTKi7-008oSI-1q; Tue, 08 Aug 2023 13:17:11 +0200 From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault , commit-hurd@gnu.org Subject: [hurd,commited 2/2] htl: Initialize ___pthread_self early Date: Tue, 8 Aug 2023 13:17:11 +0200 Message-Id: <20230808111711.2100557-3-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230808111711.2100557-1-samuel.thibault@ens-lyon.org> References: <20230808111711.2100557-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" When using jemalloc, malloc() needs to use TSD, while libpthread initialization needs malloc(). Having ___pthread_self set early to some static storage allows TSD to work early, thus allowing jemalloc and libpthread to initialize together. This incidentaly simplifies __pthread_enable/disable_asynccancel and __pthread_self, now that ___pthread_self is always initialized. --- htl/cancellation.c | 8 -------- htl/pt-self.c | 10 +--------- sysdeps/mach/hurd/htl/pt-sysdep.c | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/htl/cancellation.c b/htl/cancellation.c index 9cc61b9f23..5a67083188 100644 --- a/htl/cancellation.c +++ b/htl/cancellation.c @@ -25,10 +25,6 @@ int __pthread_enable_asynccancel (void) struct __pthread *p = _pthread_self (); int oldtype; - if (___pthread_self == NULL) - /* We are not initialized yet, we can't be cancelled anyway. */ - return PTHREAD_CANCEL_DEFERRED; - __pthread_mutex_lock (&p->cancel_lock); oldtype = p->cancel_type; p->cancel_type = PTHREAD_CANCEL_ASYNCHRONOUS; @@ -43,10 +39,6 @@ void __pthread_disable_asynccancel (int oldtype) { struct __pthread *p = _pthread_self (); - if (___pthread_self == NULL) - /* We are not initialized yet, we can't be cancelled anyway. */ - return; - __pthread_mutex_lock (&p->cancel_lock); p->cancel_type = oldtype; __pthread_mutex_unlock (&p->cancel_lock); diff --git a/htl/pt-self.c b/htl/pt-self.c index f7e9cb88c4..1278908397 100644 --- a/htl/pt-self.c +++ b/htl/pt-self.c @@ -24,15 +24,7 @@ pthread_t __pthread_self (void) { - struct __pthread *self; - - if (___pthread_self == NULL) - /* We are not initialized yet, we are the first thread. */ - return 1; - - self = _pthread_self (); - assert (self != NULL); - + struct __pthread *self = _pthread_self (); return self->thread; } diff --git a/sysdeps/mach/hurd/htl/pt-sysdep.c b/sysdeps/mach/hurd/htl/pt-sysdep.c index 55b1a86e00..030a7c7a9e 100644 --- a/sysdeps/mach/hurd/htl/pt-sysdep.c +++ b/sysdeps/mach/hurd/htl/pt-sysdep.c @@ -26,6 +26,10 @@ #include #include +/* Initial thread structure used temporarily during initialization, so various + * functions can already work at least basically. */ +static struct __pthread init_thread; + static void reset_pthread_total (void) { @@ -47,6 +51,10 @@ _init_routine (void *stack) /* Already initialized */ return; + /* Initialize early thread structure. */ + init_thread.thread = 1; + ___pthread_self = &init_thread; + /* Initialize the library. */ ___pthread_init (); @@ -74,6 +82,12 @@ _init_routine (void *stack) __pthread_default_attr.__guardsize = __vm_page_size; #endif + /* Copy over the thread-specific state */ + assert (!init_thread.thread_specifics); + memcpy (&thread->static_thread_specifics, + &init_thread.static_thread_specifics, + sizeof (thread->static_thread_specifics)); + ___pthread_self = thread; /* Decrease the number of threads, to take into account that the