From patchwork Wed Mar 11 18:35:04 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wilco Dijkstra X-Patchwork-Id: 131543 X-Patchwork-Delegate: dj@redhat.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from vm01.sourceware.org (localhost [127.0.0.1]) by sourceware.org (Postfix) with ESMTP id 419404BB5888 for ; Wed, 11 Mar 2026 18:37:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 419404BB5888 Authentication-Results: sourceware.org; dkim=pass (1024-bit key, unprotected) header.d=arm.com header.i=@arm.com header.a=rsa-sha256 header.s=selector1 header.b=Hirzas5L; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.a=rsa-sha256 header.s=selector1 header.b=Hirzas5L X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from OSPPR02CU001.outbound.protection.outlook.com (mail-norwayeastazon11013064.outbound.protection.outlook.com [40.107.159.64]) by sourceware.org (Postfix) with ESMTPS id CBDDA4BB3BD1 for ; Wed, 11 Mar 2026 18:36:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CBDDA4BB3BD1 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=arm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org CBDDA4BB3BD1 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=40.107.159.64 ARC-Seal: i=3; a=rsa-sha256; d=sourceware.org; s=key; t=1773254179; cv=pass; b=ErJVYIe1/wgheYDabEY5DSU9SZ0OusrrqraMnu7dG0zWKEGvn+MMbgD9MM/8LDYl8RGRhXzHFZJm+NVwyO7dIWhexF9+1Qd0Xw8aby5Eu25pSOzGYyrE70e4bNGAwXunJWQj938zQVR23SmE+d6/fNoGXIdfeWXz47dCccXjANM= ARC-Message-Signature: i=3; a=rsa-sha256; d=sourceware.org; s=key; t=1773254179; c=relaxed/simple; bh=mGp/mJ3vDzSQOeUPXEYnK0VhcKXvNzq2qTZwUDR1sPI=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=eGMsPYivfSfOT8XqTjfugdo9kOH928jjXbZmbMOMXziSuVVwcVp9zV9zeeVQEV4p5WfIU5w+/KPAueteNc9bz/5Y9fiILNlmsH/I5s85AJ7v5V+LQPT/K/gRiQznQSUZj3d6YxgzdyxYAV+QJwaV2fMQUOhbF4ktwBdx56cotpM= ARC-Authentication-Results: i=3; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CBDDA4BB3BD1 ARC-Seal: i=2; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=pass; b=OtQ1bIvuJF85fmm1Yu6bQ45BVCMPcqPG+wd0fPtjXYdz1F+WjFSnjhCaNwIc1+3p1KaYtJZWXqtKYx+Qbcy30uBjVk4vOUyubSU7SI+XYPS7vdP3Ij44xxY4EmooByWGrz8ir0bveNqn6lefBIs6SsgLE5jTO1qmV+fR5IyuqhSbnxFYCR1wVOXTYcHIAN7Y7RkNmAOZfrXgbwSgtV2xtwTiFlsO3zRRgGsFVqssZuI2ZxxTIV9URu5bgPNJn1RmMDbca9KcbMPAqzD7H5PmEXFyQAlhfhfv7ydyycZk/05r+VflS3T9EdWXX8yx8TM+H58iQ+9gA3If33DbvNjdzw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=RqDMT7gRmy2p2vLw7TeQmSj54yHW/gziN+TwBHNp5gY=; b=uhVfrSBQ8T3wKxJGXH0RdImWECn1ccUCd2p8cSSKGU6jBH3uKW96xL4iMceIEEd9P2k7CgwOHEz7I74G2uQx+wYysLs38P/NUrpK4cISCjGI/Jj5mI3FZAq8ShBHOPvcUu/DJz94ZQz/wtq5VR0w+K2j7ZUmsklPW0SE9a2z54i5zKBn3UpmNm5MSfE+vdVVGy+WQfpswXzhGDoLfeh97aSfSqPkyrYqxaF3pwT0SzLFi2oMHBW9C/iwTegfF+bWDD8Dtk8VfaYKGbOF2Yw3Wv1D7r51ZEnbduWBJggNcAdKUipIoi6RpbHE5w70ngPmerk8b64S5/udYPV1Yp/nXQ== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 4.158.2.129) smtp.rcpttodomain=linaro.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=arm.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dkim=[1,1,header.d=arm.com] dmarc=[1,1,header.from=arm.com]) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=arm.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RqDMT7gRmy2p2vLw7TeQmSj54yHW/gziN+TwBHNp5gY=; b=Hirzas5LIaS3kOrbaSen00YESprJdYr/IEBsBU87FDyIzffICWtWio/a6VrduNdHho4iTZ8Dd4wZe2E/FBguHE4cwXN8CBrIfrv+iiMcdg5Q0HKqJhrkk9Q+60tqgMpuLD9BJyNh50CdIxXzRHCFQmCqvopsR9W/Qh9JeS21a8w= Received: from DU7P194CA0018.EURP194.PROD.OUTLOOK.COM (2603:10a6:10:553::9) by AS8PR08MB9693.eurprd08.prod.outlook.com (2603:10a6:20b:617::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9700.12; Wed, 11 Mar 2026 18:36:09 +0000 Received: from DU6PEPF0000B621.eurprd02.prod.outlook.com (2603:10a6:10:553:cafe::ee) by DU7P194CA0018.outlook.office365.com (2603:10a6:10:553::9) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9678.26 via Frontend Transport; Wed, 11 Mar 2026 18:36:02 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 4.158.2.129) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=arm.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 4.158.2.129 as permitted sender) receiver=protection.outlook.com; client-ip=4.158.2.129; helo=outbound-uk1.az.dlp.m.darktrace.com; pr=C Received: from outbound-uk1.az.dlp.m.darktrace.com (4.158.2.129) by DU6PEPF0000B621.mail.protection.outlook.com (10.167.8.138) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9678.18 via Frontend Transport; Wed, 11 Mar 2026 18:36:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xuBlMauFEZV/1vfM3C9lMd+8zQSQEysW1z3qUVpfORnfOB52JWx89vaWIlgXRmnegh337JkOzNi+40kiOT+7U/TrOZbamo9Od//1UT2m2i0RIuieYMhKCfUMihKFITJeHYIzyAl24hVg1rj4nrrn3JnF8WKCSTUukifSVSUniyHFK/FuIkfJkc/rp0bpyXHPpjZpILnwMbvS+8qJwuYAOb/OZEGP6vYK7dzi3EbOekN2rmmkaZjazVEJiI9bcfpJprEod0yz4TV+Mcg2g6X/4pjLaA/F8go733D9QfSWLKrRsodv1AZjtgXhRP+UoUhT2teASs4K+J8WpItfYxHmDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=RqDMT7gRmy2p2vLw7TeQmSj54yHW/gziN+TwBHNp5gY=; b=CtEuCKI1JtjEMswL+NNM/xp6zx/rRMlpojCBd453rBSd9t88j+S8zeX2asls4O8wpqCFBhU6ntyMb8E+k3SGZHPHCILZUbelotSV0aoqyK3XuT8zKvA1x4BKKyD+GbnDlcjiu9yDgn/WQE9uSiZZ/0hGMhvEAeK1a1Rv5QP46WcnX3R01FcTdAsUgfS6JynEGhkBlyfC1dwnIjRtuv4IE4GqOeXWsIVpkfq8lyKDMN2IthhC6ZTK2y4AkKGc+A36BYV28oIIoqCF1HtlVbC26n4quNZvxMmv0SmPeW6mfFg8IuXjBGrGuzMZKYqCJCSJguuonPK5bNLiPsQz58SX+g== 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=arm.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RqDMT7gRmy2p2vLw7TeQmSj54yHW/gziN+TwBHNp5gY=; b=Hirzas5LIaS3kOrbaSen00YESprJdYr/IEBsBU87FDyIzffICWtWio/a6VrduNdHho4iTZ8Dd4wZe2E/FBguHE4cwXN8CBrIfrv+iiMcdg5Q0HKqJhrkk9Q+60tqgMpuLD9BJyNh50CdIxXzRHCFQmCqvopsR9W/Qh9JeS21a8w= Received: from PAWPR08MB8982.eurprd08.prod.outlook.com (2603:10a6:102:33f::20) by GV2PR08MB8680.eurprd08.prod.outlook.com (2603:10a6:150:c2::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9678.25; Wed, 11 Mar 2026 18:35:04 +0000 Received: from PAWPR08MB8982.eurprd08.prod.outlook.com ([fe80::5821:707a:c30b:dd9a]) by PAWPR08MB8982.eurprd08.prod.outlook.com ([fe80::5821:707a:c30b:dd9a%5]) with mapi id 15.20.9700.010; Wed, 11 Mar 2026 18:35:04 +0000 From: Wilco Dijkstra To: Adhemerval Zanella Netto , Dev Jain , Dimitri John Ledkov CC: glibc developers Subject: [PATCH v2] malloc: Show hugetlb tunable default in --list-tunables Thread-Topic: [PATCH v2] malloc: Show hugetlb tunable default in --list-tunables Thread-Index: AQHcsYQJ5MsOACt82kaWBJlm6wxdRQ== Date: Wed, 11 Mar 2026 18:35:04 +0000 Message-ID: Accept-Language: en-GB, en-US Content-Language: en-GB X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; x-ms-traffictypediagnostic: PAWPR08MB8982:EE_|GV2PR08MB8680:EE_|DU6PEPF0000B621:EE_|AS8PR08MB9693:EE_ X-MS-Office365-Filtering-Correlation-Id: 28a03a13-86fb-4e40-a7d6-08de7f9d1068 x-checkrecipientrouted: true nodisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; ARA:13230040|366016|376014|1800799024|38070700021|18002099003|56012099003; X-Microsoft-Antispam-Message-Info-Original: G4YcMqyqJ1EvzYnc1rcwHp0cbV5BGjmfun1yq2c2ACUK3gnzUeDhjNDFVbgenaxeHIBaBuPWMl9zIx8obtCOPrNUhDLLcfJckju3uvf+3kTAsSlDIB+p/VKAIH0tRSkPhPOCcs1e2sW+N4hgykfZoCnIfFGGD2sKedmfA96HeATwvuNT9hXLCDUsOGdJvDkroVX58QnKp8J5Tl0fxSIejnTSbpBNDT6VoLvSlPePcGkRuB4hePxgl4Q2n+uAzT873RTGn//889B/a43fa3rKXPmO36s5rU+ifBHv4QuW3TleGRuc0DFc8t45sJvM7smSkuHS6lwfUc376UK06QrhZA+2BIpHVWuvfDYPPDGvWLhrI6qff7sAsk1KtohIjdBc7xW1OJN2PCEceRG+S6CQYon9S3H+mKwW5axf6Er+PjsgwImpbNofXaU8DI6u589HxO7WsKcLFxhqJ+/Pjlla3vNoHmbXBXwiMPvaSKgTAVtEboW6DCMjh4/gorN1XNuP0yHWllyoO6cdiIsTSCm8SldZZDmHFfh9oEuu8h+kyVnavKy2DFLpDEZwo4XiVCupKmzVfGr7Tc3hT+hP8qJBOzeMwyfcEzzOxC6v5DKYldaLujN1c3qhirTXVVOjmkyEHEAQ2XJDcycEWEiedOXIqyk8SByGZfn32VSXXYz97DVT4/pvMoFf8vR2rHW5KQZLBhLskFa8SB8LUfDM5cfLkEFuo/Ld4naFiIObNhaJZW8Vp07aui/oxagZ5MZCcGeu+CAzvYiP4bcUKXKA3Qo4rKYspxt9+KXHPsxH2UPqn+4= X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAWPR08MB8982.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230040)(366016)(376014)(1800799024)(38070700021)(18002099003)(56012099003); DIR:OUT; SFP:1101; MIME-Version: 1.0 X-Exchange-RoutingPolicyChecked: ox+IgoXGXXu175971JRmotSNDYDn6u0KODYZrU2ZAk8ka/qCx7/fzON/WMOqpnjA1E/PRoJ2qv4BRXZM/sp5CCMZgjLpm5bA7yQmVtrUNbw/iVjpCD0D3TyOUlF1zod8Ud7+h+eJgE0LamjNJsjzkftEr3jfB2ptjzxII3KjmbtxQOMTOoODVaFp01TUEzwdom6dlujwBekyDe8XbWTAPAXqK2o8R42Ie0yAXPjaxeG8KryU7hdxAZYKRw/J0swUYwPIcLyi+TF+uGI19MEIr4VdMQVWnWF3HmUgrHOvl29RfdJl8nmyzqtnJFbexIK/BGV38V42RIQMq1BGU+2ucw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR08MB8680 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DU6PEPF0000B621.eurprd02.prod.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: f111634d-47ea-45f6-acc1-08de7f9ce97d X-Microsoft-Antispam: BCL:0; ARA:13230040|14060799003|1800799024|35042699022|36860700016|376014|82310400026|56012099003|18002099003; X-Microsoft-Antispam-Message-Info: pX1bhmjR/+3MUWJJ5J/N9jPpkKK0m81hCYufq3BOGO/GaAlPzUPx1ThMVSsgZDwyvm2bh0djJnTnqyPhIo/fkni7qgdKlGGtqBWIqoXQQgTe6JJ65dnL7zX9NW5GDQb/8Eb/+wcVLSmohbPWAKtzgRYLaxt7+Y8pdJAH4rNt/J0HxEQyDKAnOe8bmES6bdSsPinqCMRJzLadFNyuSOtVOQQwJGxPeVom2pleayPmIMpT2EPVQSLimrsj7sgN9Ai4d3WmWpGfXdesDwbC2iEhp98kyhqKMtd3v8sPBNuLv461Dl30E95gonx085aTE38y3biqOhNEIaNvj2IbfYA6Upc1IBcld55MviMcA45Fm5DamU+xoVGCBIWhUF8TbqzZC6U0URsgXfVwYwXbH5v7OnP1S37oyVb3zXiEEdD514eQA8EMUPSbPwAFgdsG8xI3rPZn36wT0EYwNIa2iFqxucikUwcxGPStXVfjT2jG9WIcjFs2+x+iKQ8P92hV5S7g6nJurAwe5kpHqO6j1f9H2L6gWKN+1ksvM6nQrh84Dz1fFYT45PgReKXC+cHbhLObaBZvdX4K/mIfLtTDzrzw2ZpT/0aTg37x9PpQoxBy80qYpxHd6Xs2rA9OJKDeKhzga/t632pud4B+1A5T3OBZNuMHj3nmND43mdTUuw8UUB2vdxdSrzPd9x45W7NjbUEGGcoSux9QNyWLzj+tDu5fN4WLj+o2hyBhMwUUzEK2XCkDYoQMExqwhjw0AgdJT4EsNfXY0zlXDWVjmoe2ZbLynw== X-Forefront-Antispam-Report: CIP:4.158.2.129; CTRY:GB; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:outbound-uk1.az.dlp.m.darktrace.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230040)(14060799003)(1800799024)(35042699022)(36860700016)(376014)(82310400026)(56012099003)(18002099003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EYS1qdUPNK5oCfXSkVwR4WXDX0cqT7Q/2e71giBFTBzCD/++DvAtUQ5wDaFqPwIVXur8iBZ3LbswUgx0C4luop5O2HVh1HKg/AWHzr5lVUGh8VUEYkAtCi+u9czu+mhhcKL6zgpAoX3TWIPENOZMXdR3sB+Dqgxmb3gKoFu4ker26bLhXCZoHxREMViEULCXu7C2fBg3QwmjdC1hvGGVJioj17tlKaCb1YxLVgeJISmM0i1yJURR0IeMNF/Igarx3/71CYcqYw6zsTygAhzgnR/vz1a9xxcMFISy6NxoVH2ThikhQ7DFmu+XGAcq66cwROVnai1vtdmW/7qF3AjwW5HR6OweBdv5wbPpymO4hxWVpnXreFscTRep3bWBrN1AXWdVFyGrC94i8xU9+nZs2Wo+qDG8+JMBf7V0M7+rw201AHtSz2iICeMBdvURYDbm X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Mar 2026 18:36:09.3983 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 28a03a13-86fb-4e40-a7d6-08de7f9d1068 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[4.158.2.129]; Helo=[outbound-uk1.az.dlp.m.darktrace.com] X-MS-Exchange-CrossTenant-AuthSource: DU6PEPF0000B621.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB9693 X-Spam-Status: No, score=-8.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FORGED_SPF_HELO, GIT_PATCH_0, KAM_LOTSOFHASH, RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_PASS, SPF_NONE, TXREP, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org v2: Reset thp_pagesize with glibc.malloc.hugetlb=0 as suggested by Dev, move tunable to dl-tunables.c, fix broken --list-tunables testcase. Update the hugetlb tunable default in elf/dl-tunables.c so it is shown as 1 with /lib/ld-linux-aarch64.so.1 --list-tunables. Move the intitialization of thp_mode/thp_pagesize to do_set_hugetlb() and avoid accessing /sys/kernel/mm if DEFAULT_THP_PAGESIZE > 0. Switch off THP if glibc.malloc.hugetlb=0 is used - this behaves as if DEFAULT_THP_PAGESIZE==0. Fix the --list-tunables testcase. Passes regress, OK for commit? Reviewed-by: DJ Delorie diff --git a/elf/dl-tunables.c b/elf/dl-tunables.c index bdb1de4ceba40b17fe5e10be246702b8bd25a812..1440d3fa6a52ad8549e2e3c53b8b6ccf55d82736 100644 --- a/elf/dl-tunables.c +++ b/elf/dl-tunables.c @@ -33,6 +33,7 @@ #include #include #include +#include #define TUNABLES_INTERNAL 1 #include "dl-tunables.h" @@ -296,6 +297,10 @@ __tunables_init (char **envp) char *envval = NULL; char **prev_envp = envp; + /* Default to glibc.malloc.hugetlb=1 if DEFAULT_THP_PAGESIZE is non-zero. */ + if (DEFAULT_THP_PAGESIZE > 0) + TUNABLE_SET (glibc, malloc, hugetlb, 1); + /* Ignore tunables for AT_SECURE programs. */ if (__libc_enable_secure) return; diff --git a/elf/tst-rtld-list-tunables.sh b/elf/tst-rtld-list-tunables.sh index 669898d8c050b6b5a89f679e37b921d6f457e8e1..11b9b4597a8faceceac43135a61898ceea58c16b 100755 --- a/elf/tst-rtld-list-tunables.sh +++ b/elf/tst-rtld-list-tunables.sh @@ -26,16 +26,8 @@ run_program_env=$3 LC_ALL=C export LC_ALL -# Unset tunables and their aliases. -GLIBC_TUNABLES= -MALLOC_ARENA_MAX= -MALLOC_ARENA_TEST= -MALLOC_CHECK_= -MALLOC_MMAP_MAX_= -MALLOC_MMAP_THRESHOLD_= -MALLOC_PERTURB_= -MALLOC_TOP_PAD_= -MALLOC_TRIM_THRESHOLD_= +# Unset tunables. +export GLIBC_TUNABLES=glibc.malloc.hugetlb=0 ${test_wrapper_env} \ ${run_program_env} \ diff --git a/malloc/arena.c b/malloc/arena.c index 75f2f32b5f61a33a06dc285ca9899a708c78cf10..d2ed6279226856d630cfdf734303c4b936512f58 100644 --- a/malloc/arena.c +++ b/malloc/arena.c @@ -275,15 +275,6 @@ __ptmalloc_init (void) __always_fail_morecore = true; #endif - /* Enable THP if DEFAULT_THP_PAGESIZE is non-zero. Avoid quering the THP - page size or mode since accessing /sys/kernel/mm is relatively slow and - might not be accessible in containers. */ - if (DEFAULT_THP_PAGESIZE > 0) - { - mp_.thp_mode = malloc_thp_mode_madvise; - mp_.thp_pagesize = DEFAULT_THP_PAGESIZE; - } - thread_arena = &main_arena; malloc_init_state (&main_arena); diff --git a/malloc/malloc.c b/malloc/malloc.c index 6455a1b0e0b85da0caaba4a5d922e1660fab5bb5..6a888b0eb7de53ae7b814275e86d2bd2f06b5e53 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -5017,10 +5017,26 @@ do_set_mxfast (size_t value) static __always_inline int do_set_hugetlb (size_t value) { + /* Enable THP if DEFAULT_THP_PAGESIZE is non-zero. */ + if (DEFAULT_THP_PAGESIZE > 0) + { + mp_.thp_mode = malloc_thp_mode_madvise; + mp_.thp_pagesize = DEFAULT_THP_PAGESIZE; + } + if (value == 0) - mp_.thp_mode = malloc_thp_mode_never; + { + /* Turn off THP support completely. */ + mp_.thp_mode = malloc_thp_mode_never; + mp_.thp_pagesize = 0; + } else if (value == 1) { + /* Avoid querying the THP page size/mode since accessing /sys/kernel/mm + is relatively slow and might not be accessible in containers. */ + if (DEFAULT_THP_PAGESIZE > 0) + return 0; + mp_.thp_mode = __malloc_thp_mode (); if (mp_.thp_mode == malloc_thp_mode_madvise || mp_.thp_mode == malloc_thp_mode_always)