From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qt1-x835.google.com (mail-qt1-x835.google.com [IPv6:2607:f8b0:4864:20::835]) by sourceware.org (Postfix) with ESMTPS id 66DA03858001 for ; Thu, 25 Mar 2021 20:24:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 66DA03858001 Received: by mail-qt1-x835.google.com with SMTP id a11so2719539qto.2 for ; Thu, 25 Mar 2021 13:24:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=OcDEqUZiRNwA0qBOzbsKuPGnQi+jjinM4nt7L4KnwLs=; b=Tafsa1TJi/+KDSTUQdX49/pdVqIM9EbwNNcXyZxntSR9lWWFuNlMjvsMTyRKxde0l+ Axb90lXXuFyrMOaDXTAneCMdi4YnVzh4ipeFCjvVlBZ3So2A12cZJcJNoVwmWJXOY9BE /tfx6hpPIevdv/fgTgY14lI/znMvHnVG/e1xxed1BsIH8GTBPiMTSVzsCcrZ5BKcjnbj 0AB/RnxGXFnKK15H8vIKUSwsp+LpdjIXI/OMdyhh+e9ys99wHG7SmkPXZEAoGCoYD2W8 kH11xL19ADeO+BEseZUtJ0n2dwH5Lp9somhUPPo3lz+UwwAGWqQoWQxkselQ6gYG3ovO XhrQ== X-Gm-Message-State: AOAM531Iu/ddp47XJ8Bf6MftoKJTI6uclIysE3RhJyMSipljkwX2rqG/ ZxFNBbin3xFwCJaGmc9ojK6/LnUTKv9lSASd X-Google-Smtp-Source: ABdhPJwrEL2Ng3lXcB3oNGWWLKvmfZUl+QjpiSdDXwj7F8CACN9mT/3lan5r9wlZ94yeiNiPyCgV2g== X-Received: by 2002:ac8:67d3:: with SMTP id r19mr9249968qtp.23.1616703890783; Thu, 25 Mar 2021 13:24:50 -0700 (PDT) Received: from [192.168.1.132] ([177.194.41.149]) by smtp.gmail.com with ESMTPSA id a10sm4978056qkh.122.2021.03.25.13.24.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 25 Mar 2021 13:24:50 -0700 (PDT) Subject: Re: [PATCH v3 31/37] nptl: Move internal symbol __mutex_aconf into libc To: Florian Weimer , libc-alpha@sourceware.org References: <39bc3765cbc5e1d3594be688d794eccb344a403d.1615914632.git.fweimer@redhat.com> From: Adhemerval Zanella Message-ID: Date: Thu, 25 Mar 2021 17:24:48 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.1 MIME-Version: 1.0 In-Reply-To: <39bc3765cbc5e1d3594be688d794eccb344a403d.1615914632.git.fweimer@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, NICE_REPLY_A, 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-List-Received-Date: Thu, 25 Mar 2021 20:24:53 -0000 On 16/03/2021 14:31, Florian Weimer via Libc-alpha wrote: > This is in preparation of moving the mutex code into libc. > > __pthread_tunables_init is now called via __libc_early_init. > For non-NPTL targets, a stub version is provided. LGTM, thanks. 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 353cbf8911..3ae0e1e8c8 100644 > --- a/nptl/Makefile > +++ b/nptl/Makefile > @@ -82,6 +82,7 @@ routines = \ > pthread_key_create \ > pthread_key_delete \ > pthread_keys \ > + pthread_mutex_conf \ > pthread_mutex_consistent \ > pthread_once \ > pthread_rwlock_rdlock \ > @@ -170,7 +171,6 @@ libpthread-routines = \ > pthread_kill \ > pthread_kill_other_threads \ > pthread_mutex_cond_lock \ > - pthread_mutex_conf \ > pthread_mutex_destroy \ > pthread_mutex_getprioceiling \ > pthread_mutex_init \ Ok. > diff --git a/nptl/Versions b/nptl/Versions > index 4dee682ed9..2b9508bd6f 100644 > --- a/nptl/Versions > +++ b/nptl/Versions > @@ -136,6 +136,7 @@ libc { > __lll_lock_wait_private; > __lll_trylock_elision; > __lll_unlock_elision; > + __mutex_aconf; > __nptl_deallocate_tsd; > __nptl_nthreads; > __pthread_attr_copy; Ok. > diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c > index 0c07b46a77..5c85f75cc1 100644 > --- a/nptl/nptl-init.c > +++ b/nptl/nptl-init.c > @@ -269,10 +269,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) Ok. > 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) Ok. > diff --git a/sysdeps/nptl/pthread_early_init.h b/sysdeps/nptl/pthread_early_init.h > new file mode 100644 > index 0000000000..69e700dae1 > --- /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 */ Double space before '*/'. > 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 Ok. > 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 > Ok.