From patchwork Thu Oct 27 15:32:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szabolcs Nagy X-Patchwork-Id: 59530 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 F32F3381D46B for ; Thu, 27 Oct 2022 15:33:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F32F3381D46B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666884817; bh=3E43d3fjqwaY7HLjnmrqW/fLJVpQVv3/T2nVkWW+6XM=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=v1wAe+GAcbhNVIBInM72LruMaNqAN+UXXSrVZBvpmrd4cgymlZE6W4Y4M4aiKl25s EmRNPnIeuu2QK3mWqXB4iwQuzDovj9tvmWjjlHxSJ7AVArfUrnVftRfnFyBZCfnejv mKzYjUEiK21mYqBaqg4bc6z51+HMCA2uyk9SJldU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80082.outbound.protection.outlook.com [40.107.8.82]) by sourceware.org (Postfix) with ESMTPS id 717C1381E706 for ; Thu, 27 Oct 2022 15:33:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 717C1381E706 ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=CBSqbhkiN6pwTZElb0Fv9wOHB59AQwa0Pp08NTZWY3EAQ9oabXw33XdUzgK/ay866eLOLhT8U0kMoJNZCT1Z9l+0PW56eOLFsZS9ei66dW/MfWQW+ovYkjPAzpN6DCgzYl19fIEfv2ft9RLGoYk5ohJl5+ykYhmW3twrpSTaR6WMSBo29+hw5CbRgJ7Ohc/qa09OPZK3IJjNHT/tpRudEurpet5+41qqWWBNU+eAbJ/xG0/e7PcAWfdpKJ4eVLDzYfvluMjGr89FpdgzDUm8VNshBJvaxrpepDnh8dOQSmoJ9L3zWlGtiEtyRQxGFYj8S/apzVLDW+UvJU23plIaXQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=3E43d3fjqwaY7HLjnmrqW/fLJVpQVv3/T2nVkWW+6XM=; b=WqYflc2YjIR5PIOg9oX8rbGhYw4Bf1FQywd8pNe3Pq91L0zW+KKe/TIE0BEuemmPuUYhBaUncO12SkraoLLGSAwZzfB5xmjWB678JszCYY/wKjsj8+f2lWMIfyk6LvqpsMR1ZnXm9epJfHbdQIkjZ0warB5L0svKI/OMGlPWQlODB+qT4+LfPnCAgQ+3hUvHTpmvmNbdPqC6U39bDVOAH98pl1VB2YVrM5LKxvf2w9WKbfcx1f9JmAZ2QyTAXvIwl9hmMsSkE4coRWw/S5agooguwbeZt69jW5nGhww0YG2reKHWYrGopvjMfw37q9tjkY6FjMx1X6S3IhNrNtswnw== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) 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=armh.onmicrosoft.com; arc=pass (0 oda=1 ltdi=1 spf=[1, 1, smtp.mailfrom=arm.com] dmarc=[1, 1, header.from=arm.com]) Received: from AS9PR04CA0085.eurprd04.prod.outlook.com (2603:10a6:20b:50e::10) by PAWPR08MB9638.eurprd08.prod.outlook.com (2603:10a6:102:2ec::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.23; Thu, 27 Oct 2022 15:33:03 +0000 Received: from AM7EUR03FT023.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:50e:cafe::9) by AS9PR04CA0085.outlook.office365.com (2603:10a6:20b:50e::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.23 via Frontend Transport; Thu, 27 Oct 2022 15:33:03 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass 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; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AM7EUR03FT023.mail.protection.outlook.com (100.127.140.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.32 via Frontend Transport; Thu, 27 Oct 2022 15:33:03 +0000 Received: ("Tessian outbound 2ff13c8f2c05:v130"); Thu, 27 Oct 2022 15:33:03 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: c29a00d2aa4df779 X-CR-MTA-TID: 64aa7808 Received: from a4d3c6ad07ba.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id CCF3FD96-C53E-46BF-A41A-5784840F26CA.1; Thu, 27 Oct 2022 15:32:56 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id a4d3c6ad07ba.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Thu, 27 Oct 2022 15:32:56 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nxyszBGllQYQLg9GswZ3n96x87IvCArMQkbbKYz+nRiBWE8mr3XeUJIX/JwQIMtxbh7DiXy2lkHJnDMKLc2eFUX7mHdvNwYHK7OC7cyGX5PCwv6i1xTyHVeocwlEBcHYUHRAq5/7iK08+eiBfq/yIBNLp7zvdx7/CukQl1Y7HpxlzjBa1kGyFr9U2qa8MzSvsjO3ufAdYR7eywfkbj1OZW+WsHMTRTRacnMEA94VnBZ6o3CSqjuvH3VKbIt4BS84tMT1Jlyj3EE8LDPehZPKLvqSePBsvSgu/0008R+qWRL2EwbBghU6DKa2RKPrjq6NkD7tCLBeChECG4yd4G+AhA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3E43d3fjqwaY7HLjnmrqW/fLJVpQVv3/T2nVkWW+6XM=; b=eq2jPbCkMeZzTt3QsaZb4VMfio4qu/GRKi30vDKPXDg1aKauvKk9QUt6ho1KbGsgboXbz+5Hdw3seM46rtbH1Eb8KdbxANO8vj/MMY3V5xOkiTy/ML0C3XOUuKDG6nRIZYMnNsrPqS7OmfhPeqaxI4cmje9yVq3ub9BFfi4AM6ldmWujqf885ZyI88ebKXPssvoRgE6Rk+mVb+f5ypQuqcj3ErYhtetYXOySsJmkLF1P34kepDHgxbk1sW0Uxh2xJiT+0mDHmcewmLiA/snN9cHQZZBo5sZwjRwfqyZy1N2bCyuYexIMonzP9lF5Fup53KH7wiHYULLeVdKEzw7jUw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=sourceware.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none Received: from DU2P251CA0008.EURP251.PROD.OUTLOOK.COM (2603:10a6:10:230::10) by AM0PR08MB5524.eurprd08.prod.outlook.com (2603:10a6:208:181::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.28; Thu, 27 Oct 2022 15:32:55 +0000 Received: from DBAEUR03FT056.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:230:cafe::b3) by DU2P251CA0008.outlook.office365.com (2603:10a6:10:230::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.23 via Frontend Transport; Thu, 27 Oct 2022 15:32:55 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 40.67.248.234) smtp.mailfrom=arm.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 40.67.248.234 as permitted sender) receiver=protection.outlook.com; client-ip=40.67.248.234; helo=nebula.arm.com; pr=C Received: from nebula.arm.com (40.67.248.234) by DBAEUR03FT056.mail.protection.outlook.com (100.127.142.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5769.14 via Frontend Transport; Thu, 27 Oct 2022 15:32:55 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX03.Arm.com (10.251.24.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.12; Thu, 27 Oct 2022 15:32:55 +0000 Received: from armchair.cambridge.arm.com (10.2.80.71) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2507.12 via Frontend Transport; Thu, 27 Oct 2022 15:32:54 +0000 To: Subject: [PATCH 09/20] malloc: Use uintptr_t in alloc_buffer Date: Thu, 27 Oct 2022 16:32:54 +0100 Message-ID: <6ff097d212f61a22d620d5aae268007a4e6cf8c1.1666877952.git.szabolcs.nagy@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-TrafficTypeDiagnostic: DBAEUR03FT056:EE_|AM0PR08MB5524:EE_|AM7EUR03FT023:EE_|PAWPR08MB9638:EE_ X-MS-Office365-Filtering-Correlation-Id: e60102c9-a3cf-44c4-2d3f-08dab830899b x-checkrecipientrouted: true NoDisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 1IcF+ZaFA+40bHXVTxy3v5ye4Ly/L8DNdb59GoetW2BTAxMqUvvL3U5OnAuAoSNNEqn+1FHZrEnXyCzgCKV3HDS7WmrtM5Su5GZ7a4Js+kOt6YxQ3pD0kEkonoykNyZugl3vhaF6ID0STz2X179SpoF3hFH5Azt7ADQokhe+KFGLJP4wfBZewWI5yCUEiXZ2L9dj8W2v1SsoTvruZAav+0rH+QxjFVLJjeS6jRVxsslT5Nuol/+SzB4jsqNBp7pjoLSZA2WynsQVMxkAHiFbAQ65Rf4CUnwG91XUDpK56aheCnDuwh/qhUJ1qZDcH7Tb78ajzrfcGyzlfssLHe5q0SfGIVQBQokHi7WKxgb/W/Frs+fQEArFj3IqKOV1qPy1CWLB2LRC1EIqf2A5MA4lA4LCGL4NlGXdiVFFFWv+vZt5zBR9EZwSJlVx1pnmrVRiJF6mLHRYaKmUBtQR9oidmVoAufY74v8rjztc51AylHy43SYThiZPOliOw/2QKfqhwJjsEY+12PfBl7tUh+/RuUQpcUxFqft1miIF81rpWw0DQzeDg0rchlPFP0kcmkoZwkNm62BGXe2aZUJ1b1FX7iscXHClT9Q+YsJQsrjg+vJ4EMpGD8Jxnz5ISe8EFNiLr2572y0IHBjY8UGLY58Z0+h6inZVcXj3SzeHJo8JNWau7L7vLINQSDIFsurgIlF/cw/do8jh/MLJkHUgyk7VE08nNDDLHFg+p9Sr0QUff18gc5+V8ouaW+rrKEj6XHQFaWiqNncAhEGQmxiMQoffdanGY2o7BvuDe6dcOlnyujMK93PRgyTpJrawwqTH8RSW X-Forefront-Antispam-Report-Untrusted: CIP:40.67.248.234; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:nebula.arm.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230022)(4636009)(136003)(376002)(396003)(39860400002)(346002)(451199015)(46966006)(36840700001)(40470700004)(336012)(2616005)(2906002)(186003)(8936002)(47076005)(426003)(478600001)(5660300002)(44832011)(83380400001)(26005)(356005)(41300700001)(36860700001)(36756003)(82740400003)(81166007)(82310400005)(40480700001)(86362001)(40460700003)(316002)(70586007)(70206006)(7696005)(8676002)(6916009)(36900700001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB5524 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM7EUR03FT023.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 5f8754aa-eb48-4341-8960-08dab83084d9 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wH4tNOWZP8771I7uUicivX2SeBa2xLXfS8lAEh2a2i98ccpwghV7hoW1nz/7D7Hn23Sk2g8hxtUfuJp81IWPaTMzglhiGVItVjTcUd8DNjqtbHo5FD0nsTFGzxCWbHbBhHI4v+2wQ9m2dWtiymSe6TANab8WgOg3bn7FIGp3fN8057wx/CZGWbxgsMWguwmefnyutJGbUVJwTRoTHb6mxOqs2R6LC4wFbbDGb2307SlsAJZ9x6ITcFylZFlOtNyAyzGekB2P0KoQQQmo1LqMTWxrkWk9se+L25jefJvpk4y6+mMvopuruh99pRgzDXYcu5+o/6BfSchzAR8hkT9ap2TRKaPGkpBstkE2Cmr/EGyhvU1gFqM4Y2jI4MU4eMx60tkAVDgpG1E0nNS2xXSoUIBLTE40R+sumQUnN9GQMieUvdYbyjZf8MzahH76+GjusbYro/SWbGjtMMMVsat5Ok148x1FqckJXjqHA+zJwcD1a6ucALl+2UGlFoOw1lFJhGBAM9NO7jV1cfLYD7yVR8fNJapqlF4FVMqHrrH8LTFdhq7Ky6REjPLfh/f30S+B7rkJqV8Ymjes4oYBTSYGXg2xnPi4BE7mrpg8PrzX07JMmzpJm8oPPPMrQx9n5RIKnOS4mRirs/9II9vC7J7V0lEjE4QGjKfTY6P2+dRAZUxG0vAMrl4F61AtD/6tl7W9U5KnxC0+6GD9MfUaAQuROVD8vGHI5ialwX9ZQD/ZZvOamqc/Y8Dpz+qfIggRfJMZcSrbhdS1wGjvfEdjiOdjLA== 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; SFS:(13230022)(4636009)(396003)(376002)(136003)(39860400002)(346002)(451199015)(40470700004)(36840700001)(46966006)(8676002)(6916009)(70586007)(7696005)(316002)(8936002)(26005)(5660300002)(41300700001)(81166007)(70206006)(36756003)(82740400003)(86362001)(426003)(47076005)(336012)(83380400001)(40460700003)(186003)(40480700001)(44832011)(2906002)(2616005)(36860700001)(82310400005)(478600001); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2022 15:33:03.2310 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e60102c9-a3cf-44c4-2d3f-08dab830899b 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-AuthSource: AM7EUR03FT023.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR08MB9638 X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FORGED_SPF_HELO, GIT_PATCH_0, KAM_DMARC_NONE, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_NONE, TXREP, UNPARSEABLE_RELAY 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Szabolcs Nagy via Libc-alpha From: Szabolcs Nagy Reply-To: Szabolcs Nagy Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The values represnt pointers and not sizes. The members of struct alloc_buffer are already uintptr_t. Reviewed-by: Florian Weimer --- include/alloc_buffer.h | 10 +++++----- malloc/alloc_buffer_alloc_array.c | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/alloc_buffer.h b/include/alloc_buffer.h index be33e8b68c..1c1dbe0a46 100644 --- a/include/alloc_buffer.h +++ b/include/alloc_buffer.h @@ -248,9 +248,9 @@ __alloc_buffer_alloc (struct alloc_buffer *buf, size_t size, size_t align) if (size == 1 && align == 1) return alloc_buffer_alloc_bytes (buf, size); - size_t current = buf->__alloc_buffer_current; - size_t aligned = roundup (current, align); - size_t new_current = aligned + size; + uintptr_t current = buf->__alloc_buffer_current; + uintptr_t aligned = roundup (current, align); + uintptr_t new_current = aligned + size; if (aligned >= current /* No overflow in align step. */ && new_current >= size /* No overflow in size computation. */ && new_current <= buf->__alloc_buffer_end) /* Room in buffer. */ @@ -282,8 +282,8 @@ __alloc_buffer_next (struct alloc_buffer *buf, size_t align) if (align == 1) return (const void *) buf->__alloc_buffer_current; - size_t current = buf->__alloc_buffer_current; - size_t aligned = roundup (current, align); + uintptr_t current = buf->__alloc_buffer_current; + uintptr_t aligned = roundup (current, align); if (aligned >= current /* No overflow in align step. */ && aligned <= buf->__alloc_buffer_end) /* Room in buffer. */ { diff --git a/malloc/alloc_buffer_alloc_array.c b/malloc/alloc_buffer_alloc_array.c index d8c08d03ea..b5f32bb630 100644 --- a/malloc/alloc_buffer_alloc_array.c +++ b/malloc/alloc_buffer_alloc_array.c @@ -23,12 +23,12 @@ void * __libc_alloc_buffer_alloc_array (struct alloc_buffer *buf, size_t element_size, size_t align, size_t count) { - size_t current = buf->__alloc_buffer_current; + uintptr_t current = buf->__alloc_buffer_current; /* The caller asserts that align is a power of two. */ - size_t aligned = ALIGN_UP (current, align); + uintptr_t aligned = ALIGN_UP (current, align); size_t size; bool overflow = __builtin_mul_overflow (element_size, count, &size); - size_t new_current = aligned + size; + uintptr_t new_current = aligned + size; if (!overflow /* Multiplication did not overflow. */ && aligned >= current /* No overflow in align step. */ && new_current >= size /* No overflow in size computation. */