From patchwork Tue Jul 29 15:49:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wilco Dijkstra X-Patchwork-Id: 117201 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 D154B3858C40 for ; Tue, 29 Jul 2025 15:50:44 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D154B3858C40 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=Mc7h5wlQ; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.a=rsa-sha256 header.s=selector1 header.b=Mc7h5wlQ X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from DUZPR83CU001.outbound.protection.outlook.com (mail-northeuropeazlp170120005.outbound.protection.outlook.com [IPv6:2a01:111:f403:c200::5]) by sourceware.org (Postfix) with ESMTPS id 760FD3858D1E for ; Tue, 29 Jul 2025 15:49:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 760FD3858D1E 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 760FD3858D1E Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=2a01:111:f403:c200::5 ARC-Seal: i=3; a=rsa-sha256; d=sourceware.org; s=key; t=1753804199; cv=pass; b=EV1zpgSh8k5cBEt4whsq8dIZ27QgY963eV2TG2k9sLIVFBOyADMluJuQ5Y9jAtWQdqP1KFf9QDov3pVWgKzKhtTt1IcZnnEnKh9n4ZNjbDyYRfoI01ZKyohVH/+Ui9hXDJy8E4lEYzRexUsS+Vm6z03IcvIAuYplKVVx9P8Nu20= ARC-Message-Signature: i=3; a=rsa-sha256; d=sourceware.org; s=key; t=1753804199; c=relaxed/simple; bh=3biFU0X+Yy6ICq7ptZ7CwUcphAAce7VV/bnjVHmdC6w=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=oKdb70BnuN+KG8LAJUteVtl93cJbQijNe+ies6LORBHDPCuLg8QIeXfFPZT4h9Hox0biWvXFzKnsikUu95MtQQjGMfwlcTfoXuM/cb/2I6PTArvl/Lsryg/2afJV1HvAsm8OKBKKC7nfpqtkVkgpUDxtZh7Vvvhji8B42PqIcwo= ARC-Authentication-Results: i=3; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 760FD3858D1E ARC-Seal: i=2; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=pass; b=W82Azn+oecOsjI/pF0jD3H4WEGgWvhZvidjS28Q3NloYKr5ZXiWS9axyKKFdH/SFUPVktoyMFeXnFpo+i3K6SgoZgzDZIkFXoT3+hz/+ek0gW+IAhQpDspfwzEJyUq/N3wYp7wCpiIale1BXo4Ch2rBAhZjgINIn8jfSFmVsvMHjH6TS+HwlTy4Gc/6pr3EuV+vhiAphjAtdChANSpKOLQwtMqoqknoEra1rWrJ+NsLTIxZMlesjB937qE0Ll7tDCXekKS+iHhpo6HRwAtFY1HPd1Spw0ey2ztvwco1LiFiAjRjls25PUGXiwLEnX166k6lNlK1f/nVdBaXL/IfYjg== 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=FTX09ER+LsfWkRuLNMbfbLfP9+jFAhGQwiGPsc/17uU=; b=cFPS4fyxsu/KQ2B+k7UDQm2P8nrPgfvx3ha4gYkwbLRTL58jfanbg5fiyFgTr3d2Q9q+5l97rXB6eu5+AJQakPdBVRissR2G+MtA2qmuEALI8V32Oldag6d/V4Pq3h4GiQfijSP6OFCRC40/ho1NImlwTIL9L5ChOluq9ddurkX0Xeem7+MjiJcJ7MEtPPtxAJIxy6tKtBGFObaWwZoQAxmS53GbHnD60aBildN1+V4LajCCei0tCfNpfxZYJXEUZfXSvzcKr3mIdmJsr7iHmdO9P/Z6YIAJQY6RZPTyIOg+M0vyoeD9JvyyTPqSSCxZpwwGTw2dp2qjeuccc7XVxA== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 4.158.2.129) smtp.rcpttodomain=sourceware.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=FTX09ER+LsfWkRuLNMbfbLfP9+jFAhGQwiGPsc/17uU=; b=Mc7h5wlQwO/qPrL9vv0Tw/pYZ/kXn1RR5mFe6Gh4xo3/+QhWySEDly+0Rb55RbqTj2xPC7Flye4VcwdKIx5ogk+iF9cielINTMxaM25T2LZmtcPz1j1ZwejLHqfoMvP0Xb6qViu5OTp5ht7ZBK5qaxES4iWzQsQNWaGMRTWFIew= Received: from AS9PR04CA0163.eurprd04.prod.outlook.com (2603:10a6:20b:530::19) by PA4PR08MB6112.eurprd08.prod.outlook.com (2603:10a6:102:f1::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8964.25; Tue, 29 Jul 2025 15:49:54 +0000 Received: from AMS0EPF000001A2.eurprd05.prod.outlook.com (2603:10a6:20b:530:cafe::60) by AS9PR04CA0163.outlook.office365.com (2603:10a6:20b:530::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8989.11 via Frontend Transport; Tue, 29 Jul 2025 15:49:54 +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 AMS0EPF000001A2.mail.protection.outlook.com (10.167.16.235) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8989.10 via Frontend Transport; Tue, 29 Jul 2025 15:49:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pXb2cm7Wu6Tam/DoJKu2HsgsPybJxz875hAcETFj399KAwtJ6rUx/zyO9uEapmbELheH5ZTtDQnk+93HZ9dlzWkaZQ7uSYmQ0dyPRL1xRJ8DdJ8vpldaKPT1X6K2DBkxcRoOJHhENf4YphbG90F94gapFmkVn5MNTCHvjw182gdZ1kJ23P8osTDRt5Ld9QE8ifZI6y5lcWdzKsL4qcDcB35Aj67DoNLRX03xEew229/cDkr/GU2LeYQF5JMqZ0fTSWkqYQ+EcLHa8mlvWME9YzOgh1Mdyv8U5IS134XtcG9Zj+dONnqgp5uaDBnpPhmt30ko+1+BchuNhcCmktteYQ== 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=FTX09ER+LsfWkRuLNMbfbLfP9+jFAhGQwiGPsc/17uU=; b=Ipayu5gcSbg9a4gmYlF3uLUF8b6lts6neq+y4Sb9WiRE+I1/i0F6toyBVJz65fdeqMSy6oOFNIAiiRoaFkH85aawtP/32BpA0UwZXB3biWTe2lVVJi9bGyt5/3A73A3DzEJ6ALzdZsnQrKDx7tK5suSIqKZN47k+etWRNYqmWbXWgFKS2yI+4KKPRZl/6JGzx/mwx9GRcs/6Fk+zYGZ0JLZY7KC+E9mRLEjjZsLUJdqynu84aL/1Yamt9qrorIzeV18hrnuFYX6Ym92a+ANSaf4wBr6uwQXNCKMa8ZQg+AeT6LyBNPXvqe7EvmWIiAclBE4CldWfAc3caWbThBA2yw== 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=FTX09ER+LsfWkRuLNMbfbLfP9+jFAhGQwiGPsc/17uU=; b=Mc7h5wlQwO/qPrL9vv0Tw/pYZ/kXn1RR5mFe6Gh4xo3/+QhWySEDly+0Rb55RbqTj2xPC7Flye4VcwdKIx5ogk+iF9cielINTMxaM25T2LZmtcPz1j1ZwejLHqfoMvP0Xb6qViu5OTp5ht7ZBK5qaxES4iWzQsQNWaGMRTWFIew= Received: from PAWPR08MB8982.eurprd08.prod.outlook.com (2603:10a6:102:33f::20) by AS8PR08MB6038.eurprd08.prod.outlook.com (2603:10a6:20b:23f::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8989.11; Tue, 29 Jul 2025 15:49:21 +0000 Received: from PAWPR08MB8982.eurprd08.prod.outlook.com ([fe80::b366:6358:236e:352d]) by PAWPR08MB8982.eurprd08.prod.outlook.com ([fe80::b366:6358:236e:352d%6]) with mapi id 15.20.8964.024; Tue, 29 Jul 2025 15:49:21 +0000 From: Wilco Dijkstra To: glibc developers Subject: [PATCH] malloc: Cleanup sysmalloc_mmap Thread-Topic: [PATCH] malloc: Cleanup sysmalloc_mmap Thread-Index: AQHcAKA5eKSejYaCQE2b6jFATxhMWQ== Date: Tue, 29 Jul 2025 15:49:21 +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_|AS8PR08MB6038:EE_|AMS0EPF000001A2:EE_|PA4PR08MB6112:EE_ X-MS-Office365-Filtering-Correlation-Id: 95da96a5-0e4c-40bc-4eef-08ddceb78f09 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|38070700018; X-Microsoft-Antispam-Message-Info-Original: =?iso-8859-1?q?byyhVlm0QUFemsKAz?= =?iso-8859-1?q?pQs3Hnqe0dkDsczWoe7YaLPH1hBnmu/jspHVjgwyzZFZrfD98/gyZq/VUsrs?= =?iso-8859-1?q?kHxj1r8lqjZB7wgUmjIgFq6jReiocOsgl3cW32ypFpzU3T4EMzxLtJ7PMiSB?= =?iso-8859-1?q?lrD4lvtg+lnBIrYVc1ot9OWNifiSD6xdD8OYTouZszMmprTvOEUKWBu/Mn+K?= =?iso-8859-1?q?osQSgAo3/IS83VOVkW63cKRwQa6DaT7atvzt4lEAifwml+dntNjX+rx6rj/u?= =?iso-8859-1?q?/OvclnjAwnnj+rhg7+nr4GGrSHM0X6WBV4PJBilQ0upKrC/8Y7ucE+q9YOv/?= =?iso-8859-1?q?hZfaqfPy9ZwvYAS4dfY3NxQmp/5bQIVE8CceCh4HKazmELmjt7NbgPPmTtId?= =?iso-8859-1?q?jI8h7uimAwtFzIPxX80iRP6OyLj7B3ord/D8qTz68XCX1i1BhNjAAeauEv6C?= =?iso-8859-1?q?w4PR2Xc1UXs2Ysv8jogba1IqbnTnj5YKYGRCMwDe2Y3o43w1PgwcFaqqdOsR?= =?iso-8859-1?q?XWEXdbD172mD4+1qrVTPSgBdIT6IwsU9G3097myHITuOI3Hyc2ZWZQaGNpCG?= =?iso-8859-1?q?mt2oKMIjVCA9dqtfBQyGyo1pQQu4Nsmuqh36vuRXKSLPYolXdivQvuYW/LZe?= =?iso-8859-1?q?pwzoVnOOSR3A7M5yZ3UJYXKBg0o2RqYB0dAcn/MLyydM+g0GCmnz6ePVXtiQ?= =?iso-8859-1?q?i8v8rnOsCmLe0OVKSt+H0UELnK1Va3+PcL2/ltPlGbfnGYa5vMwAC1VMKPAu?= =?iso-8859-1?q?oi61Y/uKmBr9xsg57ZB2c591M4MAdTD4HqiEjpVki8loUmFG4+hZv9oLaQv4?= =?iso-8859-1?q?ypnwhZQ7gJeExP/NZA8nEVM5714HxOXCMk4QYMA3kXJYRrSMHW03PuQZSLTB?= =?iso-8859-1?q?CEH/554tNc3lxBDTZ7g+txI6Cd87/y9EUpcNio58A6p7cfqDbr2oh0QYfDVh?= =?iso-8859-1?q?qcOHqsX5amBbzswSv/IsnYzC/pYn5Uq6oyxVs0XKioCOymOL2XdzfY8n/Zyg?= =?iso-8859-1?q?bX3r2MtVzaryGAbRBICqNCj1C9lPlklPg+f5ghwiy7hZGjrx01Ti+L9NCa6p?= =?iso-8859-1?q?GIjbLGSRXMAeAOuwXcT9coNGQzSOjZpqygy/X3QKIamsKstWKBua7hs4UqNi?= =?iso-8859-1?q?TstzQAIAK560qVBkC/fhcSsOCEAOKFMVFJi5u6HaXFEUaKrpwk8/bsgddyqm?= =?iso-8859-1?q?ASXu2mEijbZB8sKGQQzl6k1Wk3roKwifS4jleZU5g2pj7fw/op4a4JQXp54k?= =?iso-8859-1?q?DlEZHYwQm7QxF5LgS1Hfb2cEeachWGtEymj3+bf/aIDZhkZnESxXBaougJdw?= =?iso-8859-1?q?r3lHPm73sSBiIMvoCThsptMtBTGyg1MuFlak+huMnXz2Fkmn+YAiHi0MJBp0?= =?iso-8859-1?q?aE787TyBB/noZ0nsC1XEMwXKrj3jxZyqB+QPIcidg8/823Qwx8o/9K9yEceN?= =?iso-8859-1?q?KO8vpJvYSOuOaCr58ia21RO4LeLcsKf1Ac3VA6SDNPPjZPGlxU982+QwSv/3?= =?iso-8859-1?q?h4/tbjtciXqqd3wh7lmZ+8nvANDANdBVfuVaQ=3D=3D?= 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)(38070700018); DIR:OUT; SFP:1101; MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6038 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AMS0EPF000001A2.eurprd05.prod.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: c6746b98-18cb-46fc-4eb2-08ddceb77bf8 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|35042699022|376014|14060799003|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?iso-8859-1?q?dcF40kHGzDfWqsQpLPEvw6ySm9?= =?iso-8859-1?q?3r5WBYnBvaD1wsmXGFyV2eYFYkQbIfU/ebzGXWv8zE8P5VYL3B+f74V4oLWm?= =?iso-8859-1?q?v3o5wRtO7g3WZEWnCJFKg4TTgeqWp0ulmc2lmtuVYGUDrL+HXcvDDHlCv0Un?= =?iso-8859-1?q?tMNIF2FNgNyX4S4GClWbkgZsIM29fHPoFUSrSnwMyNJAL4JxRUOzddphAz5F?= =?iso-8859-1?q?Q5Aha13oZm74OFJYUxtwsJj5xxqPDYuw3NUqKRIQuV1B52dMboSlZCvIFTzM?= =?iso-8859-1?q?/amO49rB155WmpKl5UA9hsIbE7XT6NOpSE/GOheWQBB7rN+FoDn0cUtFAZip?= =?iso-8859-1?q?kG2SOp3iTVsgRTg9R7BAho+6GMVrB7n+Si4lJUuXZjtpLKAppyWHQ7UV7Yfm?= =?iso-8859-1?q?KETYMGRONaB5lKH4k6lC6BFw9TzVK5yLZbMNvSCwj2dUMuyiDUs9AK/WLY6D?= =?iso-8859-1?q?yhfrLx5WGw89dIq7j1n+nUF6mLteZmmRbiQYOP0RcAVrCGH4IwAfP9Oy0Hpx?= =?iso-8859-1?q?dsUVJZ+Kv0/44YK3qewDX052dQq79Fvo9nXNTmc9Eaa1Q/U2dPVRtuMXDsMA?= =?iso-8859-1?q?o+M+34kgwFd0FuHPmiu2hpt6lXKAuCdnLj1CNT1Dpi6whcI0K1bsbtwG34Iw?= =?iso-8859-1?q?Y/72k+Q2l1d3/vexmwsa6/TGOjngbYtvRusjHz+uMiPWfAKy7tAmibR74pFo?= =?iso-8859-1?q?OEf04b5IZ2BUA5EfqKoYq5DoCwDQ6CxgtDocV03d6Vjm0xYIC+16kMPkMB4r?= =?iso-8859-1?q?NeSfiYQxygiP9nEWNLa7NmzDGnfbOAYhq2glCW5Uefvo71XbBBGHys0D/FPW?= =?iso-8859-1?q?UqgLwP9NBD4s7mJrowfBt42ZGZZ+d/OCheLpuuCZvXWYv4GZ/yaI9KzXXIKM?= =?iso-8859-1?q?RKG5TnMF5AHK6cnLHN4nZytFDhjXQo5KjD20dWCsGLgHulnGW9bTafLLqZVW?= =?iso-8859-1?q?ETbKr4NsIa4Q5nDzIA6vocPE1J7SZ0uIAomA9jIb87vQ+XH+ZAVVGzHRAfEP?= =?iso-8859-1?q?891CUONSgXhzc2YuagYjQGtaqwRh+LrKGiGSYZJbUapU7tf7RQMZZbLkv7wT?= =?iso-8859-1?q?8JRRhM9+DqZIMfqTyoOc3xjyWFgh+yvX86qjN8Akoz2ytHZp0GvPDhKLPNa0?= =?iso-8859-1?q?NDGvQegLn5UzFXTfH8umPrEbb10xvM3iXFSenJHsQc/okuqWmxu0wSOXgfpQ?= =?iso-8859-1?q?uH047DuJ1SF4qkRPxFUPMOEuRvvT/qBpBxz2n7CtpuOOWgYZzH8kBx8tcV9K?= =?iso-8859-1?q?MQz7SNvisB56YGf9qrZ4ORfQqf1Aw+Cjman6Ph8+t8Ke8tPiKVqV3hy+cXEM?= =?iso-8859-1?q?9pX2ftzNky4d1+2n74s65McfHZaEkTkfvEh0afpkfL8cQNuIze7Ou5+80wda?= =?iso-8859-1?q?B+KwTEt73y9zLjN+daQZiY4B2ZBo6pSWWD5IBoRHYlytC7WztmC/Y89IyE52?= =?iso-8859-1?q?kGRpwU6gZ7U+vGJItPFT/XHUQ0ubBZ3S+/rmnozV8MWiwnGDzuURT0XpDYwB?= =?iso-8859-1?q?JFe4L7wJohMF0XEZrztuMyh3a1ovK+Xv6KOt5IpuXjeemntgM0TnHjXWMhuJ?= =?iso-8859-1?q?3Uomi/iuOl?= 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)(1800799024)(35042699022)(376014)(14060799003)(36860700013)(82310400026); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jul 2025 15:49:53.0153 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 95da96a5-0e4c-40bc-4eef-08ddceb78f09 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: AMS0EPF000001A2.eurprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR08MB6112 X-Spam-Status: No, score=-10.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FORGED_SPF_HELO, GIT_PATCH_0, SPF_HELO_PASS, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.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 Cleanup sysmalloc_mmap - simplify alignment code since it is always a constant. Remove av parameter which is only used in do_check_chunk, but since it may be NULL for mmap, it will cause a crash in checking mode. Remove the odd check on mmap in do_check_chunk. Passes regress, OK for commit? diff --git a/malloc/malloc.c b/malloc/malloc.c index ee4ea71d7323bf54da708c9af5fb7d2bcc2a33b5..6068de8c2d313f95872d0bd6ff8b78af66e2a16c 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -2075,12 +2075,13 @@ static void do_check_chunk (mstate av, mchunkptr p) { unsigned long sz = chunksize (p); - /* min and max possible addresses assuming contiguous allocation */ - char *max_address = (char *) (av->top) + chunksize (av->top); - char *min_address = max_address - av->system_mem; if (!chunk_is_mmapped (p)) { + /* min and max possible addresses assuming contiguous allocation */ + char *max_address = (char *) (av->top) + chunksize (av->top); + char *min_address = max_address - av->system_mem; + /* Has legal address ... */ if (p != av->top) { @@ -2100,11 +2101,6 @@ do_check_chunk (mstate av, mchunkptr p) } else { - /* address is outside main heap */ - if (contiguous (av) && av->top != initial_top (av)) - { - assert (((char *) p) < min_address || ((char *) p) >= max_address); - } /* chunk is page-aligned */ assert (((prev_size (p) + sz) & (GLRO (dl_pagesize) - 1)) == 0); /* mem is aligned */ @@ -2404,34 +2400,16 @@ do_check_malloc_state (mstate av) /* ----------- Routines dealing with system allocation -------------- */ -/* - sysmalloc handles malloc cases requiring more memory from the system. - On entry, it is assumed that av->top does not have enough - space to service request for nb bytes, thus requiring that av->top - be extended or replaced. - */ +/* Allocate a mmap chunk - used for large block sizes or as a fallback. + Round up size to nearest page. Add front alignment if MALLOC_ALIGNMENT + is larger than CHUNK_HDR_SZ. Add SIZE_SZ at the end since there is no + following chunk whose prev_size field could be used. */ static void * -sysmalloc_mmap (INTERNAL_SIZE_T nb, size_t pagesize, int extra_flags, mstate av) +sysmalloc_mmap (INTERNAL_SIZE_T nb, size_t pagesize, int extra_flags) { - long int size; - - /* - Round up size to nearest page. For mmapped chunks, the overhead is one - SIZE_SZ unit larger than for normal chunks, because there is no - following chunk whose prev_size field could be used. - - See the front_misalign handling below, for glibc there is no need for - further alignments unless we have have high alignment. - */ - if (MALLOC_ALIGNMENT == CHUNK_HDR_SZ) - size = ALIGN_UP (nb + SIZE_SZ, pagesize); - else - size = ALIGN_UP (nb + SIZE_SZ + MALLOC_ALIGN_MASK, pagesize); - - /* Don't try if size wraps around 0. */ - if ((unsigned long) (size) <= (unsigned long) (nb)) - return MAP_FAILED; + size_t align = MALLOC_ALIGNMENT - CHUNK_HDR_SZ; + size_t size = ALIGN_UP (nb + align + SIZE_SZ, pagesize); char *mm = (char *) MMAP (NULL, size, mtag_mmap_flags | PROT_READ | PROT_WRITE, @@ -2446,41 +2424,10 @@ sysmalloc_mmap (INTERNAL_SIZE_T nb, size_t pagesize, int extra_flags, mstate av) __set_vma_name (mm, size, " glibc: malloc"); - /* - The offset to the start of the mmapped region is stored in the prev_size - field of the chunk. This allows us to adjust returned start address to - meet alignment requirements here and in memalign(), and still be able to - compute proper address argument for later munmap in free() and realloc(). - */ - - INTERNAL_SIZE_T front_misalign; /* unusable bytes at front of new space */ - - if (MALLOC_ALIGNMENT == CHUNK_HDR_SZ) - { - /* For glibc, chunk2mem increases the address by CHUNK_HDR_SZ and - MALLOC_ALIGN_MASK is CHUNK_HDR_SZ-1. Each mmap'ed area is page - aligned and therefore definitely MALLOC_ALIGN_MASK-aligned. */ - assert (((INTERNAL_SIZE_T) chunk2mem (mm) & MALLOC_ALIGN_MASK) == 0); - front_misalign = 0; - } - else - front_misalign = (INTERNAL_SIZE_T) chunk2mem (mm) & MALLOC_ALIGN_MASK; - - mchunkptr p; /* the allocated/returned chunk */ - - if (front_misalign > 0) - { - ptrdiff_t correction = MALLOC_ALIGNMENT - front_misalign; - p = (mchunkptr) (mm + correction); - set_prev_size (p, correction); - set_head (p, (size - correction) | IS_MMAPPED); - } - else - { - p = (mchunkptr) mm; - set_prev_size (p, 0); - set_head (p, size | IS_MMAPPED); - } + /* Store offset to start of mmap in prev_size. */ + mchunkptr p = (mchunkptr) (mm + align); + set_prev_size (p, align); + set_head (p, (size - align) | IS_MMAPPED); /* update statistics */ int new = atomic_fetch_add_relaxed (&mp_.n_mmaps, 1) + 1; @@ -2490,7 +2437,7 @@ sysmalloc_mmap (INTERNAL_SIZE_T nb, size_t pagesize, int extra_flags, mstate av) sum = atomic_fetch_add_relaxed (&mp_.mmapped_mem, size) + size; atomic_max (&mp_.max_mmapped_mem, sum); - check_chunk (av, p); + check_chunk (NULL, p); return chunk2mem (p); } @@ -2584,11 +2531,11 @@ sysmalloc (INTERNAL_SIZE_T nb, mstate av) { /* There is no need to issue the THP madvise call if Huge Pages are used directly. */ - mm = sysmalloc_mmap (nb, mp_.hp_pagesize, mp_.hp_flags, av); + mm = sysmalloc_mmap (nb, mp_.hp_pagesize, mp_.hp_flags); if (mm != MAP_FAILED) return mm; } - mm = sysmalloc_mmap (nb, pagesize, 0, av); + mm = sysmalloc_mmap (nb, pagesize, 0); if (mm != MAP_FAILED) return mm; tried_mmap = true; @@ -2672,7 +2619,7 @@ sysmalloc (INTERNAL_SIZE_T nb, mstate av) /* We can at least try to use to mmap memory. If new_heap fails it is unlikely that trying to allocate huge pages will succeed. */ - char *mm = sysmalloc_mmap (nb, pagesize, 0, av); + char *mm = sysmalloc_mmap (nb, pagesize, 0); if (mm != MAP_FAILED) return mm; }