From patchwork Fri Jun 19 13:43:44 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: 39678 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 C1A523939C24; Fri, 19 Jun 2020 13:44:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C1A523939C24 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1592574249; bh=LVoS/cbUjcTHt5g84ohyoHlN/0VMY4TpJMSijnsUjy0=; 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=ov4jRc6BjEhFbRUK2zA0stxvwZftoO+v5HrSuyDfEjZ3DIQ6SlsSLBMjHmAT9gBpu ykpV2CP2QUz2/8fqTyvDdSCj0479rZYr30LRPeSwPie+82+/0sPhS9TdXpapcbgOvD mX3XeuHO9NEwW5CyaD9ThYjxt4BRRx7iHp/wpERw= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qv1-xf44.google.com (mail-qv1-xf44.google.com [IPv6:2607:f8b0:4864:20::f44]) by sourceware.org (Postfix) with ESMTPS id 269A03870911 for ; Fri, 19 Jun 2020 13:44:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 269A03870911 Received: by mail-qv1-xf44.google.com with SMTP id p15so4437818qvr.9 for ; Fri, 19 Jun 2020 06:44:06 -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:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LVoS/cbUjcTHt5g84ohyoHlN/0VMY4TpJMSijnsUjy0=; b=BWGO2C0yBx3/I18SUX+QWOY5jun0OwG0meLVRok/juyqY6WSjqKlKW2mzba/MxtuFH o3Ek4+b6JXuCHyspq5UxjHIXmN/S/MbU2VLpf1wjFAG+UAXzycGwiScZ+nuVKRJ5VDtH j4tFpXw8vQ6Iy+/MbIgcmAMozsC7sEAa4LAgAGa2yfrbm9kEVEcRj4tENl2POMYQkhY3 vsyJHYHsSju4f+LDZcs4u0RGg9B9gMJgTZTmyfJFosBiQwX9cbjRYtEBqmk37pnS7b1p l0hAi26XhFOtyJbNTPxBzCjpDY5OJC2Y9j3baBga+7f1i9dOeAWUOwpVvJn5JVzk/vQI djsA== X-Gm-Message-State: AOAM530JO4NxVmWOeZmSa2FQHeJwABfFO8o2ou8oeJ+LON2tVZ+pJnr3 LPkf8aFzf1Kt4UxLbNBYutNTAyPoKMc= X-Google-Smtp-Source: ABdhPJzwBQ7ftsm6oSGCBKeZ1Yzmxt8qMixBjY+scjKYg1oUjCedc+8/WfTjCdnENsTunw9hUUsEJw== X-Received: by 2002:a05:6214:1705:: with SMTP id db5mr8758741qvb.14.1592574245074; Fri, 19 Jun 2020 06:44:05 -0700 (PDT) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id p203sm6379435qke.132.2020.06.19.06.44.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Jun 2020 06:44:04 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v5 05/13] string: Remove old TLS usage on strsignal Date: Fri, 19 Jun 2020 10:43:44 -0300 Message-Id: <20200619134352.297146-5-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200619134352.297146-1-adhemerval.zanella@linaro.org> References: <20200619134352.297146-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-14.7 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. Tested-by: Carlos O'Donell Reviewed-by: Carlos O'Donell --- malloc/thread-freeres.c | 2 + nptl/allocatestack.c | 2 + nptl/descr.h | 4 + string/strsignal.c | 112 +++++-------------------- sysdeps/generic/Makefile | 1 + sysdeps/generic/tls-internal-struct.h | 27 ++++++ sysdeps/generic/tls-internal.c | 21 +++++ sysdeps/generic/tls-internal.h | 39 +++++++++ sysdeps/unix/sysv/linux/tls-internal.c | 1 + sysdeps/unix/sysv/linux/tls-internal.h | 37 ++++++++ 10 files changed, 155 insertions(+), 91 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/malloc/thread-freeres.c b/malloc/thread-freeres.c index c71ca4fc33..3408bdbefd 100644 --- a/malloc/thread-freeres.c +++ b/malloc/thread-freeres.c @@ -21,6 +21,7 @@ #include #include #include +#include /* Thread shutdown function. Note that this function must be called for threads during shutdown for correctness reasons. Unlike @@ -32,6 +33,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); + __glibc_tls_internal_free (); /* 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 d16f3d71f8..4ae4b5a986 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 7e3b262c55..701ce20e6e 100644 --- a/string/strsignal.c +++ b/string/strsignal.c @@ -20,106 +20,36 @@ #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; - - /* If we have not yet initialized the buffer do it now. */ - __libc_once (once, init); - - if ( -#ifdef SIGRTMIN - (signum >= SIGRTMIN && signum <= SIGRTMAX) || -#endif - signum < 0 || signum >= NSIG - || (desc = __sys_siglist[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); -} - - -/* 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; -} - + const char *desc = 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); -} + if (signum >= 0 && signum <= NSIG && signum < array_length (__sys_siglist)) + desc = __sys_siglist[signum]; + if (desc != NULL) + return (char *) _(desc); -/* Return the buffer to be used. */ -static char * -getbuffer (void) -{ - char *result; + struct tls_internal_t *tls_internal = __glibc_tls_internal (); + free (tls_internal->strsignal_buf); - if (static_buf != NULL) - result = static_buf; + int r; +#ifdef SIGRTMIN + if (signum >= SIGRTMIN && signum <= SIGRTMAX) + r = __asprintf (&tls_internal->strsignal_buf, _("Real-time signal %d"), + signum - SIGRTMIN); 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); - } - } +#endif + r = __asprintf (&tls_internal->strsignal_buf, _("Unknown signal %d"), + signum); + + if (r == -1) + tls_internal->strsignal_buf = NULL; - return result; + return tls_internal->strsignal_buf; } 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..1f6a117d76 --- /dev/null +++ b/sysdeps/generic/tls-internal.h @@ -0,0 +1,39 @@ +/* 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 +#include + +extern __thread struct tls_internal_t __tls_internal attribute_hidden; + +static inline struct tls_internal_t * +__glibc_tls_internal (void) +{ + return &__tls_internal; +} + +static inline void +__glibc_tls_internal_free (void) +{ + free (__tls_internal.strsignal_buf); +} + +#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..5d712abd4a --- /dev/null +++ b/sysdeps/unix/sysv/linux/tls-internal.h @@ -0,0 +1,37 @@ +/* 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 +#include + +static inline struct tls_internal_t * +__glibc_tls_internal (void) +{ + return &THREAD_SELF->tls_state; +} + +static inline void +__glibc_tls_internal_free (void) +{ + free (THREAD_SELF->tls_state.strsignal_buf); +} + +#endif