From patchwork Mon May 10 12:38:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 43302 X-Patchwork-Delegate: azanella@linux.vnet.ibm.com 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 7396A396C823; Mon, 10 May 2021 12:37:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7396A396C823 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1620650262; bh=EJjAKptOzyxy9Y8bXO+cV0xBDkK/e9Xsp6tmUZXZiVk=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=UE1D0Pf+GAf0Z7Bny700FGFP0EusyZU+Q3fpu8UpEs4uzYpCBAYQAEZ4x02kcQaq8 uILt1SU47SRxo6P3z5RLARzPCsabCnljpVMEQSpUwh0Ds+mx7JkF/hNuAv47RGzEMJ hK602GfGpABNhqh45XlE9EexwUmMY1qwEKXoEYnw= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 8F897395B823 for ; Mon, 10 May 2021 12:37:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 8F897395B823 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-574-x9iO9zq4O2-xETX3t7cyRw-1; Mon, 10 May 2021 08:37:37 -0400 X-MC-Unique: x9iO9zq4O2-xETX3t7cyRw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4E72F1008062 for ; Mon, 10 May 2021 12:37:36 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-112-137.ams2.redhat.com [10.36.112.137]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5CD6662953 for ; Mon, 10 May 2021 12:37:35 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 6/8] nptl: Move __free_tcb into libc In-Reply-To: References: X-From-Line: e9dac941bf0e9090e5495efcb428140e0799860b Mon Sep 17 00:00:00 2001 Message-Id: Date: Mon, 10 May 2021 14:38:01 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, 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: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Under the name __nptl_free_tcb. Reviewed-by: Adhemerval Zanella --- nptl/Makefile | 1 + nptl/Versions | 1 + nptl/nptl_free_tcb.c | 46 ++++++++++++++++++++++++++++++++++++++ nptl/pthreadP.h | 3 ++- nptl/pthread_create.c | 27 +--------------------- nptl/pthread_detach.c | 2 +- nptl/pthread_join_common.c | 2 +- 7 files changed, 53 insertions(+), 29 deletions(-) create mode 100644 nptl/nptl_free_tcb.c diff --git a/nptl/Makefile b/nptl/Makefile index 3b83817163..82dc6f466d 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -46,6 +46,7 @@ routines = \ lowlevellock \ nptl-stack \ nptl_deallocate_tsd \ + nptl_free_tcb \ nptl_nthreads \ nptl_setxid \ nptlfreeres \ diff --git a/nptl/Versions b/nptl/Versions index 93219d2657..da610a4803 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -321,6 +321,7 @@ libc { __mutex_aconf; __nptl_deallocate_stack; __nptl_deallocate_tsd; + __nptl_free_tcb; __nptl_nthreads; __nptl_setxid_sighandler; __nptl_stack_list_add; diff --git a/nptl/nptl_free_tcb.c b/nptl/nptl_free_tcb.c new file mode 100644 index 0000000000..65c4d3bfa7 --- /dev/null +++ b/nptl/nptl_free_tcb.c @@ -0,0 +1,46 @@ +/* TCB deallocation for NPTL. + Copyright (C) 2002-2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 2002. + + 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 + +void +__nptl_free_tcb (struct pthread *pd) +{ + /* The thread is exiting now. */ + if (__builtin_expect (atomic_bit_test_set (&pd->cancelhandling, + TERMINATED_BIT) == 0, 1)) + { + /* Free TPP data. */ + if (__glibc_unlikely (pd->tpp != NULL)) + { + struct priority_protection_data *tpp = pd->tpp; + + pd->tpp = NULL; + free (tpp); + } + + /* Queue the stack memory block for reuse and exit the process. The + kernel will signal via writing to the address returned by + QUEUE-STACK when the stack is available. */ + __nptl_deallocate_stack (pd); + } +} +libc_hidden_def (__nptl_free_tcb) diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index 505d0f00ff..d580f71a38 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -312,7 +312,8 @@ __do_cancel (void) /* Deallocate a thread's stack after optionally making sure the thread descriptor is still valid. */ -extern void __free_tcb (struct pthread *pd) attribute_hidden; +extern void __nptl_free_tcb (struct pthread *pd); +libc_hidden_proto (__nptl_free_tcb) /* Change the permissions of a thread stack. Called from _dl_make_stacks_executable and pthread_create. */ diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c index fcaf440bb5..770656453d 100644 --- a/nptl/pthread_create.c +++ b/nptl/pthread_create.c @@ -207,31 +207,6 @@ static int create_thread (struct pthread *pd, const struct pthread_attr *attr, #include -/* Deallocate a thread's stack after optionally making sure the thread - descriptor is still valid. */ -void -__free_tcb (struct pthread *pd) -{ - /* The thread is exiting now. */ - if (__builtin_expect (atomic_bit_test_set (&pd->cancelhandling, - TERMINATED_BIT) == 0, 1)) - { - /* Free TPP data. */ - if (__glibc_unlikely (pd->tpp != NULL)) - { - struct priority_protection_data *tpp = pd->tpp; - - pd->tpp = NULL; - free (tpp); - } - - /* Queue the stack memory block for reuse and exit the process. The - kernel will signal via writing to the address returned by - QUEUE-STACK when the stack is available. */ - __nptl_deallocate_stack (pd); - } -} - /* Local function to start thread and handle cleanup. createthread.c defines the macro START_THREAD_DEFN to the declaration that its create_thread function will refer to, and @@ -444,7 +419,7 @@ START_THREAD_DEFN /* If the thread is detached free the TCB. */ if (IS_DETACHED (pd)) /* Free the TCB. */ - __free_tcb (pd); + __nptl_free_tcb (pd); /* We cannot call '_exit' here. '_exit' will terminate the process. diff --git a/nptl/pthread_detach.c b/nptl/pthread_detach.c index 57293ec950..410255bbe1 100644 --- a/nptl/pthread_detach.c +++ b/nptl/pthread_detach.c @@ -49,7 +49,7 @@ __pthread_detach (pthread_t th) if ((pd->cancelhandling & EXITING_BITMASK) != 0) /* Note that the code in __free_tcb makes sure each thread control block is freed only once. */ - __free_tcb (pd); + __nptl_free_tcb (pd); return result; } diff --git a/nptl/pthread_join_common.c b/nptl/pthread_join_common.c index a99c26e27e..e87801b5a3 100644 --- a/nptl/pthread_join_common.c +++ b/nptl/pthread_join_common.c @@ -122,7 +122,7 @@ __pthread_clockjoin_ex (pthread_t threadid, void **thread_return, *thread_return = pd_result; /* Free the TCB. */ - __free_tcb (pd); + __nptl_free_tcb (pd); } else pd->joinid = NULL;