From patchwork Mon Jul 12 12:53:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 44318 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 403053833003 for ; Mon, 12 Jul 2021 12:55:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 403053833003 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1626094511; bh=rn3pbcCmfWMUi41UiYI7P1n9SlPSK8MaAVTiq4pDmjs=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=XKzD/7nwBH0yajfyVGNmLe7hKQPswmnp1FFjD/FzXXl3g5ZdqrC2N/tf4Vm5g/X47 gT4COizLSQcfQguz1eh5fiyoICTj35FX5coFRsnEG6oLDoAsK2wA2ezSVSL1CNi6kJ xG3mg4AzsYYyfXxy5CFzHgvJjw/VJhd/NnnArDIE= 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 56ACB3888C51 for ; Mon, 12 Jul 2021 12:53:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 56ACB3888C51 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-117-Yr4IAZbXPdWM2S_kwJgEqw-1; Mon, 12 Jul 2021 08:53:12 -0400 X-MC-Unique: Yr4IAZbXPdWM2S_kwJgEqw-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 D7A5B102C854; Mon, 12 Jul 2021 12:53:11 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-112-103.rdu2.redhat.com [10.10.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9A50F100EB3D; Mon, 12 Jul 2021 12:53:06 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH] Reduce pollution due to dynamic PTHREAD_STACK_MIN Date: Mon, 12 Jul 2021 14:53:03 +0200 Message-ID: <87a6mrbsnk.fsf@oldenburg.str.redhat.com> 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.9 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_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" used to be a header file with no declarations. GCC's libgomp includes in a #pragma GCC visibility hidden block. Including from (indirectly) declares everything in with hidden visibility, resulting in linker failures. This commit avoids C declarations in assembler mode and only declares __sysconf in (and not the entire contents of ). The __sysconf symbol is already part of the ABI. PTHREAD_STACK_MIN is no longer defined for __USE_DYNAMIC_STACK_SIZE && __ASSEMBLER__ because there is no possible definition. Additionally, PTHREAD_STACK_MIN is now defined by for __USE_MISC because this is what developers expect based on the macro name. It also helps to avoid libgomp linker failures in GCC because libgomp includes before its visibility hacks. Reviewed-by: Carlos O'Donell --- include/bits/local_lim.h | 7 ----- nptl/tst-minstack-exit.c | 3 +++ sysdeps/nptl/pthread.h | 4 ++- sysdeps/unix/sysv/linux/Makefile | 2 +- sysdeps/unix/sysv/linux/bits/local_lim.h | 10 ++----- .../sysv/linux/bits/pthread_stack_min-dynamic.h | 31 ++++++++++++++++++++++ .../linux/include/bits/pthread_stack_min-dynamic.h | 7 +++++ 7 files changed, 47 insertions(+), 17 deletions(-) diff --git a/include/bits/local_lim.h b/include/bits/local_lim.h deleted file mode 100644 index 46d82dc729..0000000000 --- a/include/bits/local_lim.h +++ /dev/null @@ -1,7 +0,0 @@ -/* Don't define PTHREAD_STACK_MIN to sysconf (_SC_THREAD_STACK_MIN) for - glibc build. */ -#if !defined _ISOMAC -# undef __USE_DYNAMIC_STACK_SIZE -#endif - -#include_next diff --git a/nptl/tst-minstack-exit.c b/nptl/tst-minstack-exit.c index 4e7dc3e786..e577924178 100644 --- a/nptl/tst-minstack-exit.c +++ b/nptl/tst-minstack-exit.c @@ -24,6 +24,9 @@ #include #include +_Static_assert (__SC_THREAD_STACK_MIN_VALUE == _SC_THREAD_STACK_MIN, + "__SC_THREAD_STACK_MIN_VALUE is correct"); + static void * threadfunc (void *closure) { diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h index 52e2eadbfc..f1b7f2bdc6 100644 --- a/sysdeps/nptl/pthread.h +++ b/sysdeps/nptl/pthread.h @@ -29,7 +29,9 @@ #include #include #include - +#ifdef __USE_MISC +# include +#endif /* Detach state. */ enum diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 7d43dc95f2..8257e5b548 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -109,7 +109,7 @@ sysdep_headers += sys/mount.h sys/acct.h \ bits/types/struct_semid64_ds_helper.h \ bits/types/struct_shmid64_ds.h \ bits/types/struct_shmid64_ds_helper.h \ - bits/pthread_stack_min.h + bits/pthread_stack_min.h bits/pthread_stack_min-dynamic.h tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \ tst-quota tst-sync_file_range tst-sysconf-iov_max tst-ttyname \ diff --git a/sysdeps/unix/sysv/linux/bits/local_lim.h b/sysdeps/unix/sysv/linux/bits/local_lim.h index 0b1c7f40be..b8f89236bc 100644 --- a/sysdeps/unix/sysv/linux/bits/local_lim.h +++ b/sysdeps/unix/sysv/linux/bits/local_lim.h @@ -77,14 +77,8 @@ priority level. */ #define AIO_PRIO_DELTA_MAX 20 -/* Minimum size for a thread. We are free to choose a reasonable value. */ -#undef PTHREAD_STACK_MIN -#if defined __USE_DYNAMIC_STACK_SIZE && __USE_DYNAMIC_STACK_SIZE -# include -# define PTHREAD_STACK_MIN sysconf (_SC_THREAD_STACK_MIN) -#else -# include -#endif +/* Arrange for the definition of PTHREAD_STACK_MIN. */ +#include /* Maximum number of timer expiration overruns. */ #define DELAYTIMER_MAX 2147483647 diff --git a/sysdeps/unix/sysv/linux/bits/pthread_stack_min-dynamic.h b/sysdeps/unix/sysv/linux/bits/pthread_stack_min-dynamic.h new file mode 100644 index 0000000000..5f5fc5f024 --- /dev/null +++ b/sysdeps/unix/sysv/linux/bits/pthread_stack_min-dynamic.h @@ -0,0 +1,31 @@ +/* Definition of PTHREAD_STACK_MIN, possibly dynamic. + 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_STACK_MIN +# if defined __USE_DYNAMIC_STACK_SIZE && __USE_DYNAMIC_STACK_SIZE +# ifndef __ASSEMBLER__ +# define __SC_THREAD_STACK_MIN_VALUE 75 +__BEGIN_DECLS +extern long int __sysconf (int __name) __THROW; +__END_DECLS +# define PTHREAD_STACK_MIN __sysconf (__SC_THREAD_STACK_MIN_VALUE) +# endif +# else +# include +# endif +#endif diff --git a/sysdeps/unix/sysv/linux/include/bits/pthread_stack_min-dynamic.h b/sysdeps/unix/sysv/linux/include/bits/pthread_stack_min-dynamic.h new file mode 100644 index 0000000000..d66f584b21 --- /dev/null +++ b/sysdeps/unix/sysv/linux/include/bits/pthread_stack_min-dynamic.h @@ -0,0 +1,7 @@ +/* Don't define PTHREAD_STACK_MIN to __sysconf (_SC_THREAD_STACK_MIN) + for glibc build. */ +#ifdef _ISOMAC +# include +#else +# include +#endif