From patchwork Fri Mar 19 13:27:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szabolcs Nagy X-Patchwork-Id: 42686 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 A00E53861838; Fri, 19 Mar 2021 13:27:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A00E53861838 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1616160472; bh=d5rdX/sL/EL3ZH4vZm1Kao/KAG64SFUJFp/fipkUk04=; 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=xeeN8q9o1WWLp0PmnQSKxIrMwK1+CD9hNNA+oGdrXOV2JDQ8MmQFI3Havh6um3nD+ EId2rPbl4sYvjf9p/Q3C7i3mx7XrzozCRMVeZwbr1NtXFV610CjTWqqLKL3Dwz6QHz DdadikKanX0I/kQcIMAmfbldYmOZ8TiQJGVgehEI= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40059.outbound.protection.outlook.com [40.107.4.59]) by sourceware.org (Postfix) with ESMTPS id AE946385142A for ; Fri, 19 Mar 2021 13:27:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org AE946385142A Received: from DU2PR04CA0029.eurprd04.prod.outlook.com (2603:10a6:10:3b::34) by VI1PR0801MB1919.eurprd08.prod.outlook.com (2603:10a6:800:89::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18; Fri, 19 Mar 2021 13:27:48 +0000 Received: from DB5EUR03FT049.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:3b:cafe::17) by DU2PR04CA0029.outlook.office365.com (2603:10a6:10:3b::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Fri, 19 Mar 2021 13:27:47 +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 DB5EUR03FT049.mail.protection.outlook.com (10.152.20.191) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18 via Frontend Transport; Fri, 19 Mar 2021 13:27:47 +0000 Received: ("Tessian outbound 26664f7d619a:v87"); Fri, 19 Mar 2021 13:27:47 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 07c05d25f35624d2 X-CR-MTA-TID: 64aa7808 Received: from 8c863abc3a77.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 8291163D-AD12-4BEE-8F8C-D6E173602CCF.1; Fri, 19 Mar 2021 13:27:34 +0000 Received: from EUR01-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 8c863abc3a77.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 19 Mar 2021 13:27:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZXn5enR50LhwBwOM/JE6/ukNIhxUk/xFZhPtUwnmbBN15ttL07tVEwW/bQDAI27MqE/DXAsA4jCILOn3VlA4Gw+STAj74Qbh+HFKNxTvN1zSXadUN45EK1BYa0bkhzfbq9tpCyF43uh/ScfPbBcljpzL9zXsVbFfE4dvITVfW77Rnf8hRKpmsq3VUrF2KBa9igluHuHD25aqJVGXzGbXIzmTFOJMmZlEWrrazLQuTvnniuGSIpt8OFjFybsFvHS7zOcaevJfrsImdR7nvKZNEwQIdLo4gY55LZg9D9zc6GO6C/pgYT/xv6KBCdZpKY/f8Ug99iyfRXBC8zbWPlLitQ== 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=d5rdX/sL/EL3ZH4vZm1Kao/KAG64SFUJFp/fipkUk04=; b=dLEKDzoHfMXAyc1tGFgeEG4DELUCPH8wubzKyW64HWbZlpC9VChNiIdNXZ0tYVYU9+w+1M0eJdP/yhqzL6FoZs4fHhwyTglYoZqavDPKPRaMhRoNcMGbbUM15FRHiVMRjY5LVsxUnunrgQLvGSDS58RB73tg+sK8e4NkXW/5NpKtQvEHvYRHb/93MDbjxjBtA/sb2ZGsSvGhT9Yz7DZK0AqIO1j2niuH7Lop2JAa3fZ+K8IiastyakM5a44Nkr5GJz3Q/LTpbaTO6WX4mNknloHvfPUKpSACPfdFijUuLO3KqS4uHg7SWI6775QhPZGU4Iks1JYpyY7KIDE+8pq5RQ== 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 PA4PR08MB5966.eurprd08.prod.outlook.com (2603:10a6:102:ee::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3955.18; Fri, 19 Mar 2021 13:27:33 +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.3955.018; Fri, 19 Mar 2021 13:27:33 +0000 To: libc-alpha@sourceware.org, DJ Delorie Subject: [PATCH 5/6] malloc: Remove unnecessary tagging around _mid_memalign Date: Fri, 19 Mar 2021 13:27:27 +0000 Message-Id: <7203bf2d0d1405daa5d1c62744abf8ceee85b5bb.1616155129.git.szabolcs.nagy@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Originating-IP: [217.140.106.49] X-ClientProxiedBy: LO2P265CA0464.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a2::20) 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.49) by LO2P265CA0464.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a2::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.31 via Frontend Transport; Fri, 19 Mar 2021 13:27:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: d8b4e4d1-4fd0-4c54-0f08-08d8eadac990 X-MS-TrafficTypeDiagnostic: PA4PR08MB5966:|VI1PR0801MB1919: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:3513;OLM:3513; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: U+kXa3wcWOIQy784FUhrtWK653IvTlp3day3z9PL8CA/9mhANCu1N/8mYJS1p143XVKokTfg9swtnUAquK+DF/fV3ph+l8nzt/USTfJ4TnJ0/ZVvy5eIWWbS/9YgP8gd1jEpuRMFjcfbQ6Z6Q2NhnCORAAu32Sqap+rTR5fMWwTLlh49S6AoDvivjDF5k5JvgWPoQwrJBeooPTqamYnGmm2NilFajfDPf3xuK1zjUhVbL2aLNInQO5GWOdRSDtRgph1giVG9mXr43MowNh0k8U4eRiifdBjVuJPO+ZoIjpYXS7DHP5d82ICgxP00tbTFzCjjZNR2GKVb+kGfMCjifhUoQ1ZpU/wQtUzMxSCRt3zTdai64gAsk2iivguxcoOLPLl/1XeXqfqA5aJlSU/G1ppMbiRv8/v+Ttqx9xMvbA7fjJh5YaD8LKrlVOgo4Szh/7x5bgUNp4g9TyvSTEVncFYgWO96PyQhaJmKFKsoVbckHZkwnwUu+QmUycL0lcLlck1i6B9yfGyZBTgGFZvoyWUu4hulUsH8SZp2QcariM3ogpy2GBYEupQIPqNA5KWd3cUTTMNRHY5TaAZO2Gjnlkf6SnVU0szPiLKyd9Lcn3PbP0Q3RP8sp96rVTrW3D0u6iuvYRaIcxnKBICyOcsBlUfxtaEJyaheCDvWz+qSQseAE5OfOQvUME1fVDvnAclF 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)(396003)(39860400002)(136003)(376002)(366004)(346002)(2616005)(6916009)(26005)(316002)(36756003)(8936002)(6512007)(44832011)(5660300002)(8676002)(66556008)(66476007)(186003)(2906002)(6666004)(6506007)(66946007)(69590400012)(16526019)(86362001)(6486002)(83380400001)(52116002)(478600001)(38100700001)(956004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 1BOIF58YeXukadGMiKAtYxp7sOlIdfAPmbgodjrbSFbbpAWmGB9cfNtC/HZx3VKxhf/P1+JE7CaO+X02s9F4ukcQG/rKT7Q2mn78iJ0ChZ8Heb2ZjZ3oiU0UL0YL7sggP9JoiQDjYuXyX/i+NzaF52keq4fT9BAghGvmlBcKKJw/iZsRZA3SRIBUht1rHdSZiqNRGzlEL/Rrn/OAoYM/hu01EPB8PXPTvhalgVUzDayVXxODa69zbpuMmZtWsWC/AK/v1SdOGinxwk1nwRAXFlemkIv7Msq6/H8cbgwERWti4AQLzdOiv2b/ko9JKq3yTbWWMcPoohvxSVe3VA6OMvVo/oNgmsqXF2vL57ZvY7WWfSE9fRQfm8jFiRDTqA4jWk6bsgfxdlYJ/wUnfSV1EqkLlmarL/zhWjxezx0+VEuCvaG4yLjGWArz5LjLu6m18zSd3NaZYuJ7vzD/fLYFs+2mzESEBCDjNlKQ5TVqdYp5F7cq4vgbJxuPhEIfQTwXq5ZFE7ikgbt22Y9OBbu3FEann0Sp+rVdDVeKC5iEcET+RG7673e/170UhGiH2sYb4QG9aoPNYaD1r/fWbNR3cGYiZguWB4t698SM6JwiInKD6kO5VYLOwwIWf0iUEfWTEij4eOSdej/0QvUv2d0+39oF+h80OQKzUcNbFzEnu8i0vQQ/1k5Cnh9GuJGvBfx5ttfnoxkwabTKu71PKAR3pyrLflcewz8QRauMWqgwhFpKfl/9rfRPuyGXxz0vK8K1rFqVB/GIveQGyrmbz22QZqDHqOUKhhUyWApetyulyqwmKdAB4QnINlvukic8Ok+D+/xFQpwdr/4euTFRla89BRQaKG/o0NqAXFXMVFxFcgFi852SzrdH+6Q+AwRlmq1+EaJh28IoBGoGG3aovr2jevUx6WywJwrp8qAuCUNClFgkZzoQzUYbmEoVswHpm5C93Web0/ypNgjghpzqPhzNXmZKPKIRN3ysbeR7nK7aeHl2VszcVmi+rEfhisuZcYCdJU4P4Y54+3onf3SPQdNxRvZaKdNlFJ7CI9gnatejYagZs/LPu691EM/JzBzxNtCAeWAOy/5fy8qOozA8NxzlLuO2qR1HWaKgN9MjBUDnk6XuCF3KG3sOoQohk7pwo/+kINFDg9cKeVB7HrhBvkLxIL92LOljGjTE8ROKeiqf+hP+3YOdvmaC8IIe95BhiMTVwWQNEvJ0air4a0C7EHg6FYg8yDE8T3y4LSdDZ0aS0CpC8ekbdafvrf04t2uZlNoNmzL4QxgussOiWy3fsp8F1Qk/fCpy2MhQ2jSWTUVYYz/BOWXFWS1Da2p0znw4M0Zg X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR08MB5966 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: DB5EUR03FT049.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 1be85278-c08d-4102-2a25-08d8eadac0f0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gobZqw4QMdj6R21fMRNW/n2JefwwSCriaoSbFiDDNtGMgvQhhERpp2lwggdNPGDkcGzJTJ0GXkSoxkQfOgPTYZ23tM7xR89d+kdpsmOBmtoQaKQQ0o6LPCfUsRC7jXcAdu1VIDojzExJaDu4skpodWYghe3ymVMK8w3MhLLk+hzrZ2IHrzSweQIWdoVjO72Mp8gPzRrnwTbLwFZNEl9O7t5ITZ0h9RFq5If9SPjhnZIyj1/Ed2Ua+HGlgB2vWRWJVP96EWfHaGkqtGvVvlR1QQxh7ZO9AMhWpeI0pGZvczL31KJMAcb4qhUlY2xcr2kEQYbumvg7pF54dIaZBC2o60HpOtCibS3Wm5gBjfg0scc+acqrvzYEJNTi9tdT9M0TCK7tAu4MkJeSnXghzgG+SMWI4n5Z+rNmBwkhassSiJXU8bGI8cumIP+3OLc4abNjnrBp4HMMku/55E4eON30R5r9aaXGraEkEkM5NzU3MN8xjRgWMPl1YnpGeCBd/CbYNj/LApLQXihmR4F+jDkpjZRlvziRn9CzhgkyCzFVVhxekyruvmR2RnKy1w/r7EH1tjGRZSdlW3T2n2AvKm2e/KYmlQM11M/nJfY3ebkoG9U+xkPKwoQ5U5/q0w8zfZLlTALZRtf7dmk5pwcPK+kw4p+L57aJnaqZ1kf7wTP39Zmem5L+j/XxjNgNQZvLRMSJ 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)(136003)(376002)(39860400002)(396003)(346002)(36840700001)(46966006)(16526019)(47076005)(70206006)(186003)(26005)(956004)(44832011)(8676002)(316002)(36860700001)(356005)(70586007)(86362001)(82740400003)(82310400003)(336012)(2616005)(83380400001)(6862004)(5660300002)(6512007)(6486002)(478600001)(2906002)(69590400012)(36756003)(6666004)(8936002)(6506007)(81166007); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Mar 2021 13:27:47.8026 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d8b4e4d1-4fd0-4c54-0f08-08d8eadac990 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: DB5EUR03FT049.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1919 X-Spam-Status: No, score=-13.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_NONE, 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" The internal _mid_memalign already returns newly tagged memory. (__libc_memalign and posix_memalign already relied on this, this patch fixes the other call sites.) --- malloc/malloc.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/malloc/malloc.c b/malloc/malloc.c index 6f87b7bdb1..cb1837d0d7 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -3553,22 +3553,17 @@ libc_hidden_def (__libc_memalign) void * __libc_valloc (size_t bytes) { - void *p; - if (__malloc_initialized < 0) ptmalloc_init (); void *address = RETURN_ADDRESS (0); size_t pagesize = GLRO (dl_pagesize); - p = _mid_memalign (pagesize, bytes, address); - return tag_new_usable (p); + return _mid_memalign (pagesize, bytes, address); } void * __libc_pvalloc (size_t bytes) { - void *p; - if (__malloc_initialized < 0) ptmalloc_init (); @@ -3585,8 +3580,7 @@ __libc_pvalloc (size_t bytes) } rounded_bytes = rounded_bytes & -(pagesize - 1); - p = _mid_memalign (pagesize, rounded_bytes, address); - return tag_new_usable (p); + return _mid_memalign (pagesize, rounded_bytes, address); } void *