From patchwork Fri Apr 16 09:23:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 1466981 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=dywckvzV; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FM9kb69Clz9sV5 for ; Fri, 16 Apr 2021 19:23:51 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 00F31396D83F; Fri, 16 Apr 2021 09:23:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 00F31396D83F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1618565025; bh=ICV/lIJdW2WvneJlzDNtOqbdM2oes7+pVcy+FKpL/uo=; 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=dywckvzVU5PCpNbYea8sDTzGGZ0qZ5HEJTqKXUs4dTegxazaAMiBErAHkwRCkVaEq W6xQe0URm8Cd2LCskX8FzuaRvwfC9LZSxNM84a5L/vIgNnWrH5Ujheg+2psjAgZXHb c71htuuRFAz3UumiuP8vmP2M5/ekXro2sOSG7g+U= 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 [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 1A3DA396C83A for ; Fri, 16 Apr 2021 09:23:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 1A3DA396C83A 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-557-JR04iQvhMzqjXSCDlr3xUA-1; Fri, 16 Apr 2021 05:23:39 -0400 X-MC-Unique: JR04iQvhMzqjXSCDlr3xUA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CCCA4107ACCD for ; Fri, 16 Apr 2021 09:23:38 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-113-139.ams2.redhat.com [10.36.113.139]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F219010074FC for ; Fri, 16 Apr 2021 09:23:37 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH v4 31/37] nptl: Move internal symbol __mutex_aconf into libc In-Reply-To: References: Message-Id: <70a3218ecaeae2bd609c0f71fcc9f3cfb3ca63f9.1618564630.git.fweimer@redhat.com> Date: Fri, 16 Apr 2021 11:23:55 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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, 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" This is in preparation of moving the mutex code into libc. __pthread_tunables_init is now called via __pthread_early_init. Reviewed-by: Adhemerval Zanella --- nptl/Makefile | 2 +- nptl/Versions | 1 + nptl/nptl-init.c | 4 --- nptl/pthread_mutex_conf.c | 1 + sysdeps/nptl/pthread_early_init.h | 33 +++++++++++++++++++++ {nptl => sysdeps/nptl}/pthread_mutex_conf.h | 9 +++++- sysdeps/pthread/pthread_mutex_conf.h | 28 +++++++++++++++++ 7 files changed, 72 insertions(+), 6 deletions(-) create mode 100644 sysdeps/nptl/pthread_early_init.h rename {nptl => sysdeps/nptl}/pthread_mutex_conf.h (86%) create mode 100644 sysdeps/pthread/pthread_mutex_conf.h diff --git a/nptl/Makefile b/nptl/Makefile index d595598cb8..36ec9f67a0 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -83,6 +83,7 @@ routines = \ pthread_key_delete \ pthread_keys \ pthread_kill \ + pthread_mutex_conf \ pthread_mutex_consistent \ pthread_once \ pthread_rwlock_rdlock \ @@ -153,7 +154,6 @@ libpthread-routines = \ pthread_join_common \ pthread_kill_other_threads \ pthread_mutex_cond_lock \ - pthread_mutex_conf \ pthread_mutex_destroy \ pthread_mutex_getprioceiling \ pthread_mutex_init \ diff --git a/nptl/Versions b/nptl/Versions index f51110da8d..2748421a77 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -132,6 +132,7 @@ libc { __lll_lock_wait_private; __lll_trylock_elision; __lll_unlock_elision; + __mutex_aconf; __nptl_deallocate_tsd; __nptl_nthreads; __pthread_attr_copy; diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c index fae0db383c..646c5a9623 100644 --- a/nptl/nptl-init.c +++ b/nptl/nptl-init.c @@ -268,10 +268,6 @@ __pthread_initialize_minimal_internal (void) __libc_multiple_threads_ptr = #endif __libc_pthread_init (__reclaim_stacks, ptr_pthread_functions); - -#if HAVE_TUNABLES - __pthread_tunables_init (); -#endif } strong_alias (__pthread_initialize_minimal_internal, __pthread_initialize_minimal) diff --git a/nptl/pthread_mutex_conf.c b/nptl/pthread_mutex_conf.c index e6532ba1d7..e6235dea47 100644 --- a/nptl/pthread_mutex_conf.c +++ b/nptl/pthread_mutex_conf.c @@ -30,6 +30,7 @@ struct mutex_config __mutex_aconf = calling into kernel to block. */ .spin_count = DEFAULT_ADAPTIVE_COUNT, }; +libc_hidden_data_def (__mutex_aconf) static void TUNABLE_CALLBACK (set_mutex_spin_count) (tunable_val_t *valp) diff --git a/sysdeps/nptl/pthread_early_init.h b/sysdeps/nptl/pthread_early_init.h new file mode 100644 index 0000000000..2d15303dd9 --- /dev/null +++ b/sysdeps/nptl/pthread_early_init.h @@ -0,0 +1,33 @@ +/* pthread initialization called from __libc_early_init. NPTL version. + Copyright (C) 2021 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 _PTHREAD_EARLY_INIT_H +#define _PTHREAD_EARLY_INIT_H 1 + +#include +#include + +static inline void +__pthread_early_init (void) +{ +#if HAVE_TUNABLES + __pthread_tunables_init (); +#endif +} + +#endif /* _PTHREAD_EARLY_INIT_H */ diff --git a/nptl/pthread_mutex_conf.h b/sysdeps/nptl/pthread_mutex_conf.h similarity index 86% rename from nptl/pthread_mutex_conf.h rename to sysdeps/nptl/pthread_mutex_conf.h index 14e135a539..9dba4bfa6d 100644 --- a/nptl/pthread_mutex_conf.h +++ b/sysdeps/nptl/pthread_mutex_conf.h @@ -26,9 +26,16 @@ struct mutex_config int spin_count; }; -extern struct mutex_config __mutex_aconf attribute_hidden; +extern struct mutex_config __mutex_aconf; +libc_hidden_proto (__mutex_aconf) extern void __pthread_tunables_init (void) attribute_hidden; +#else +static inline void +__pthread_tunables_init (void) +{ + /* No tunables to initialize. */ +} #endif #endif diff --git a/sysdeps/pthread/pthread_mutex_conf.h b/sysdeps/pthread/pthread_mutex_conf.h new file mode 100644 index 0000000000..c999c980f7 --- /dev/null +++ b/sysdeps/pthread/pthread_mutex_conf.h @@ -0,0 +1,28 @@ +/* Pthread mutex tunable parameters. Generic version. + Copyright (C) 2018-2021 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 _PTHREAD_MUTEX_CONF_H +#define _PTHREAD_MUTEX_CONF_H 1 + +static inline void +__pthread_tunables_init (void) +{ + /* The generic version does not have any tunables to init. */ +} + +#endif