From patchwork Mon Jun 22 16:21:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szabolcs Nagy X-Patchwork-Id: 39764 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 A3FA0389040A; Mon, 22 Jun 2020 16:21:18 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80044.outbound.protection.outlook.com [40.107.8.44]) by sourceware.org (Postfix) with ESMTPS id A7ABC3840C3C for ; Mon, 22 Jun 2020 16:21:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A7ABC3840C3C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=Szabolcs.Nagy@arm.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5EZWJyDbfI2icG6CY66cfFiCmS+vfPodQj+FrHoZenw=; b=vTYc/lbq1Uo4r4+5vPz1k1UlHt3o5x/OxF1CsAhf2NZNcb+YuIzcG20bUI9c/vKlyP4/IRoYLQvdmASx7hqbuNEbTkYCNjduC+YN6mbTZ465fPsRieSmrn51UsxdXsTcmmzaBVdiAY8psmVoOAomc58y4Ygotu7T5cklBpcLni4= Received: from MR2P264CA0040.FRAP264.PROD.OUTLOOK.COM (2603:10a6:500::28) by VI1PR08MB2797.eurprd08.prod.outlook.com (2603:10a6:802:25::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.21; Mon, 22 Jun 2020 16:21:12 +0000 Received: from VE1EUR03FT026.eop-EUR03.prod.protection.outlook.com (2603:10a6:500:0:cafe::ed) by MR2P264CA0040.outlook.office365.com (2603:10a6:500::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.22 via Frontend Transport; Mon, 22 Jun 2020 16:21:12 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; sourceware.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; sourceware.org; dmarc=bestguesspass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT026.mail.protection.outlook.com (10.152.18.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.22 via Frontend Transport; Mon, 22 Jun 2020 16:21:12 +0000 Received: ("Tessian outbound 147ff5d152c1:v59"); Mon, 22 Jun 2020 16:21:12 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: b2fbd32047a8f1a1 X-CR-MTA-TID: 64aa7808 Received: from 1fcc22e33099.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id BCC42429-1F8C-44BC-B861-2CAD0B0865FC.1; Mon, 22 Jun 2020 16:21:06 +0000 Received: from EUR01-DB5-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 1fcc22e33099.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 22 Jun 2020 16:21:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R2svSmAMGbWKDdZNZs0deGysPdWADBz1j0gaaHjQX+yEJYjw4VPDvUkYpZMaHx5UzAGHzsLH901f/XE7lPVKBbM/DzoD4fTYySOlsVArwEWocQEncrJ7R+6XZl6NXZkINcGDnynQyxokDzsoov2aauQ8bJBb059Hec/gPh17gurT9+7rWcllejCy7O0r6BtDA1LDFaCGc2KN1ATKXmr/w0doTZ2Jou8ITyFxstIJ9HLviMcDMTT7tW/+GT22udXwcQIusskWEMMuDJm60ITDN3pcsnyiXxOOWikGtUCDoRY/07R69vv/YshExLk92WVAwcKQt1MkgHdFUq9BWyXCIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5EZWJyDbfI2icG6CY66cfFiCmS+vfPodQj+FrHoZenw=; b=lTpjBBI8TtvF0OGaA/nw8bFNWJvcQAp+Pp7swKgP3k4bi5olVajITXV8lj/2AjY2ujQuYwFp6gdLAqYyvXSrGH+5ARVD6ngIOSH3MQa+56MXfy3dCZFqLybfe9krJNmuIwKfdoWII2fWTQRXwK/WvROb2JQBR30iPk6Ut3YDq957QG/lcQAJzkB2Lrphjc03ixrR7I7rFXLJmB7l9dNjyZ5zF+MONGQAVL/DlCQgUzAHlxn1wBHInzmYxqWu9BX8JRaGjmq6R6pNuPV0xoStiSMJKaj8a3uPT1M7xust8OKpCkhXPwQDJcfCmDsqwgEYv53t038GeEMrhxk4anURtA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5EZWJyDbfI2icG6CY66cfFiCmS+vfPodQj+FrHoZenw=; b=vTYc/lbq1Uo4r4+5vPz1k1UlHt3o5x/OxF1CsAhf2NZNcb+YuIzcG20bUI9c/vKlyP4/IRoYLQvdmASx7hqbuNEbTkYCNjduC+YN6mbTZ465fPsRieSmrn51UsxdXsTcmmzaBVdiAY8psmVoOAomc58y4Ygotu7T5cklBpcLni4= Authentication-Results-Original: sourceware.org; dkim=none (message not signed) header.d=none;sourceware.org; dmarc=none action=none header.from=arm.com; Received: from AM6PR08MB3047.eurprd08.prod.outlook.com (2603:10a6:209:4c::23) by AM6PR08MB5239.eurprd08.prod.outlook.com (2603:10a6:20b:e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.21; Mon, 22 Jun 2020 16:21:06 +0000 Received: from AM6PR08MB3047.eurprd08.prod.outlook.com ([fe80::2404:de9f:78c0:313c]) by AM6PR08MB3047.eurprd08.prod.outlook.com ([fe80::2404:de9f:78c0:313c%6]) with mapi id 15.20.3109.027; Mon, 22 Jun 2020 16:21:06 +0000 From: Szabolcs Nagy To: libc-alpha@sourceware.org Subject: [PATCH v5 1/2] rtld: Add rtld.nns tunable for the number of supported namespaces Date: Mon, 22 Jun 2020 17:21:00 +0100 Message-Id: <9e6146dfb8a23058a086b9cef668b6a4c610ec14.1592841472.git.szabolcs.nagy@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: LO2P265CA0064.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:60::28) To AM6PR08MB3047.eurprd08.prod.outlook.com (2603:10a6:209:4c::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (217.140.106.53) by LO2P265CA0064.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:60::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.25 via Frontend Transport; Mon, 22 Jun 2020 16:21:05 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [217.140.106.53] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 04af6edd-e5ac-4ccf-5798-08d816c847b4 X-MS-TrafficTypeDiagnostic: AM6PR08MB5239:|VI1PR08MB2797: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:9508;OLM:9508; X-Forefront-PRVS: 0442E569BC X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 3/rFiZU0bbZVc7HisgScgD/s8VSlc44fIex/ejDx0QH0hg01MQenUy9iOl48cN11p9N78uPK133yAfzgzP9XN/kqu9K5rLEcLCEFhcxsnVoMO4y5FTqPEoiQcS6k/GxjNgIPXgbhox3lOzPYQbYlRKIUh1szAZlc6VrSanTkhpTv82vWDamV6ogZxbdWyxlTlJko0VsRZSBX7KIdJkFC/YFu9nqP599RoLTTf1sTUw/CIq1bn96GpJ9UpQ1q6+K5sSE36SJNQVhDHLgObfXQQbuZjAKwyyir2DoAwGjDCIb4lkQkYIKBHqYVErCjHqBUfYkJ1yWqfv09J3vfWDdE4bZB5/qT0Yrf6LDSNU1quFRuj6GWd7p7npA6Luftb6x2C/UJlp6KJOs+T4PAvxaa+B7F+KFGiWohpPrT4L8APOIudqMinKBtWNw3iPNTgrz16d6Dv8TyY9HH+oy3AvqAgRQUFfWPnRKGlsnQazvPOmWMTNJ72qgnIwJuCmdmi03i X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR08MB3047.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(346002)(376002)(136003)(39860400002)(366004)(396003)(52116002)(2906002)(44832011)(30864003)(6486002)(966005)(36756003)(316002)(86362001)(83380400001)(2616005)(478600001)(6666004)(6506007)(8936002)(6512007)(956004)(69590400007)(186003)(16526019)(66476007)(66946007)(8676002)(66556008)(5660300002)(6916009)(26005)(136400200001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: oahb8OXvuaPiOHY09DTxOKFOwCsPiHPbyj5XEwBNEQQ7x65AsAgxKnMf0CtSUQnA8fA/tGr9TAkb6d76eoL1wVU6OUpSEu52zHg61HffIUz2WhQjFiv7hQSZc0P61ZzJf+lv7JhntkU0z5evAhp745O0PxeGTIa3QYixImCFgYBjzNmxFEL0P1MMnN+1GziOVgiVj25SztaqLbsW7b6okI3O5vsGl15go5uJlbySvM0e1a8jIGw7guqnkKARa4Vuj7mwNRqAHH2N2lHvcYXcvEjEunL6y8/4VjrkPt85JAOFyoBIZTixYgpnnMwlkoBFFQch+Lz3CnGWNyQPlJtCTYtV3wm/aRVqN/ci5a6mtOpsBnTpf6B0weNyFd/m8vW5IjiZZFrFSyeuIDfjtN3Di9nK4/m6RIHt3CHP1pzrpT8B7aN1xqBh43mO0IKCx9d+nK8GC3v7RWQO00bnCOxeLt/jYIuB9oC4s+nFWR17j0cZgwktzsUQzBrYsF+nSHAC X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB5239 Original-Authentication-Results: sourceware.org; dkim=none (message not signed) header.d=none; sourceware.org; dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT026.eop-EUR03.prod.protection.outlook.com X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFTY:; SFS:(4636009)(396003)(136003)(39860400002)(376002)(346002)(46966005)(8936002)(82310400002)(44832011)(2616005)(6916009)(47076004)(82740400003)(336012)(356005)(2906002)(81166007)(956004)(83380400001)(8676002)(6506007)(26005)(70586007)(36756003)(70206006)(6486002)(966005)(69590400007)(186003)(6666004)(16526019)(86362001)(36906005)(478600001)(316002)(30864003)(6512007)(5660300002)(136400200001); DIR:OUT; SFP:1101; X-MS-Office365-Filtering-Correlation-Id-Prvs: 1c5a698d-366c-464a-300d-08d816c843b7 X-Forefront-PRVS: 0442E569BC X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JySZ8JCh0Ab4nQkaqXXRebRARLkz7hQlGJgiqawLV0UvZOntmTaK7LXNJd6bTAmU3n8c8Zna6VunhX3Ho7WD/0SYI/42n7k7o0aECXBmyy/g/H4QaMsVYM/Cf0Jza5arqUUMiB+1ddF5Nx10S/X0NQ+JLJx/gzTGrbjn0x+gXre8s7nfqU/ZX+0XjtBu7Ds9892lsCBV1diwCeUjgcn/4iGZoTixYzIvZoS5iLz/8pZc/kovhLPYboAk0Lm7hPbe6byVTGUYPbm3Js0NKq9ZtMZHNthPkPfuyXMdhWlRbePyGJvVu1Sb6kDsEternATZw+4VRAlDhIrPYC7dHVOx11rQkkMxlMSXhQ3rUSBP88NJQP0vWGFr4Psuz2P/0snqgitnh/129rXCgMVBpSezX/dZXyIsZUFm2Xpe0kYyygxQTYpzegmivO/0iVHLzhUXNaW9mKZ5RyQVXBiFsw/oWyyhVYv3mxHO2oBL9ss9BZKms/ByfSD+VrRTMSoGplYzu9nKjExnXP2pZlF4QxCZthcoHqI3X4kXR1Dnk2lZEFo= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jun 2020 16:21:12.3657 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 04af6edd-e5ac-4ccf-5798-08d816c847b4 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB2797 X-Spam-Status: No, score=-16.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, UNPARSEABLE_RELAY 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: , Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" TLS_STATIC_SURPLUS is 1664 bytes currently which is not enough to support DL_NNS (== 16) number of dynamic link namespaces, if we assume 192 bytes of TLS are reserved for libc use and 144 bytes are reserved for other system libraries that use IE TLS. A new tunable is introduced to control the number of supported namespaces and to adjust the surplus static TLS size as follows: surplus_tls = 192 * (rtld.nns-1) + 144 * rtld.nns + 512 The default is rtld.nns == 4 and then the surplus TLS size is the same as before, so the behaviour is unchanged by default. If an application creates more namespaces than the rtld.nns setting allows, then it is not guaranteed to work, but the limit is not checked. So existing usage will continue to work, but in the future if an application creates more than 4 dynamic link namespaces then the tunable will need to be set. In this patch DL_NNS is a fixed value and provides a maximum to the rtld.nns setting. Static linking used fixed 2048 bytes surplus TLS, this is changed so the same contract is used as for dynamic linking. With static linking DL_NNS == 1 so rtld.nns tunable is forced to 1, so by default the surplus TLS is reduced to 144 + 512 = 656 bytes. This change is not expected to cause problems. Tested on aarch64-linux-gnu and x86_64-linux-gnu. Reviewed-by: Carlos O'Donell --- v5: - Split the patch into two: rtld.nns and tls optimization parts. - Use rtld.nns instead of dl.nns. - Renamed the init function and moved the calls close to the first use of surplus tls size. - Updated the tunable documentation. v4: - Rebased and moved this log out of the commit message. - Minor commit message wording changes. v3: - archived at https://sourceware.org/pipermail/libc-alpha/2020-March/111660.html - Replace TLS_STATIC_SURPLUS with GLRO(dl_tls_static_surplus) and simplify related logic. - In case of static linking, replace GL(dl_tls_static_size) with GLRO(dl_tls_static_surplus) in the code paths before the GL(dl_tls_static_size) value is actually computed. - Update comments and the test code. - Document the new tunables. - Update description, mention static linking. v2: - Add dl.nns tunable. - Add dl.optional_static_tls tunable. - New surplus TLS usage contract that works reliably up to dl.nns namespaces. --- csu/libc-tls.c | 28 +++++++++---------- elf/dl-tls.c | 55 ++++++++++++++++++++++++++++++++++---- elf/dl-tunables.list | 9 +++++++ elf/rtld.c | 3 +++ manual/tunables.texi | 21 +++++++++++++++ sysdeps/generic/ldsodefs.h | 8 ++++++ 6 files changed, 105 insertions(+), 19 deletions(-) diff --git a/csu/libc-tls.c b/csu/libc-tls.c index 73ade0fec5..e2603157e8 100644 --- a/csu/libc-tls.c +++ b/csu/libc-tls.c @@ -46,13 +46,16 @@ bool _dl_tls_dtv_gaps; struct dtv_slotinfo_list *_dl_tls_dtv_slotinfo_list; /* Number of modules in the static TLS block. */ size_t _dl_tls_static_nelem; -/* Size of the static TLS block. Giving this initialized value - preallocates some surplus bytes in the static TLS area. */ -size_t _dl_tls_static_size = 2048; +/* Size of the static TLS block. */ +size_t _dl_tls_static_size; /* Size actually allocated in the static TLS block. */ size_t _dl_tls_static_used; /* Alignment requirement of the static TLS block. */ size_t _dl_tls_static_align; +/* Size of surplus space in the static TLS area for dynamically + loaded modules with IE-model TLS or for TLSDESC optimization. + See comments in elf/dl-tls.c where it is initialized. */ +size_t _dl_tls_static_surplus; /* Generation counter for the dtv. */ size_t _dl_tls_generation; @@ -81,10 +84,8 @@ init_slotinfo (void) static void init_static_tls (size_t memsz, size_t align) { - /* That is the size of the TLS memory for this object. The initialized - value of _dl_tls_static_size is provided by dl-open.c to request some - surplus that permits dynamic loading of modules with IE-model TLS. */ - GL(dl_tls_static_size) = roundup (memsz + GL(dl_tls_static_size), + /* That is the size of the TLS memory for this object. */ + GL(dl_tls_static_size) = roundup (memsz + GLRO(dl_tls_static_surplus), TLS_TCB_ALIGN); #if TLS_TCB_AT_TP GL(dl_tls_static_size) += TLS_TCB_SIZE; @@ -125,25 +126,24 @@ __libc_setup_tls (void) break; } + /* Calculate the size of the static TLS surplus. */ + _dl_tls_static_surplus_init (); + /* We have to set up the TCB block which also (possibly) contains 'errno'. Therefore we avoid 'malloc' which might touch 'errno'. Instead we use 'sbrk' which would only uses 'errno' if it fails. In this case we are right away out of memory and the user gets - what she/he deserves. - - The initialized value of _dl_tls_static_size is provided by dl-open.c - to request some surplus that permits dynamic loading of modules with - IE-model TLS. */ + what she/he deserves. */ #if TLS_TCB_AT_TP /* Align the TCB offset to the maximum alignment, as _dl_allocate_tls_storage (in elf/dl-tls.c) does using __libc_memalign and dl_tls_static_align. */ - tcb_offset = roundup (memsz + GL(dl_tls_static_size), max_align); + tcb_offset = roundup (memsz + GLRO(dl_tls_static_surplus), max_align); tlsblock = __sbrk (tcb_offset + TLS_INIT_TCB_SIZE + max_align); #elif TLS_DTV_AT_TP tcb_offset = roundup (TLS_INIT_TCB_SIZE, align ?: 1); tlsblock = __sbrk (tcb_offset + memsz + max_align - + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size)); + + TLS_PRE_TCB_SIZE + GLRO(dl_tls_static_surplus)); tlsblock += TLS_PRE_TCB_SIZE; #else /* In case a model with a different layout for the TCB and DTV diff --git a/elf/dl-tls.c b/elf/dl-tls.c index fa03234610..2201a1cc1d 100644 --- a/elf/dl-tls.c +++ b/elf/dl-tls.c @@ -29,10 +29,54 @@ #include #include -/* Amount of excess space to allocate in the static TLS area - to allow dynamic loading of modules defining IE-model TLS data. */ -#define TLS_STATIC_SURPLUS 64 + DL_NNS * 100 +#define TUNABLE_NAMESPACE rtld +#include + +/* Surplus static TLS, GLRO(dl_tls_static_surplus), is used for + + - IE TLS in libc.so for all dlmopen namespaces except in the initial + one where libc.so is not loaded dynamically but at startup time, + - IE TLS in other libraries which may be dynamically loaded even in the + initial namespace, + - and optionally for optimizing dynamic TLS access. + + The maximum number of namespaces is DL_NNS, but to support that many + namespaces correctly the static TLS allocation should be significantly + increased, which may cause problems with small thread stacks due to the + way static TLS is accounted (bug 11787). + + So there is a rtld.nns tunable limit on the number of supported namespaces + that affects the size of the static TLS and by default it's small enough + not to cause problems with existing applications. The limit is not + enforced or checked: it is the user's responsibility to increase rtld.nns + if more dlmopen namespaces are used. */ + +/* Size of initial-exec TLS in libc.so. */ +#define LIBC_IE_TLS 192 +/* Size of initial-exec TLS in libraries other than libc.so. + This should be large enough to cover runtime libraries of the + compiler such as libgomp and libraries in libc other than libc.so. */ +#define OTHER_IE_TLS 144 +/* Size of additional surplus TLS, placeholder for TLS optimizations. */ +#define OPT_SURPLUS_TLS 512 +void +_dl_tls_static_surplus_init (void) +{ + size_t nns; + +#if HAVE_TUNABLES + nns = TUNABLE_GET (nns, size_t, NULL); +#else + /* Default values of the tunables. */ + nns = 4; +#endif + if (nns > DL_NNS) + nns = DL_NNS; + GLRO(dl_tls_static_surplus) = ((nns - 1) * LIBC_IE_TLS + + nns * OTHER_IE_TLS + + OPT_SURPLUS_TLS); +} /* Out-of-memory handler. */ static void @@ -218,7 +262,8 @@ _dl_determine_tlsoffset (void) } GL(dl_tls_static_used) = offset; - GL(dl_tls_static_size) = (roundup (offset + TLS_STATIC_SURPLUS, max_align) + GL(dl_tls_static_size) = (roundup (offset + GLRO(dl_tls_static_surplus), + max_align) + TLS_TCB_SIZE); #elif TLS_DTV_AT_TP /* The TLS blocks start right after the TCB. */ @@ -262,7 +307,7 @@ _dl_determine_tlsoffset (void) } GL(dl_tls_static_used) = offset; - GL(dl_tls_static_size) = roundup (offset + TLS_STATIC_SURPLUS, + GL(dl_tls_static_size) = roundup (offset + GLRO(dl_tls_static_surplus), TLS_TCB_ALIGN); #else # error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined" diff --git a/elf/dl-tunables.list b/elf/dl-tunables.list index 0d398dd251..b07742d7b3 100644 --- a/elf/dl-tunables.list +++ b/elf/dl-tunables.list @@ -126,4 +126,13 @@ glibc { default: 3 } } + + rtld { + nns { + type: SIZE_T + minval: 1 + maxval: 16 + default: 4 + } + } } diff --git a/elf/rtld.c b/elf/rtld.c index f4c2602d65..f339f6894f 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -780,6 +780,9 @@ init_tls (void) } assert (i == GL(dl_tls_max_dtv_idx)); + /* Calculate the size of the static TLS surplus. */ + _dl_tls_static_surplus_init (); + /* Compute the TLS offsets for the various blocks. */ _dl_determine_tlsoffset (); diff --git a/manual/tunables.texi b/manual/tunables.texi index ec18b10834..978e08f4fb 100644 --- a/manual/tunables.texi +++ b/manual/tunables.texi @@ -31,6 +31,7 @@ their own namespace. @menu * Tunable names:: The structure of a tunable name * Memory Allocation Tunables:: Tunables in the memory allocation subsystem +* Dynamic Linking Tunables:: Tunables in the dynamic linking subsystem * Elision Tunables:: Tunables in elision subsystem * POSIX Thread Tunables:: Tunables in the POSIX thread subsystem * Hardware Capability Tunables:: Tunables that modify the hardware @@ -226,6 +227,26 @@ pointer, so add 4 on 32-bit systems or 8 on 64-bit systems to the size passed to @code{malloc} for the largest bin size to enable. @end deftp +@node Dynamic Linking Tunables +@section Dynamic Linking Tunables +@cindex dynamic linking tunables +@cindex rtld tunables + +@deftp {Tunable namespace} glibc.rtld +Dynamic linker behavior can be modified by setting the +following tunables in the @code{rtld} namespace: +@end deftp + +@deftp Tunable glibc.rtld.nns +Sets the number of supported dynamic link namespaces (see @code{dlmopen}). +Currently this limit can be set between 1 and 16 inclusive, the default is 4. +Each link namespace consumes some memory in all thread, and thus raising the +limit will increase the amount of memory each thread uses. Raising the limit +is useful when your application uses more than 4 dynamic linker audit modules +e.g. LD_AUDIT, or will use more than 4 dynamic link namespaces as created +by @code{dlmopen} with an lmid argument of @code{LM_ID_NEWLM}. +@end deftp + @node Elision Tunables @section Elision Tunables @cindex elision tunables diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index c525ffa12c..3b0c6d9620 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -583,6 +583,11 @@ struct rtld_global_ro binaries, don't honor for PIEs). */ EXTERN ElfW(Addr) _dl_use_load_bias; + /* Size of surplus space in the static TLS area for dynamically + loaded modules with IE-model TLS or for TLSDESC optimization. + See comments in elf/dl-tls.c where it is initialized. */ + EXTERN size_t _dl_tls_static_surplus; + /* Name of the shared object to be profiled (if any). */ EXTERN const char *_dl_profile; /* Filename of the output file. */ @@ -1101,6 +1106,9 @@ extern size_t _dl_count_modids (void) attribute_hidden; /* Calculate offset of the TLS blocks in the static TLS block. */ extern void _dl_determine_tlsoffset (void) attribute_hidden; +/* Calculate the size of the static TLS surplus. */ +void _dl_tls_static_surplus_init (void) attribute_hidden; + #ifndef SHARED /* Set up the TCB for statically linked applications. This is called early during startup because we always use TLS (for errno and the From patchwork Mon Jun 22 16:21:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szabolcs Nagy X-Patchwork-Id: 39765 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 8DB8A38930DD; Mon, 22 Jun 2020 16:21:36 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80045.outbound.protection.outlook.com [40.107.8.45]) by sourceware.org (Postfix) with ESMTPS id D094A387084D for ; Mon, 22 Jun 2020 16:21:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D094A387084D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=Szabolcs.Nagy@arm.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qdQMPsEFxkA84nd1tf33tmlKbNSRgmphCfexvN89b2U=; b=uThlMSIKsgIcaDRgitsEeNhpEThdZmQy6pif+pZOVxnPcUn3QEItonlnl9XSWK1MbiQriM9ORaMBvdcJpUZnWGwrbS2S6MCqVvZc+MBxDDM5zQRlTpQwtx94OG89g3ZfquLLqaLnvgGpHsl3CAv7/We6dKusjixCu9QgdKo/qDQ= Received: from AM6PR0202CA0058.eurprd02.prod.outlook.com (2603:10a6:20b:3a::35) by AM6PR08MB5142.eurprd08.prod.outlook.com (2603:10a6:20b:d4::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.22; Mon, 22 Jun 2020 16:21:29 +0000 Received: from VE1EUR03FT005.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:3a:cafe::4e) by AM6PR0202CA0058.outlook.office365.com (2603:10a6:20b:3a::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.22 via Frontend Transport; Mon, 22 Jun 2020 16:21:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; sourceware.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; sourceware.org; dmarc=bestguesspass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT005.mail.protection.outlook.com (10.152.18.172) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.22 via Frontend Transport; Mon, 22 Jun 2020 16:21:29 +0000 Received: ("Tessian outbound 217a52b9caed:v59"); Mon, 22 Jun 2020 16:21:29 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 236618f02cd02560 X-CR-MTA-TID: 64aa7808 Received: from c22469106d15.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 1F5C394E-EAA2-4A44-B717-0081B13FA358.1; Mon, 22 Jun 2020 16:21:24 +0000 Received: from EUR01-DB5-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id c22469106d15.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 22 Jun 2020 16:21:24 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AWjVs5nEhjn87sPspey0T5fDkjHacVCZCqUngzg1C6HO11D5h3Tr5W9mh7ZcLqTQ/pj5Zqrq3ddJfvkEWnh53pOWsPmV5OEJbGxMtCwMTLwSKX7lgafZeJn/0qdi1Lp7iTVpCvhX6bWCxIC5/SK29PlcSbrypYJmLbbwqcE7KrUWHnVv5UOx3scxgtTk8OGAKTmTLDwH461NWx107uPd+bxUZlwuzVe+qVCQAymCEthS+o9Thz/SAgh8uEVgUpamQcE8yDrnWf++ar/Bl3P1XXHFLx/o5S3eM1wzh8QgZO6uWij7wyH/2FTWfiu54QaetRtfcXiWQVeAeBLM3hBfUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qdQMPsEFxkA84nd1tf33tmlKbNSRgmphCfexvN89b2U=; b=MElwF7yD441WPCgyrCyKraoEq3pb9hWLx/2302W482RZ2Re2maDhft8UFhr9LcA9yAwAGachAKaZ475A49iD1FqcPWPeeVbUGXTN5wlkDtbx4pC36GyS7fSiP0BHvtWCNHNajmgTYkURvkKdnbMcbWD5aXd0Wn52lGvyyXk/+aPvHkYqNRbR3SNcg2xnqRc70muWz5vQn0iRh9gRkXVrOX4GAHGVnOkT0/WGmS/qS/rTL1CwuH2Yuqs6bzg0BJuqETHGWWwhF2Qu8UVyVgpqRaVQduljYB93R0J2esjFiwiZKqYVC4v49Kx7AwuAmnN+hQQHmX1G71bwvCiXdusIqQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qdQMPsEFxkA84nd1tf33tmlKbNSRgmphCfexvN89b2U=; b=uThlMSIKsgIcaDRgitsEeNhpEThdZmQy6pif+pZOVxnPcUn3QEItonlnl9XSWK1MbiQriM9ORaMBvdcJpUZnWGwrbS2S6MCqVvZc+MBxDDM5zQRlTpQwtx94OG89g3ZfquLLqaLnvgGpHsl3CAv7/We6dKusjixCu9QgdKo/qDQ= Authentication-Results-Original: sourceware.org; dkim=none (message not signed) header.d=none;sourceware.org; dmarc=none action=none header.from=arm.com; Received: from AM6PR08MB3047.eurprd08.prod.outlook.com (2603:10a6:209:4c::23) by AM6PR08MB5239.eurprd08.prod.outlook.com (2603:10a6:20b:e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.21; Mon, 22 Jun 2020 16:21:22 +0000 Received: from AM6PR08MB3047.eurprd08.prod.outlook.com ([fe80::2404:de9f:78c0:313c]) by AM6PR08MB3047.eurprd08.prod.outlook.com ([fe80::2404:de9f:78c0:313c%6]) with mapi id 15.20.3109.027; Mon, 22 Jun 2020 16:21:22 +0000 From: Szabolcs Nagy To: libc-alpha@sourceware.org Subject: [PATCH v5 2/2] rtld: Avoid using up static TLS surplus for optimizations [BZ #25051] Date: Mon, 22 Jun 2020 17:21:11 +0100 Message-Id: <574af04afaf32f8b1f0f47395c7a5ceb0e19dd18.1592841472.git.szabolcs.nagy@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ClientProxiedBy: SN4PR0501CA0084.namprd05.prod.outlook.com (2603:10b6:803:22::22) To AM6PR08MB3047.eurprd08.prod.outlook.com (2603:10a6:209:4c::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (217.140.106.53) by SN4PR0501CA0084.namprd05.prod.outlook.com (2603:10b6:803:22::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3131.11 via Frontend Transport; Mon, 22 Jun 2020 16:21:21 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [217.140.106.53] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 6b5e0884-8548-4e58-1f7b-08d816c851f8 X-MS-TrafficTypeDiagnostic: AM6PR08MB5239:|AM6PR08MB5142: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:3383;OLM:3383; X-Forefront-PRVS: 0442E569BC X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: EtCAzd8Zu6Suv7e+5pBW5+/chnlZMHXFLKh0GXYDERoLyEPKi3mCqEQUuOtYayQCCOV+qWiI9duNROXVDM1frptUC3sWq4wEVItREYjMFRcuIxeF/EG8j9hl2LYskZ2z2AazTy/m21J4rc0io2qo06Wt5OLjs5iQUQPewJoToGXY5F/4RRcH8DOM8EhY4XpaVpJtCvlYI3/rBtwmtzs9WDmWUBzAIqd0hIxCRu9JmNjevvcJzFZu9mtbQoAg5eEn2ZyId0OEpwzQpKqlN/sICeQwaxbL4m50hHazo8AsrVbLnxftAlazspwGos+NdbF0x/SfwrPJTRaoHsPIBTGhbsti0PGLoBORVUTgiG1Mf5CGEvpJ8v5ZexSaDqZbY+cI8QX8j3jBhaShmtEnqsEYRLaE2HLvcVFDI1TUjYcmEu0Q+oyc7dFd896X8T45rE4GMBGgp17lrMIpSCLcPNDN51u0j1ncs9KEc2MoLVmhkF3XaIAZL01IbsMHEiQZU6xsDlSTTgHDqUR8j+AaqEedlg== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR08MB3047.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(346002)(376002)(136003)(39860400002)(366004)(396003)(52116002)(2906002)(44832011)(30864003)(6486002)(966005)(36756003)(316002)(86362001)(83380400001)(2616005)(478600001)(6666004)(6506007)(8936002)(6512007)(956004)(69590400007)(186003)(16526019)(66476007)(66946007)(8676002)(66556008)(5660300002)(6916009)(26005)(136400200001)(2004002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: MgpjRV0cZ1w4bMniq3GetGm4bIxL/RUL4UigEGQoalDcC7OydDIFKsmUsk29RmVcU7JHJVqxWCbhSivZENS7K2iCaekVgKZi+z4miwCTY0PTF84O7SdPjWm5ShKKGfAJ9lRIS6yyBVIeZbgz8nQGuvmZ/tBhhKVWqYfZpEL79IAor9W+JWNZ77BWf+BqGAhV7EGLIK69qI+4nUETEUBzaEvnI9RfDfKrzMOqIR5PTSofRESJoEZvZq8R9A+Gt/WwqDjc99KGN/c7+uCBFubmk6PTQwFXDPYOfUbHkJoHzO4JOrX/4p/Vhzo/GDPBJaTSSPK4AUDtDxIEvjKO0/TBATTjAdbcppRh0NCucV0kKCsoDh0H+V+arF6wMZ1ovMoZ/Gf66DaqZPE0XnvHvAbOv3q2snGYBi911Tg7Xu4/l1BfoaL3CFYCzHFslH0eoKceyOG0DsMTu/7k99UKdPI2sZezO0yqygjXZhJqtDfbTe9Nptvpqi8Z4B7xPryM3dAa X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB5239 Original-Authentication-Results: sourceware.org; dkim=none (message not signed) header.d=none; sourceware.org; dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT005.eop-EUR03.prod.protection.outlook.com X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFTY:; SFS:(4636009)(136003)(39860400002)(396003)(346002)(376002)(46966005)(8936002)(356005)(36906005)(2906002)(316002)(82310400002)(81166007)(336012)(478600001)(82740400003)(2616005)(16526019)(956004)(186003)(6666004)(47076004)(69590400007)(44832011)(26005)(5660300002)(30864003)(6486002)(83380400001)(8676002)(6512007)(70586007)(6506007)(70206006)(36756003)(86362001)(966005)(6916009)(2004002)(136400200001); DIR:OUT; SFP:1101; X-MS-Office365-Filtering-Correlation-Id-Prvs: 3eb911be-3288-4d8c-8a49-08d816c84d98 X-Forefront-PRVS: 0442E569BC X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IWDqiQKwE93yCIbipT3k+BB6HqO2mNN71AV+G9v3VUxQG3kyz46bLiirltVl+CkjVOMIwE2cWOJO5phQ/uHN1U1tdoOXQj803tGJzbJ98s5bwyyFvM36KMcW/ip4GVebnuYplRn9zYZt+k6xJJLyPPdCE6+zdgfAFTISwCrY8l+XmIXfjn3QR+IpsKQ4MoKJRiW+BU7X+eb75MsQs791Ffe1dvVzIK/lsYOW/SdmS4vbAf/50v8lLsXxw3yfnNs12cdF8bDgstIyuGAVdra/7ha1zZcGY6RK6lmMfkz42r0iQMW5b7DRT51iSZ+NbdkQbyEkvyEO6OlkbkmJmG/s54IXGKmWL3c0M5dbdwMhKsNZ7BdwnRu60tpkEMcYl9CmdiT5ZjWkkQIR7vaUk3tonr8yyuguYa2kUkBVK6UZH5KnQZCP5pqkyP0DkzgNJLlW2MA/p0fw/1Dq1/82wnhPCmQdkAYbJ7njzCqblH7hpAE1wiegASlwjeia4ULFl/B2Mzi4TSYOEJ7jpz1DZZ1akJKIx+KyQ3V99QU/ZdiRw51fnu3om6xYzhLVqUiCS+I6 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jun 2020 16:21:29.5891 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6b5e0884-8548-4e58-1f7b-08d816c851f8 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB5142 X-Spam-Status: No, score=-16.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, KAM_SHORT, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, UNPARSEABLE_RELAY 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: , Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" On some targets static TLS surplus area can be used opportunistically for dynamically loaded modules such that the TLS access then becomes faster (TLSDESC and powerpc TLS optimization). However we don't want all surplus TLS to be used for this optimization because dynamically loaded modules with initial-exec model TLS can only use surplus TLS. The new contract for surplus static TLS use is: - libc.so can have up to 192 bytes of IE TLS, - other system libraries together can have up to 144 bytes of IE TLS. - Some "optional" static TLS is available for opportunistic use. The optional TLS is now tunable: rtld.optional_static_tls, so users can directly affect the allocated static TLS size. (Note that module unloading with dlclose does not reclaim static TLS. After the optional TLS runs out, TLS access is no longer optimized to use static TLS.) The default setting of rtld.optional_static_tls is 512 so the surplus TLS is 3*192 + 4*144 + 512 = 1664 by default, the same as before. Fixes BZ #25051. Tested on aarch64-linux-gnu and x86_64-linux-gnu. Reviewed-by: Carlos O'Donell --- v5: - Split the patch into two: rtld.nns and tls optimization parts. - Use rtld tunable namespace. - Set tunable min val to 0. - New test using dlmopen. - Tests now have check for failing IE TLS dlopen. - Updated the tunable documentation. v4: - Rebased and moved this log out of the commit message. - Minor commit message wording changes. v3: - archived at https://sourceware.org/pipermail/libc-alpha/2020-March/111660.html - Replace TLS_STATIC_SURPLUS with GLRO(dl_tls_static_surplus) and simplify related logic. - In case of static linking, replace GL(dl_tls_static_size) with GLRO(dl_tls_static_surplus) in the code paths before the GL(dl_tls_static_size) value is actually computed. - Update comments and the test code. - Document the new tunables. - Update description, mention static linking. v2: - Add dl.nns tunable. - Add dl.optional_static_tls tunable. - New surplus TLS usage contract that works reliably up to dl.nns namespaces. --- csu/libc-tls.c | 3 + elf/Makefile | 29 +++++++++- elf/dl-reloc.c | 37 +++++++++--- elf/dl-tls.c | 9 +-- elf/dl-tunables.list | 5 ++ elf/dynamic-link.h | 5 +- elf/tst-tls-ie-dlmopen.c | 114 +++++++++++++++++++++++++++++++++++++ elf/tst-tls-ie-mod.h | 40 +++++++++++++ elf/tst-tls-ie-mod0.c | 4 ++ elf/tst-tls-ie-mod1.c | 4 ++ elf/tst-tls-ie-mod2.c | 4 ++ elf/tst-tls-ie-mod3.c | 4 ++ elf/tst-tls-ie-mod4.c | 4 ++ elf/tst-tls-ie-mod5.c | 4 ++ elf/tst-tls-ie-mod6.c | 4 ++ elf/tst-tls-ie.c | 113 ++++++++++++++++++++++++++++++++++++ manual/tunables.texi | 17 ++++++ sysdeps/generic/ldsodefs.h | 3 + 18 files changed, 386 insertions(+), 17 deletions(-) create mode 100644 elf/tst-tls-ie-dlmopen.c create mode 100644 elf/tst-tls-ie-mod.h create mode 100644 elf/tst-tls-ie-mod0.c create mode 100644 elf/tst-tls-ie-mod1.c create mode 100644 elf/tst-tls-ie-mod2.c create mode 100644 elf/tst-tls-ie-mod3.c create mode 100644 elf/tst-tls-ie-mod4.c create mode 100644 elf/tst-tls-ie-mod5.c create mode 100644 elf/tst-tls-ie-mod6.c create mode 100644 elf/tst-tls-ie.c diff --git a/csu/libc-tls.c b/csu/libc-tls.c index e2603157e8..fb77cd94fa 100644 --- a/csu/libc-tls.c +++ b/csu/libc-tls.c @@ -56,6 +56,9 @@ size_t _dl_tls_static_align; loaded modules with IE-model TLS or for TLSDESC optimization. See comments in elf/dl-tls.c where it is initialized. */ size_t _dl_tls_static_surplus; +/* Remaining amount of static TLS that may be used for optimizing + dynamic TLS access (e.g. with TLSDESC). */ +size_t _dl_tls_static_optional; /* Generation counter for the dtv. */ size_t _dl_tls_generation; diff --git a/elf/Makefile b/elf/Makefile index 6fe1df90bb..5fadaec27c 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -204,7 +204,8 @@ tests += restest1 preloadtest loadfail multiload origtest resolvfail \ tst-dlopen-self tst-auditmany tst-initfinilazyfail tst-dlopenfail \ tst-dlopenfail-2 \ tst-filterobj tst-filterobj-dlopen tst-auxobj tst-auxobj-dlopen \ - tst-audit14 tst-audit15 tst-audit16 + tst-audit14 tst-audit15 tst-audit16 \ + tst-tls-ie tst-tls-ie-dlmopen # reldep9 tests-internal += loadtest unload unload2 circleload1 \ neededtest neededtest2 neededtest3 neededtest4 \ @@ -317,7 +318,11 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ tst-dlopenfailmod1 tst-dlopenfaillinkmod tst-dlopenfailmod2 \ tst-dlopenfailmod3 tst-ldconfig-ld-mod \ tst-filterobj-flt tst-filterobj-aux tst-filterobj-filtee \ - tst-auditlogmod-1 tst-auditlogmod-2 tst-auditlogmod-3 + tst-auditlogmod-1 tst-auditlogmod-2 tst-auditlogmod-3 \ + tst-tls-ie-mod0 tst-tls-ie-mod1 tst-tls-ie-mod2 \ + tst-tls-ie-mod3 tst-tls-ie-mod4 tst-tls-ie-mod5 \ + tst-tls-ie-mod6 + # Most modules build with _ISOMAC defined, but those filtered out # depend on internal headers. modules-names-tests = $(filter-out ifuncmod% tst-libc_dlvsym-dso tst-tlsmod%,\ @@ -1748,3 +1753,23 @@ $(objpfx)tst-auxobj: $(objpfx)tst-filterobj-aux.so $(objpfx)tst-auxobj-dlopen: $(libdl) $(objpfx)tst-auxobj.out: $(objpfx)tst-filterobj-filtee.so $(objpfx)tst-auxobj-dlopen.out: $(objpfx)tst-filterobj-filtee.so + +$(objpfx)tst-tls-ie: $(libdl) $(shared-thread-library) +$(objpfx)tst-tls-ie.out: \ + $(objpfx)tst-tls-ie-mod0.so \ + $(objpfx)tst-tls-ie-mod1.so \ + $(objpfx)tst-tls-ie-mod2.so \ + $(objpfx)tst-tls-ie-mod3.so \ + $(objpfx)tst-tls-ie-mod4.so \ + $(objpfx)tst-tls-ie-mod5.so \ + $(objpfx)tst-tls-ie-mod6.so + +$(objpfx)tst-tls-ie-dlmopen: $(libdl) $(shared-thread-library) +$(objpfx)tst-tls-ie-dlmopen.out: \ + $(objpfx)tst-tls-ie-mod0.so \ + $(objpfx)tst-tls-ie-mod1.so \ + $(objpfx)tst-tls-ie-mod2.so \ + $(objpfx)tst-tls-ie-mod3.so \ + $(objpfx)tst-tls-ie-mod4.so \ + $(objpfx)tst-tls-ie-mod5.so \ + $(objpfx)tst-tls-ie-mod6.so diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c index ffcc84d396..6d32e49467 100644 --- a/elf/dl-reloc.c +++ b/elf/dl-reloc.c @@ -39,13 +39,16 @@ /* We are trying to perform a static TLS relocation in MAP, but it was dynamically loaded. This can only work if there is enough surplus in the static TLS area already allocated for each running thread. If this - object's TLS segment is too big to fit, we fail. If it fits, - we set MAP->l_tls_offset and return. - This function intentionally does not return any value but signals error - directly, as static TLS should be rare and code handling it should - not be inlined as much as possible. */ + object's TLS segment is too big to fit, we fail with -1. If it fits, + we set MAP->l_tls_offset and return 0. + A portion of the surplus static TLS can be optionally used to optimize + dynamic TLS access (with TLSDESC or powerpc TLS optimizations). + If OPTIONAL is true then TLS is allocated for such optimization and + the caller must have a fallback in case the optional portion of surplus + TLS runs out. If OPTIONAL is false then the entire surplus TLS area is + considered and the allocation only fails if that runs out. */ int -_dl_try_allocate_static_tls (struct link_map *map) +_dl_try_allocate_static_tls (struct link_map *map, bool optional) { /* If we've already used the variable with dynamic access, or if the alignment requirements are too high, fail. */ @@ -68,8 +71,14 @@ _dl_try_allocate_static_tls (struct link_map *map) size_t n = (freebytes - blsize) / map->l_tls_align; - size_t offset = GL(dl_tls_static_used) + (freebytes - n * map->l_tls_align - - map->l_tls_firstbyte_offset); + /* Account optional static TLS surplus usage. */ + size_t use = freebytes - n * map->l_tls_align - map->l_tls_firstbyte_offset; + if (optional && use > GL(dl_tls_static_optional)) + goto fail; + else if (optional) + GL(dl_tls_static_optional) -= use; + + size_t offset = GL(dl_tls_static_used) + use; map->l_tls_offset = GL(dl_tls_static_used) = offset; #elif TLS_DTV_AT_TP @@ -83,6 +92,13 @@ _dl_try_allocate_static_tls (struct link_map *map) if (used > GL(dl_tls_static_size)) goto fail; + /* Account optional static TLS surplus usage. */ + size_t use = used - GL(dl_tls_static_used); + if (optional && use > GL(dl_tls_static_optional)) + goto fail; + else if (optional) + GL(dl_tls_static_optional) -= use; + map->l_tls_offset = offset; map->l_tls_firstbyte_offset = GL(dl_tls_static_used); GL(dl_tls_static_used) = used; @@ -110,12 +126,15 @@ _dl_try_allocate_static_tls (struct link_map *map) return 0; } +/* This function intentionally does not return any value but signals error + directly, as static TLS should be rare and code handling it should + not be inlined as much as possible. */ void __attribute_noinline__ _dl_allocate_static_tls (struct link_map *map) { if (map->l_tls_offset == FORCED_DYNAMIC_TLS_OFFSET - || _dl_try_allocate_static_tls (map)) + || _dl_try_allocate_static_tls (map, false)) { _dl_signal_error (0, map->l_name, NULL, N_("\ cannot allocate memory in static TLS block")); diff --git a/elf/dl-tls.c b/elf/dl-tls.c index 2201a1cc1d..af5db12d08 100644 --- a/elf/dl-tls.c +++ b/elf/dl-tls.c @@ -57,25 +57,26 @@ This should be large enough to cover runtime libraries of the compiler such as libgomp and libraries in libc other than libc.so. */ #define OTHER_IE_TLS 144 -/* Size of additional surplus TLS, placeholder for TLS optimizations. */ -#define OPT_SURPLUS_TLS 512 void _dl_tls_static_surplus_init (void) { - size_t nns; + size_t nns, opt_tls; #if HAVE_TUNABLES nns = TUNABLE_GET (nns, size_t, NULL); + opt_tls = TUNABLE_GET (optional_static_tls, size_t, NULL); #else /* Default values of the tunables. */ nns = 4; + opt_tls = 512; #endif if (nns > DL_NNS) nns = DL_NNS; + GL(dl_tls_static_optional) = opt_tls; GLRO(dl_tls_static_surplus) = ((nns - 1) * LIBC_IE_TLS + nns * OTHER_IE_TLS - + OPT_SURPLUS_TLS); + + opt_tls); } /* Out-of-memory handler. */ diff --git a/elf/dl-tunables.list b/elf/dl-tunables.list index b07742d7b3..35634ef24d 100644 --- a/elf/dl-tunables.list +++ b/elf/dl-tunables.list @@ -134,5 +134,10 @@ glibc { maxval: 16 default: 4 } + optional_static_tls { + type: SIZE_T + minval: 0 + default: 512 + } } } diff --git a/elf/dynamic-link.h b/elf/dynamic-link.h index bb7a66f4cd..6727233e1a 100644 --- a/elf/dynamic-link.h +++ b/elf/dynamic-link.h @@ -40,9 +40,10 @@ (__builtin_expect ((sym_map)->l_tls_offset \ != FORCED_DYNAMIC_TLS_OFFSET, 1) \ && (__builtin_expect ((sym_map)->l_tls_offset != NO_TLS_OFFSET, 1) \ - || _dl_try_allocate_static_tls (sym_map) == 0)) + || _dl_try_allocate_static_tls (sym_map, true) == 0)) -int _dl_try_allocate_static_tls (struct link_map *map) attribute_hidden; +int _dl_try_allocate_static_tls (struct link_map *map, bool optional) + attribute_hidden; #include diff --git a/elf/tst-tls-ie-dlmopen.c b/elf/tst-tls-ie-dlmopen.c new file mode 100644 index 0000000000..0be47c7237 --- /dev/null +++ b/elf/tst-tls-ie-dlmopen.c @@ -0,0 +1,114 @@ +/* Test dlopen of modules with initial-exec TLS after dlmopen. + Copyright (C) 2016-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 + . */ + +/* This test tries to check that surplus static TLS is not used up for + dynamic TLS optimizations and 4*144 = 576 bytes of static TLS is + still available for dlopening modules with initial-exec TLS after 3 + new dlmopen namespaces are created. It depends on rtld.nns=4 and + rtld.optional_static_tls=512 tunable settings. */ + +#include +#include +#include +#include +#include + +static int do_test (void); +#include +#include +#include + +/* Have some big TLS in the main exe: should not use surplus TLS. */ +__thread char maintls[1000]; + +static pthread_barrier_t barrier; + +/* Forces multi-threaded behaviour. */ +static void * +blocked_thread_func (void *closure) +{ + xpthread_barrier_wait (&barrier); + /* TLS load and access tests run here in the main thread. */ + xpthread_barrier_wait (&barrier); + return NULL; +} + +static void * +load_and_access (Lmid_t lmid, const char *mod, const char *func) +{ + /* Load module with TLS. */ + void *p = xdlmopen (lmid, mod, RTLD_NOW); + /* Access the TLS variable to ensure it is allocated. */ + void (*f) (void) = (void (*) (void))xdlsym (p, func); + f (); + return p; +} + +static int +do_test (void) +{ + void *mods[5]; + + { + int ret = pthread_barrier_init (&barrier, NULL, 2); + if (ret != 0) + { + errno = ret; + printf ("error: pthread_barrier_init: %m\n"); + exit (1); + } + } + + pthread_t blocked_thread = xpthread_create (NULL, blocked_thread_func, NULL); + xpthread_barrier_wait (&barrier); + + printf ("maintls[%zu]:\t %p .. %p\n", + sizeof maintls, maintls, maintls + sizeof maintls); + memset (maintls, 1, sizeof maintls); + + /* Load modules with dynamic TLS (use surplus static TLS for libc + in new namespaces and may be for TLS optimizations too). */ + mods[0] = load_and_access (LM_ID_BASE, "tst-tls-ie-mod0.so", "access0"); + mods[1] = load_and_access (LM_ID_NEWLM, "tst-tls-ie-mod1.so", "access1"); + mods[2] = load_and_access (LM_ID_NEWLM, "tst-tls-ie-mod2.so", "access2"); + mods[3] = load_and_access (LM_ID_NEWLM, "tst-tls-ie-mod3.so", "access3"); + /* Load modules with initial-exec TLS (can only use surplus static TLS). */ + mods[4] = load_and_access (LM_ID_BASE, "tst-tls-ie-mod6.so", "access6"); + + /* Here 576 bytes + 3 * libc use of surplus static TLS is in use so less + than 1024 bytes are available (exact number depends on TLS optimizations + and the libc TLS use). */ + printf ("The next dlmopen should fail...\n"); + void *p = dlmopen (LM_ID_BASE, "tst-tls-ie-mod4.so", RTLD_NOW); + if (p != NULL) + { + printf ("error: expected dlmopen to fail because there is " + "not enough surplus static TLS.\n"); + exit (1); + } + printf ("...OK failed with: %s.\n", dlerror ()); + + xpthread_barrier_wait (&barrier); + xpthread_join (blocked_thread); + + /* Close the modules. */ + for (int i = 0; i < 5; ++i) + xdlclose (mods[i]); + + return 0; +} diff --git a/elf/tst-tls-ie-mod.h b/elf/tst-tls-ie-mod.h new file mode 100644 index 0000000000..46b362a9b7 --- /dev/null +++ b/elf/tst-tls-ie-mod.h @@ -0,0 +1,40 @@ +/* Module with specified TLS size and model. + 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 + . */ + +/* This file is parameterized by macros N, SIZE and MODEL. */ + +#include +#include + +#define CONCATX(x, y) x ## y +#define CONCAT(x, y) CONCATX (x, y) +#define STRX(x) #x +#define STR(x) STRX (x) + +#define VAR CONCAT (var, N) + +__attribute__ ((aligned (8), tls_model (MODEL))) +__thread char VAR[SIZE]; + +void +CONCAT (access, N) (void) +{ + printf (STR (VAR) "[%d]:\t %p .. %p " MODEL "\n", SIZE, VAR, VAR + SIZE); + fflush (stdout); + memset (VAR, 1, SIZE); +} diff --git a/elf/tst-tls-ie-mod0.c b/elf/tst-tls-ie-mod0.c new file mode 100644 index 0000000000..2450686e40 --- /dev/null +++ b/elf/tst-tls-ie-mod0.c @@ -0,0 +1,4 @@ +#define N 0 +#define SIZE 480 +#define MODEL "global-dynamic" +#include "tst-tls-ie-mod.h" diff --git a/elf/tst-tls-ie-mod1.c b/elf/tst-tls-ie-mod1.c new file mode 100644 index 0000000000..849ff91e53 --- /dev/null +++ b/elf/tst-tls-ie-mod1.c @@ -0,0 +1,4 @@ +#define N 1 +#define SIZE 120 +#define MODEL "global-dynamic" +#include "tst-tls-ie-mod.h" diff --git a/elf/tst-tls-ie-mod2.c b/elf/tst-tls-ie-mod2.c new file mode 100644 index 0000000000..23915ab67b --- /dev/null +++ b/elf/tst-tls-ie-mod2.c @@ -0,0 +1,4 @@ +#define N 2 +#define SIZE 24 +#define MODEL "global-dynamic" +#include "tst-tls-ie-mod.h" diff --git a/elf/tst-tls-ie-mod3.c b/elf/tst-tls-ie-mod3.c new file mode 100644 index 0000000000..5395f844a5 --- /dev/null +++ b/elf/tst-tls-ie-mod3.c @@ -0,0 +1,4 @@ +#define N 3 +#define SIZE 16 +#define MODEL "global-dynamic" +#include "tst-tls-ie-mod.h" diff --git a/elf/tst-tls-ie-mod4.c b/elf/tst-tls-ie-mod4.c new file mode 100644 index 0000000000..93ac2eacae --- /dev/null +++ b/elf/tst-tls-ie-mod4.c @@ -0,0 +1,4 @@ +#define N 4 +#define SIZE 1024 +#define MODEL "initial-exec" +#include "tst-tls-ie-mod.h" diff --git a/elf/tst-tls-ie-mod5.c b/elf/tst-tls-ie-mod5.c new file mode 100644 index 0000000000..84b3fd285b --- /dev/null +++ b/elf/tst-tls-ie-mod5.c @@ -0,0 +1,4 @@ +#define N 5 +#define SIZE 128 +#define MODEL "initial-exec" +#include "tst-tls-ie-mod.h" diff --git a/elf/tst-tls-ie-mod6.c b/elf/tst-tls-ie-mod6.c new file mode 100644 index 0000000000..c736bf0684 --- /dev/null +++ b/elf/tst-tls-ie-mod6.c @@ -0,0 +1,4 @@ +#define N 6 +#define SIZE 576 +#define MODEL "initial-exec" +#include "tst-tls-ie-mod.h" diff --git a/elf/tst-tls-ie.c b/elf/tst-tls-ie.c new file mode 100644 index 0000000000..c06454c50c --- /dev/null +++ b/elf/tst-tls-ie.c @@ -0,0 +1,113 @@ +/* Test dlopen of modules with initial-exec TLS. + Copyright (C) 2016-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 + . */ + +/* This test tries to check that surplus static TLS is not used up for + dynamic TLS optimizations and 3*192 + 4*144 = 1152 bytes of static + TLS is available for dlopening modules with initial-exec TLS. It + depends on rtld.nns=4 and rtld.optional_static_tls=512 tunable setting. */ + +#include +#include +#include +#include +#include + +static int do_test (void); +#include +#include +#include + +/* Have some big TLS in the main exe: should not use surplus TLS. */ +__thread char maintls[1000]; + +static pthread_barrier_t barrier; + +/* Forces multi-threaded behaviour. */ +static void * +blocked_thread_func (void *closure) +{ + xpthread_barrier_wait (&barrier); + /* TLS load and access tests run here in the main thread. */ + xpthread_barrier_wait (&barrier); + return NULL; +} + +static void * +load_and_access (const char *mod, const char *func) +{ + /* Load module with TLS. */ + void *p = xdlopen (mod, RTLD_NOW); + /* Access the TLS variable to ensure it is allocated. */ + void (*f) (void) = (void (*) (void))xdlsym (p, func); + f (); + return p; +} + +static int +do_test (void) +{ + void *mods[6]; + + { + int ret = pthread_barrier_init (&barrier, NULL, 2); + if (ret != 0) + { + errno = ret; + printf ("error: pthread_barrier_init: %m\n"); + exit (1); + } + } + + pthread_t blocked_thread = xpthread_create (NULL, blocked_thread_func, NULL); + xpthread_barrier_wait (&barrier); + + printf ("maintls[%zu]:\t %p .. %p\n", + sizeof maintls, maintls, maintls + sizeof maintls); + memset (maintls, 1, sizeof maintls); + + /* Load modules with dynamic TLS (may use surplus static TLS + opportunistically). */ + mods[0] = load_and_access ("tst-tls-ie-mod0.so", "access0"); + mods[1] = load_and_access ("tst-tls-ie-mod1.so", "access1"); + mods[2] = load_and_access ("tst-tls-ie-mod2.so", "access2"); + mods[3] = load_and_access ("tst-tls-ie-mod3.so", "access3"); + /* Load modules with initial-exec TLS (can only use surplus static TLS). */ + mods[4] = load_and_access ("tst-tls-ie-mod4.so", "access4"); + mods[5] = load_and_access ("tst-tls-ie-mod5.so", "access5"); + + /* Here 1152 bytes of surplus static TLS is in use and at most 512 bytes + are available (depending on TLS optimizations). */ + printf ("The next dlopen should fail...\n"); + void *p = dlopen ("tst-tls-ie-mod6.so", RTLD_NOW); + if (p != NULL) + { + printf ("error: expected dlopen to fail because there is " + "not enough surplus static TLS.\n"); + exit (1); + } + printf ("...OK failed with: %s.\n", dlerror ()); + + xpthread_barrier_wait (&barrier); + xpthread_join (blocked_thread); + + /* Close the modules. */ + for (int i = 0; i < 6; ++i) + xdlclose (mods[i]); + + return 0; +} diff --git a/manual/tunables.texi b/manual/tunables.texi index 978e08f4fb..7f891c2710 100644 --- a/manual/tunables.texi +++ b/manual/tunables.texi @@ -247,6 +247,23 @@ e.g. LD_AUDIT, or will use more than 4 dynamic link namespaces as created by @code{dlmopen} with an lmid argument of @code{LM_ID_NEWLM}. @end deftp +@deftp Tunable glibc.rtld.optional_static_tls +Sets the amount of surplus static TLS in bytes to allocate at program +startup. Every thread created allocates this amount of specified surplus +static TLS. This is a minimum value and additional space may be allocated +for internal purposes including alignment. Optional static TLS is used for +optimizing dynamic TLS access for platforms that support such optimizations +e.g. TLS descriptors or optimized TLS access for POWER (@code{DT_PPC64_OPT} +and @code{DT_PPC_OPT}). In order to make the best use of such optimizations +the value should be as many bytes as would be required to hold all TLS +variables in all dynamic loaded shared libraries. The value cannot be known +by the dynamic loader because it doesn't know the expected set of shared +libraries which will be loaded. The existing static TLS space cannot be +changed once allocated at process startup. The default allocation of +optional static TLS is 512 bytes and is allocated in every thread. +@end deftp + + @node Elision Tunables @section Elision Tunables @cindex elision tunables diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 3b0c6d9620..997084fb4b 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -442,6 +442,9 @@ struct rtld_global EXTERN size_t _dl_tls_static_used; /* Alignment requirement of the static TLS block. */ EXTERN size_t _dl_tls_static_align; + /* Remaining amount of static TLS that may be used for optimizing + dynamic TLS access (e.g. with TLSDESC). */ + EXTERN size_t _dl_tls_static_optional; /* Number of additional entries in the slotinfo array of each slotinfo list element. A large number makes it almost certain take we never