From patchwork Tue May 19 18:05:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 39329 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 033113959C51; Tue, 19 May 2020 18:05:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 033113959C51 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1589911539; bh=rrAduBh+CYLUzzDzk3pMx4aFLCs13AGYXZv+FHT8kgQ=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=sED9dWFzKVGmbF4EKfI3drQPqJzZQPVb5AIpPeQ9CePq5unLGqhCkUcyc8/pMTHLd r+gVSuvYr90matxeTLxeKhT1pzNwU9n5k3+FueEqNZgwEqpDmgdun0Onh8mxax8eyN WZGDt5TJ+UM8u/gDmqfrCL6nxxGisw2FoQp8qcUM= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x742.google.com (mail-qk1-x742.google.com [IPv6:2607:f8b0:4864:20::742]) by sourceware.org (Postfix) with ESMTPS id BC0F4386F812 for ; Tue, 19 May 2020 18:05:34 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org BC0F4386F812 Received: by mail-qk1-x742.google.com with SMTP id b6so410431qkh.11 for ; Tue, 19 May 2020 11:05:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rrAduBh+CYLUzzDzk3pMx4aFLCs13AGYXZv+FHT8kgQ=; b=ByIrBhYFq1C6KosfFNZM8T5Fb6F2/Y6w//RFlJ9etqG2ecfdUoz5PcmgV1iW7xNQ6n MS6Hrhp8dVoSlcwjtQrLJTIwiM5b/BL3B9dsQhN2OGTj6IPHu/Q6lpEK4xG+GMjMUYnl c7CtrUY4aEn3UFwOdrh26j75C4EXfeHD6geXjwy+JE7/UwVxikAoLw7YYiJgiuEU2nuP 4KKM+o0K5tmZ1E7BECdGN9jZzq0fwkxAbnopOIlqPz/YZ3Taih2S8lkxYyb/8T1DFKKs z9d1bSfIYAxsKuF3/ediwDILKHrd91iWrG3yuB7NbBGkZbEtbuxvqNLCaq3/8Vf0zhig vphw== X-Gm-Message-State: AOAM532h0nm5HdwwJHXouHwh+2Jz3fGePj05rNWAKosh1eGaJ0PEpVN7 VEmXbZpyekZv3ooh6oNfNZretytKOwM= X-Google-Smtp-Source: ABdhPJxCljeetzG2TmpGM8+hXJmvBnxnBWCq9NH8OqkYwAyX0K/gRhk3mNIcgT8jHgK+uZyAFVn/4Q== X-Received: by 2002:ae9:ea0f:: with SMTP id f15mr634083qkg.435.1589911533479; Tue, 19 May 2020 11:05:33 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id m6sm230091qkc.4.2020.05.19.11.05.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 11:05:33 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH 05/13] string: Remove old TLS usage on strsignal Date: Tue, 19 May 2020 15:05:10 -0300 Message-Id: <20200519180518.318733-6-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200519180518.318733-1-adhemerval.zanella@linaro.org> References: <20200519180518.318733-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-16.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" The per-thread state is refactored two use two strategies: 1. The default one uses a TLS structure, which will be place in the static TLS space (using __thread keyword). 2. Linux allocates on struct pthread and access it through THREAD_* macros. The default strategy has the disadvantage of increasing libc.so static TLS consumption and thus descreasing the possible surplus used in some scenarios (which might be mitigated by BZ#25051 fix). It is used only on Hurd, where accessing the thread point in single thread case is not straightforward (afaiu, Hurd developers could correct me here). The fallback static allocation used for allocation failure is also removed: defining its size is problematic without synchronize with translated messages (to avoid partial translation) and the resulting usage is not thread-safe. Checked on x86-64-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu, and s390x-linux-gnu. --- include/string.h | 1 + malloc/thread-freeres.c | 1 + nptl/allocatestack.c | 2 + nptl/descr.h | 4 + string/strsignal.c | 114 ++++++------------------- sysdeps/generic/Makefile | 1 + sysdeps/generic/tls-internal-struct.h | 27 ++++++ sysdeps/generic/tls-internal.c | 21 +++++ sysdeps/generic/tls-internal.h | 32 +++++++ sysdeps/unix/sysv/linux/tls-internal.c | 1 + sysdeps/unix/sysv/linux/tls-internal.h | 30 +++++++ 11 files changed, 146 insertions(+), 88 deletions(-) create mode 100644 sysdeps/generic/tls-internal-struct.h create mode 100644 sysdeps/generic/tls-internal.c create mode 100644 sysdeps/generic/tls-internal.h create mode 100644 sysdeps/unix/sysv/linux/tls-internal.c create mode 100644 sysdeps/unix/sysv/linux/tls-internal.h diff --git a/include/string.h b/include/string.h index 4d622f1c03..1d7ec08a57 100644 --- a/include/string.h +++ b/include/string.h @@ -52,6 +52,7 @@ extern char *__strerror_r (int __errnum, char *__buf, size_t __buflen); /* Called as part of the thread shutdown sequence. */ void __strerror_thread_freeres (void) attribute_hidden; +void __strsignal_thread_freeres (void) attribute_hidden; /* Get _STRING_ARCH_unaligned. */ #include diff --git a/malloc/thread-freeres.c b/malloc/thread-freeres.c index c71ca4fc33..d42eea770b 100644 --- a/malloc/thread-freeres.c +++ b/malloc/thread-freeres.c @@ -32,6 +32,7 @@ __libc_thread_freeres (void) call_function_static_weak (__rpc_thread_destroy); call_function_static_weak (__res_thread_freeres); call_function_static_weak (__strerror_thread_freeres); + call_function_static_weak (__strsignal_thread_freeres); /* This should come last because it shuts down malloc for this thread and the other shutdown functions might well call free. */ diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c index c94980c21c..b85975e0fa 100644 --- a/nptl/allocatestack.c +++ b/nptl/allocatestack.c @@ -237,6 +237,8 @@ get_cached_stack (size_t *sizep, void **memp) /* No pending event. */ result->nextevent = NULL; + result->tls_state = (struct tls_internal_t) { 0 }; + /* Clear the DTV. */ dtv_t *dtv = GET_DTV (TLS_TPADJ (result)); for (size_t cnt = 0; cnt < dtv[-1].counter; ++cnt) diff --git a/nptl/descr.h b/nptl/descr.h index e1c7db5473..6a509b6725 100644 --- a/nptl/descr.h +++ b/nptl/descr.h @@ -34,6 +34,7 @@ #include #include #include +#include #ifndef TCB_ALIGNMENT # define TCB_ALIGNMENT sizeof (double) @@ -398,6 +399,9 @@ struct pthread /* Indicates whether is a C11 thread created by thrd_creat. */ bool c11; + /* Used on strsignal. */ + struct tls_internal_t tls_state; + /* This member must be last. */ char end_padding[]; diff --git a/string/strsignal.c b/string/strsignal.c index 1551480026..5263302a28 100644 --- a/string/strsignal.c +++ b/string/strsignal.c @@ -20,106 +20,44 @@ #include #include #include -#include - -static __libc_key_t key; - -/* If nonzero the key allocation failed and we should better use a - static buffer than fail. */ -#define BUFFERSIZ 100 -static char local_buf[BUFFERSIZ]; -static char *static_buf; - -/* Destructor for the thread-specific data. */ -static void init (void); -static void free_key_mem (void *mem); -static char *getbuffer (void); - +#include +#include /* Return a string describing the meaning of the signal number SIGNUM. */ char * strsignal (int signum) { - __libc_once_define (static, once); - const char *desc; + const char *desc = NULL; - /* If we have not yet initialized the buffer do it now. */ - __libc_once (once, init); + if (signum >= 0 && signum <= NSIG + && signum < array_length (__sys_siglist_internal)) + desc = __sys_siglist_internal[signum]; - if ( -#ifdef SIGRTMIN - (signum >= SIGRTMIN && signum <= SIGRTMAX) || -#endif - signum < 0 || signum >= NSIG - || (desc = __sys_siglist_internal[signum]) == NULL) - { - char *buffer = getbuffer (); - int len; -#ifdef SIGRTMIN - if (signum >= SIGRTMIN && signum <= SIGRTMAX) - len = __snprintf (buffer, BUFFERSIZ - 1, _("Real-time signal %d"), - signum - SIGRTMIN); - else -#endif - len = __snprintf (buffer, BUFFERSIZ - 1, _("Unknown signal %d"), - signum); - if (len >= BUFFERSIZ) - buffer = NULL; - else - buffer[len] = '\0'; - - return buffer; - } - - return (char *) _(desc); -} + if (desc != NULL) + return (char *) _(desc); + struct tls_internal_t *tls_internal = __glibc_tls_internal (); + free (tls_internal->strsignal_buf); -/* Initialize buffer. */ -static void -init (void) -{ - if (__libc_key_create (&key, free_key_mem)) - /* Creating the key failed. This means something really went - wrong. In any case use a static buffer which is better than - nothing. */ - static_buf = local_buf; -} + int r; +#ifdef SIGRTMIN + if (signum >= SIGRTMIN && signum <= SIGRTMAX) + r = __asprintf (&tls_internal->strsignal_buf, _("Real-time signal %d"), + signum - SIGRTMIN); + else +#endif + r = __asprintf (&tls_internal->strsignal_buf, _("Unknown signal %d"), + signum); + if (r == -1) + tls_internal->strsignal_buf = NULL; -/* Free the thread specific data, this is done if a thread terminates. */ -static void -free_key_mem (void *mem) -{ - free (mem); - __libc_setspecific (key, NULL); + return tls_internal->strsignal_buf; } - -/* Return the buffer to be used. */ -static char * -getbuffer (void) +void +__strsignal_thread_freeres (void) { - char *result; - - if (static_buf != NULL) - result = static_buf; - else - { - /* We don't use the static buffer and so we have a key. Use it - to get the thread-specific buffer. */ - result = __libc_getspecific (key); - if (result == NULL) - { - /* No buffer allocated so far. */ - result = malloc (BUFFERSIZ); - if (result == NULL) - /* No more memory available. We use the static buffer. */ - result = local_buf; - else - __libc_setspecific (key, result); - } - } - - return result; + free (__glibc_tls_internal()->strsignal_buf); } +text_set_element (__libc_subfreeres, __strsignal_thread_freeres); diff --git a/sysdeps/generic/Makefile b/sysdeps/generic/Makefile index bd4f9425ca..1240d99436 100644 --- a/sysdeps/generic/Makefile +++ b/sysdeps/generic/Makefile @@ -16,6 +16,7 @@ # . ifeq ($(subdir),string) +sysdep_routines += tls-internal CFLAGS-wordcopy.c += -Wno-uninitialized endif diff --git a/sysdeps/generic/tls-internal-struct.h b/sysdeps/generic/tls-internal-struct.h new file mode 100644 index 0000000000..33a9079ee9 --- /dev/null +++ b/sysdeps/generic/tls-internal-struct.h @@ -0,0 +1,27 @@ +/* Per-thread state. Generic version. + Copyright (C) 2020 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 + . */ + +#ifndef _TLS_INTERNAL_STRUCT_H +#define _TLS_INTERNAL_STRUCT_H 1 + +struct tls_internal_t +{ + char *strsignal_buf; +}; + +#endif diff --git a/sysdeps/generic/tls-internal.c b/sysdeps/generic/tls-internal.c new file mode 100644 index 0000000000..14b914e5f3 --- /dev/null +++ b/sysdeps/generic/tls-internal.c @@ -0,0 +1,21 @@ +/* Per-thread state. Generic version. + Copyright (C) 2020 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 + +__thread struct tls_internal_t __tls_internal; diff --git a/sysdeps/generic/tls-internal.h b/sysdeps/generic/tls-internal.h new file mode 100644 index 0000000000..cd32da188f --- /dev/null +++ b/sysdeps/generic/tls-internal.h @@ -0,0 +1,32 @@ +/* Per-thread state. Generic version. + Copyright (C) 2020 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 + . */ + +#ifndef _TLS_INTERNAL_H +#define _TLS_INTERNAL_H 1 + +#include + +extern __thread struct tls_internal_t __tls_internal attribute_hidden; + +static inline struct tls_internal_t * +__glibc_tls_internal (void) +{ + return &__tls_internal; +} + +#endif diff --git a/sysdeps/unix/sysv/linux/tls-internal.c b/sysdeps/unix/sysv/linux/tls-internal.c new file mode 100644 index 0000000000..6e25b021ab --- /dev/null +++ b/sysdeps/unix/sysv/linux/tls-internal.c @@ -0,0 +1 @@ +/* Empty. */ diff --git a/sysdeps/unix/sysv/linux/tls-internal.h b/sysdeps/unix/sysv/linux/tls-internal.h new file mode 100644 index 0000000000..f1d3161e08 --- /dev/null +++ b/sysdeps/unix/sysv/linux/tls-internal.h @@ -0,0 +1,30 @@ +/* Per-thread state. Linux version. + Copyright (C) 2020 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 + . */ + +#ifndef _TLS_INTERNAL_H +#define _TLS_INTERNAL_H 1 + +#include + +static inline struct tls_internal_t * +__glibc_tls_internal (void) +{ + return &THREAD_SELF->tls_state; +} + +#endif