From patchwork Thu Mar 4 16:33:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szabolcs Nagy X-Patchwork-Id: 1447443 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=EPfx8BtM; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DrxJB0G6Tz9sW4 for ; Fri, 5 Mar 2021 03:33:30 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0AB203AAA0B4; Thu, 4 Mar 2021 16:33:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0AB203AAA0B4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1614875608; bh=0IqPCVLQxsSVXWmXAeP93g87G4MYn4L/iXccraGKNXA=; 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=EPfx8BtMaSvmjHZuPavBuoxnhv6pR0jewOXtjgtWS7Lnz7KfQG0B17OaDVUC0Dnmy mOk4jQU6IWKNjJ+Clb5Ltzdm22/tfUPm61EPkKzIp9ZSh3ezLrwhtuL7FI4qfMJx/w 6azrHOy+1J/PmDQ0Do6GTyXVwH93B9acjH7cb4Ts= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30041.outbound.protection.outlook.com [40.107.3.41]) by sourceware.org (Postfix) with ESMTPS id 38E873892447 for ; Thu, 4 Mar 2021 16:33:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 38E873892447 Received: from MR2P264CA0085.FRAP264.PROD.OUTLOOK.COM (2603:10a6:500:32::25) by HE1PR0802MB2586.eurprd08.prod.outlook.com (2603:10a6:3:df::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17; Thu, 4 Mar 2021 16:33:22 +0000 Received: from VE1EUR03FT017.eop-EUR03.prod.protection.outlook.com (2603:10a6:500:32:cafe::8) by MR2P264CA0085.outlook.office365.com (2603:10a6:500:32::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17 via Frontend Transport; Thu, 4 Mar 2021 16:33:22 +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=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; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by VE1EUR03FT017.mail.protection.outlook.com (10.152.18.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17 via Frontend Transport; Thu, 4 Mar 2021 16:33:21 +0000 Received: ("Tessian outbound 751bd80b3146:v71"); Thu, 04 Mar 2021 16:33:21 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 5ba90073cef0226e X-CR-MTA-TID: 64aa7808 Received: from 88727ec62323.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id E6E82AD4-5E9B-4535-BCD3-B7932AFBD0DF.1; Thu, 04 Mar 2021 16:33:16 +0000 Received: from EUR05-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 88727ec62323.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Thu, 04 Mar 2021 16:33:16 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JUwJoMp6XI/r0qNm5NixPpChpJ3anjit0w6lNLbjeedZXr5Wi1sXiovoB+/9bvmEaqaqnLavDv3HvixguGqd24NDqwRsgG3Tl7R2ZUDvjYDVMaH8OJe/9ZCR+GardxIlBNyjBZZeqytYLvRZkJn2B49gdlnMgkOu9oIk+fzyGMovCyPXaVeVPwvh9GRls0hc0bgP3SvHGNlfJ8Bv7OwiefmDGNVYe2B9NnCe20gmKR2Skbn0Rr4jH5B/yEntD3EPLgwAy41eKprojpJCw8XaW7/xf45V72ld7DLTWl8w2QIXCvZxHznicpXUKrPNhItjL6p8341X3NyiZkGnP+mA2g== 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=0IqPCVLQxsSVXWmXAeP93g87G4MYn4L/iXccraGKNXA=; b=bwg+SjUBzz412JoUoINPDtcnwZrmRxArWp9Vk9Wz7Uxt54UEwumzpNscuQ30LEkJh+4y2Ka8tIih+3FDGctgNRaXk80Qu6qf/paJnKdyb7+pxhhpK7Q82UnEWfTzK1mGtPPY1mejJxszY7fzzBzkS2hK4xFVBSJm+AKUhyiVVTEzUDAaDE3XodkAVJ71db9QPmpMkn6V1C5s9krrOlzMZe49SBytRrR+cHmvXi1JPQ/lQQhTW2JTs3qzbPjRNRwjDGEiZflmhiTO929kJDx9tHzeekX9ivSTlaUhzZrOvk1qqJAmdPU/pDleqoBkRGu6TRsZ7gD/tF3p5UrojXSkBw== 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 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 PA4PR08MB6320.eurprd08.prod.outlook.com (2603:10a6:102:e5::9) by PA4PR08MB6064.eurprd08.prod.outlook.com (2603:10a6:102:e2::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.20; Thu, 4 Mar 2021 16:33:14 +0000 Received: from PA4PR08MB6320.eurprd08.prod.outlook.com ([fe80::60f0:3773:69b8:e336]) by PA4PR08MB6320.eurprd08.prod.outlook.com ([fe80::60f0:3773:69b8:e336%2]) with mapi id 15.20.3912.021; Thu, 4 Mar 2021 16:33:14 +0000 To: libc-alpha@sourceware.org, Richard.Earnshaw@arm.com, DJ Delorie Subject: [PATCH 10/16] malloc: Change calloc when tagging is disabled Date: Thu, 4 Mar 2021 16:33:08 +0000 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Originating-IP: [217.140.106.55] X-ClientProxiedBy: LNXP265CA0072.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:5d::36) To PA4PR08MB6320.eurprd08.prod.outlook.com (2603:10a6:102:e5::9) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (217.140.106.55) by LNXP265CA0072.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:5d::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3890.25 via Frontend Transport; Thu, 4 Mar 2021 16:33:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 2374d7b6-c003-47dc-3a52-08d8df2b39df X-MS-TrafficTypeDiagnostic: PA4PR08MB6064:|HE1PR0802MB2586: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:10000;OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: DDP+1ZTrZRyP9kRTa66DHuDGdY119CidcWBCR7OEIaAICBZaz58gcgXIzfy8BvUyPpw8tHtR3grcBzzAV5odnWlEJOnrsFp6ebZL9bFEt1k2uJ6wrkLDpOsGvSUWnNsi4KTbC+pH1e5yWfrCHG03JETRU59xuww6d3C93+OGKEmqeMEWFGtciNs4acS26Q6b5kJ4DgfUCdrWNA/1hKLPZH3c+tkJZeRorwJX0w9d64eOuR44xSHp4HK6IeEpzyxm0LXdCn0JYfP+wdhEvcxjuIdG+PqNlLk8A/gx1psItgSSvSPK4lo8T358IZLWmoLNA+I6NnH6hTv7vkb2p8TJav3hHv/PxWn0LZQ9yEmEHlKCtKjuB0UFT1rf1WYfqaLhYxu0MlxrKULu1PYIb67x8AoGxTQmY/ZAYV+JweRVzhpphZnsjrMuN2KeKJcvkUJyZTYtRseoVsaWg/a2etvgwiZ/UBSQr7BzR/6xpH65pr96xnhSaUek7aGTHT2W9hTU/cG+/iSVr5bEKl53J7PiSKSPrL8nHiagF5zkOdKue1IpCqx2XfICiRAbl8rUbLUkI40YUFKyMPFJVFhggOYUww== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PA4PR08MB6320.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39850400004)(376002)(366004)(346002)(136003)(396003)(69590400012)(8676002)(6512007)(8936002)(478600001)(6666004)(36756003)(2616005)(52116002)(956004)(86362001)(6916009)(6506007)(5660300002)(26005)(6486002)(316002)(66476007)(66946007)(66556008)(186003)(2906002)(16526019)(44832011)(83380400001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: oST/mv1UVrbKz3E3IjXnlrjl9uD6XZMThHAaOqKh6GHIlOJxnM/aSrzgO8QomOYswWbb2MNkDp749Nd7/qPcV/fQpB2KJegr6ODblTfAEe0XmYH8L2Kl7Ki7JXID1V1qQ97m2SRV+ld06o3okJVWQW6XfZSXhOW+HRexta2WZvgRJmopW9taZifG8zm19l4l/REC4xZ8LawKzlGFbumb+guMAeS4gzEpaorECLNs3A5JxtuXLvL1ZzSAxidvqnpPDbXfWm84mq1BSj5wTZPQVHIdNsAnPFCJ7PhV//+HE8oHMlXIXzqK+4D9kUxmCNS1dFjG5pG8fMOdd8lvRzwkklB8azprv0tEtCxBvR8grbnYRGvmaGe1bRg87Q6I8UiQk71vEHQoEa8Z43MM9Fi6iYOopNFV9+bQ9fgeGtke0oGWIDUlzxk51FfiBqUQVAfBKNtG9KnLGu+WCKGgWVjvW+9fetmQJJyiUjfSh3uJKA0feFB5fZgM5tm5Z3/Wl8ebXDENeDhuvIuZm6Dn3/s68AYI32Zwl/WW0XCnT90Az6HZfU2eRjC8dEeXlNWNJRPB0pz4r+HwwyIKL+wrqMF8IwEfaNpmNeR2A7xJ7+Y40SCkitLVHGxADRqrbrF6LyYFuCnL4eBLun6q7bjgzm3b8jE8jWBuxfkp0z2PKoiT/4esAja1btBeFq1YQIONgLOZSsh9HMIQ7Uf48pt3uUx/UlR9NX7CKq65k4DM8e15w97tBdI2h0XvniHiGQTqV1YWjHpKxW1yUx1HJejOVTuQifw/+PMe9FQvp5e0E0Fe307ekPdpDaj41cP0+tCl5JyT27d04irtEBpjY+c1Kzwp/4tercab/faVyenwkpYldnRWXLgWs6v0GbnMPBcu3UOFz+ygcVS9yMR/3hB6lz4b40o1mi9zgxq/NTUFHWth9NzWNgqEneuZLrBevWFGUfL+0wX1CaGCg9cHFd+OpO1BxRqNrmTYIb8ETW0aYpZ1x0nmVLlGXQCSrRj4TLu6L5FR910bMvwLZyV4HJ0x1WeR2nyKfUpAw3Zj8ljUC66sSpke65C9TMPCKnWAfSEX0gBJZRMUhM7F1mc16gly3jQ1dwxo82ZSbZLRndQ4bsuk2s7WrP/xSQnEB5Qo6QcazAGa99zHb6azjJGVqyfSnDS/uKkZpH+nTQTqeSCC0bh2St634L5pJZy8m0p7xH1paL1yh4jCvWiCztaRltoYvNa+MbtL1Z2iiA6vyvmwwfYdzBXTufAqXWy6HWuQtebyI3FL2Naxv+1QBS4KfObb1LWznxhkzW5oe7arT2IUHJrkp+afrsnOlE7gUC0UUeLqg+v9 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR08MB6064 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: VE1EUR03FT017.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 280326e1-e40e-47b0-322e-08d8df2b3540 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: x4ZuH+yvuKxY1FjZvYEaHx8+Sf2HCB+IIpUL3cTsSHhASQSGiCSxhS7TXwiWzaMARjn3jn0qbXaSonVsT4V9BO5j4nGW8zZ7gjbdIuF+tF2STfSUA3Foz1jCN13lifxvXpC9q2y8VzhyPmLrJz3nKlUezgRqFDq2m5RcnKui4//gd+bwMXvda1DLWjMVmItbBkvJmg1eZ1oArKbiU/P4/KJMngxqnhRvwOo+FcANFxU58vxbyzfhNcy1Xjlqlc6hpEhzdDoD74eXbKQvmch8DF7VoRDyniNgbBN1DvoDmwJgRipsUYVDGZuWkL+kf6JIte9x6l8xgwlZ09v1NT3SYz8pChjpUK0nHjEe//S1RCEgjiZPN444qtyRCpohMPFrC/v1BW+cKdOGPSRqQRaIL9E/h0RfpZ6qNRszPVG6VuQeUFcN41VU27DZPVBb3GzbN58i/ERP5DlBQjZ6GIe+hsdE8UY/HUtbvFc54xYJLZvz8jocBQXVXAE1N7+SZRK1KobJ0zfhy9G2zDa8VqMWHhEuMFyAS6e3DpT7Yxhdnrq/WqBnxiiwpy5pMzgh2y4xGZtO/1jLw3wm0stwEJrinyM/sFZnRjnqbvE7Aa4oD335YDHoQsJJ/mV5icfrvGUobFdSdtUD0O8yCNU50JzKaeLNPcggdvD5purUQs9qvan6wG4yPTzC4DnoyiBT9WL5 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:(4636009)(39850400004)(396003)(376002)(346002)(136003)(36840700001)(46966006)(36860700001)(336012)(2616005)(6506007)(478600001)(956004)(86362001)(47076005)(5660300002)(69590400012)(36756003)(8676002)(16526019)(70586007)(81166007)(82310400003)(8936002)(83380400001)(6666004)(6512007)(44832011)(70206006)(6486002)(186003)(6862004)(26005)(2906002)(316002)(82740400003)(356005); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2021 16:33:21.8724 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2374d7b6-c003-47dc-3a52-08d8df2b39df 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: VE1EUR03FT017.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0802MB2586 X-Spam-Status: No, score=-14.2 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: , X-Patchwork-Original-From: Szabolcs Nagy via Libc-alpha From: Szabolcs Nagy Reply-To: Szabolcs Nagy Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" When glibc is built with memory tagging support (USE_MTAG) but it is not enabled at runtime (mtag_enabled) then unconditional memset was used even though that can be often avoided. This is for performance when tagging is supported but not enabled. The extra check should have no overhead: tag_new_zero_region already had a runtime check which the compiler can now optimize away. --- malloc/malloc.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/malloc/malloc.c b/malloc/malloc.c index 9002d51d7b..b1ee0f450b 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -3591,11 +3591,9 @@ __libc_calloc (size_t n, size_t elem_size) mchunkptr oldtop; INTERNAL_SIZE_T sz, oldtopsize; void *mem; -#ifndef USE_MTAG unsigned long clearsize; unsigned long nclears; INTERNAL_SIZE_T *d; -#endif ptrdiff_t bytes; if (__glibc_unlikely (__builtin_mul_overflow (n, elem_size, &bytes))) @@ -3674,12 +3672,13 @@ __libc_calloc (size_t n, size_t elem_size) return 0; mchunkptr p = mem2chunk (mem); + /* If we are using memory tagging, then we need to set the tags regardless of MORECORE_CLEARS, so we zero the whole block while doing so. */ -#ifdef USE_MTAG - return tag_new_zero_region (mem, CHUNK_AVAILABLE_SIZE (p) - CHUNK_HDR_SZ); -#else + if (__glibc_unlikely (mtag_enabled)) + return tag_new_zero_region (mem, CHUNK_AVAILABLE_SIZE (p) - CHUNK_HDR_SZ); + INTERNAL_SIZE_T csz = chunksize (p); /* Two optional cases in which clearing not necessary */ @@ -3733,7 +3732,6 @@ __libc_calloc (size_t n, size_t elem_size) } return mem; -#endif } /*