From patchwork Mon May 23 15:47:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wilco Dijkstra X-Patchwork-Id: 54301 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 F282A383D817 for ; Mon, 23 May 2022 15:48:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F282A383D817 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1653320893; bh=UqqmXmv7PSSEf0cJxyLB+ANUwa2v3HmSACwN5eEFN7I=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=EKSGn7JC9TyC+V5LK0/y2Rpmqk0Un8k5F31wws8XAsR1Bv8uygyNaU5HybKYM9wmq wsuaTFiPct50GT+Nb78nhESUmwbOr7DohV5JV+gQG5TmiL3EGCqXzGayWZHAB1gbeT zCYuOhS2vLfAbOwnyfhNxRid4rMAQIWL5Sb5G3Ak= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00072.outbound.protection.outlook.com [40.107.0.72]) by sourceware.org (Postfix) with ESMTPS id 44D94383F97E for ; Mon, 23 May 2022 15:47:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 44D94383F97E ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=FlNw2K8v/DikRLOZBY+Bk30clpnIXomlgjjatpC6UHR1H5i9uOw2FZ9Je1uUwX1VqXQiQkQMpjHu4ho/wMY1p4bdlD4gEq2rq0Qy67/tOT9tkTxO4YYkikQo9BuQzTKOBoa1JoP4Lm/rp/Zo7pQ4kfexk225tZtMTH/dfICwI3L3KJdk85OSAlFDeRbvh6HMMg0dpOLr8EwhI/ZBKVDRelfRADNyP68KDortBuonKTomFXIWi7dthVzbwMC+5d78oZqmg6RRmoMw1ByacFRdSbBYIdh1+XhYq8dcE/mjycvOnsx7scuY5JZFXZnHJZoX1I1WRvufOoh2mMHEtY1amQ== 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=UqqmXmv7PSSEf0cJxyLB+ANUwa2v3HmSACwN5eEFN7I=; b=P8Rtg8YdBQZunIju6jp9U4Gsk1tjMH/OYcJPVk0PU1G4Cl3TnLUfQPJ3I0kIee1wSu7XvSJTsXYSZI5H9ghamsmkBDxTuXF/LVTsVZ08T6jbo716nkeSMIePWkJsk9nQljL6CfvZFtNzQHeXL0U+f9S6wdCcMCld8j+YfBrW48mZWaYCNbAZwj9smEz75AqFsp/PjGPkiNbopFqr/JHemNkZjONWi9a3G5iKHffPXjlTZvIqCAPk1ha19BkKKXCRITFG1NitUTfvxhxqR3gYFghUPoJpg1DDmpDWHndBC7npoAa6JvCbCvHyyCzGrc5SNu6ZKeqXoVr+QtfAI616AA== 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] dkim=[1,1,header.d=arm.com] dmarc=[1,1,header.from=arm.com]) Received: from AM6PR0202CA0064.eurprd02.prod.outlook.com (2603:10a6:20b:3a::41) by DB7PR08MB3212.eurprd08.prod.outlook.com (2603:10a6:5:1f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.19; Mon, 23 May 2022 15:47:42 +0000 Received: from VE1EUR03FT049.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:3a:cafe::7b) by AM6PR0202CA0064.outlook.office365.com (2603:10a6:20b:3a::41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.22 via Frontend Transport; Mon, 23 May 2022 15:47:42 +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 VE1EUR03FT049.mail.protection.outlook.com (10.152.19.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14 via Frontend Transport; Mon, 23 May 2022 15:47:42 +0000 Received: ("Tessian outbound 07c1c99345b0:v119"); Mon, 23 May 2022 15:47:41 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: c8e17348c2309267 X-CR-MTA-TID: 64aa7808 Received: from 2c79244cea86.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 8A8DEAE1-56D3-4D2F-983D-183BB922F11E.1; Mon, 23 May 2022 15:47:35 +0000 Received: from EUR04-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 2c79244cea86.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 23 May 2022 15:47:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P0N04iuCgH9fGAS4XSwlSmll3UrjwH3URuFoz8MmTYFnoxUq1+Ee8wrSjXH13ljQ/DBofgBnD3lk9EaGENEftqB/UUdFjVWBhqOe5Pl4cvDVKRIFmn47T+jyBZe32T/C053P80fJFWj8n/zaQKbNa6iOHKIEX3c2yL2GCeN3RXM/1iY6HYO/6XP5T90Q50aswCGS9P7XyanL7jp7OTX1ejWr08kVJgbyFhgAGEW455Zu/CowkVc9z5rRcBuG9dlpEw3SbMktINK/Q3jCtSB/LToNARDYpzU+UW9WhZNz25EMcRJi4ELDphW9k5jnHkfJ+tImqpErqikIlUjU8PVcng== 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=UqqmXmv7PSSEf0cJxyLB+ANUwa2v3HmSACwN5eEFN7I=; b=PY0c5J1ze1wx87+fH/rlutZLDx7YRW3X27//JaxnOASkV3/9+LBXsKfoNqGoQevSA3H88lf6k4aQaVRXXQcvX5Carm8PxFVvXNX4r59VWhMLh5f8QOAgoIeGM+gHp17s/Z3j895XLOG4MF7vz6nMRcWGowybWZH8ngpDGnDbSMpKH6mX1FBQj4O6I0BIIolqVmZST9GxXYEpbXlrFvc+M0PZ8NTBVHHXEK6l/OqX1FEmruuZswhO0w2LDQLZtEJ+b3DpuDt5ANtkHWNvyNYahGMGukCiH/UJQIYxGFgjC6JRriZfCAOBzcuuJ8hPegFxwY3j7igH9tcO49W9lqkxiw== 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 Received: from DB6PR0801MB1879.eurprd08.prod.outlook.com (2603:10a6:4:73::9) by DBBPR08MB4412.eurprd08.prod.outlook.com (2603:10a6:10:ca::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.13; Mon, 23 May 2022 15:47:34 +0000 Received: from DB6PR0801MB1879.eurprd08.prod.outlook.com ([fe80::4c79:5ff3:ff33:7ee1]) by DB6PR0801MB1879.eurprd08.prod.outlook.com ([fe80::4c79:5ff3:ff33:7ee1%11]) with mapi id 15.20.5273.022; Mon, 23 May 2022 15:47:33 +0000 To: 'GNU C Library' Subject: [PATCH v2] Avoid RMW of flags2 outside lock (BZ #27842) Thread-Topic: [PATCH v2] Avoid RMW of flags2 outside lock (BZ #27842) Thread-Index: AQHYbrwrIciKMAWy3UG69oh+nmRwJg== Date: Mon, 23 May 2022 15:47:33 +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-Office365-Filtering-Correlation-Id: 11e67710-0e2f-48cd-b250-08da3cd3929f x-ms-traffictypediagnostic: DBBPR08MB4412:EE_|VE1EUR03FT049:EE_|DB7PR08MB3212:EE_ X-Microsoft-Antispam-PRVS: 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: YTBeRGXz3HIxyUpgQQ/yljTQLPb2BVIh/Ga2ANRSPcJy+PXbDaeXAkR5K35FvHK0vsJTbZio14GgieipXELmPBSD5bRNUF0aPdnWx96FBWOT1FU/cY9FdGQoEhzJxHnyr/pATuOeA5bpV+ME2mhzlzQiYCQkY3nHm0K4T4wjSpV0AQzrKYhqzQ09GKqN/FdDrxbPRvdjXwTZaqOAQF01H6rxUMOGbgBR2Auiz3ch8mE+5+8isIlsx1Qk0gtsOp7XL+DyM+OCM7CWHxXTRhV24UUxDcLL/S7gRXj48qfJ9Zdfhm9WHSAeKFaT1+OcLJunU0G5ln80kVKDrwbAxsHAGb+nFwaWFYjkz7kZA8TWH9+xCBwI+C7POYlbzjMEVZKs9kjZTcmipjt5Imr6lM/m2nuvUrcYcj4zXBJBVhW7y09paSj0djb7UiP83q2R/Wv0i1uiXlffgl3AmDV7bRJht11mMotOIOAKYz6p0+pYQKxL+p2Zz9snJIVdtuOmr0dJzJlf5ELGKk7pySgzS9QEgYyxo1BYntyyygBRyOJXZu4Ti4kY3V+j5MpSskZLh/NoG00J2pAeWkt/CS34IKrGH3V2mCO00VsKrt6+umrCUalHFm7a076zuz0DjOOB8F+QHCSPIe+eL31x6VtzqDfLFhMlWZV9dcYP51MimhE3F8BQl40+bPAreP4Omz2RvDx4aM7lwePi5YZDLRKDGrtL5Q== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB6PR0801MB1879.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(26005)(9686003)(4326008)(76116006)(91956017)(38070700005)(64756008)(66476007)(66556008)(66446008)(66946007)(52536014)(508600001)(86362001)(122000001)(316002)(5660300002)(33656002)(7696005)(8676002)(186003)(38100700002)(6506007)(8936002)(2906002)(83380400001)(4744005)(6916009)(71200400001)(55016003); DIR:OUT; SFP:1101; MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB4412 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR03FT049.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 8edd3671-ae7d-4557-7c26-08da3cd38d95 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AdTxAnKhYCc4Lgc1t/ETzVZArHnbGYkRSuRW4bIFcXNxjw1dEFaHr92Bct377ur22mmvt+dyXhqkethdj+6Z+d3cZt2JJbIiJQj8p9Z6caVOm6dd7eCI+1xiHnnPTKQE4ixF4wGdmy2qbvg1a5MRCnZ0XKgVWXeaBEr4lJuSbiJCRC5P5sNIb9oTKYNseXe4UHcRk+Lp4pIFWjq6FckweAomEuxri3zc3PalgIdR1AnowcP5bRQ0puxZzdDLXI7OtAA81jfRzh0GXkZSbSgingZqMQrGXqbBqFm0MvFaPNPo5+hSRuG4316WXcHEvp6yCiiwJw44SphM6NgMDndV1gfB8LKrdhxaro/0h69IPHiSQQzNs/f93u82TMKjY0my/LOHvZ+7Rm9THVtEtz3DC1ZRtz5BWyCSbj21U862PdaJ04ivk0a+lY3lRKjVeaWcO9Q9t6vcmH1omEZzGLDvQ1BYlZ7piagfmrArhcE8dI4dlFvBc9onGhnSVoWoHkvh52VCvqkrwotJT8Ch0to3zVADpzhqpjILUhxzL1j4MyZzaIpRDQpr29CKiA47wSigkcv9uwzRbJQC9lqXpQD5116TdzX3qpI7lcsyT+SZOFKf1+mkQfNawlbUX+kx4OR5N6CxHfPNnp/U1TMGuV2g+WxqXna3Bm+uU1ZUU7ljiagScNZt6bZrzq23Xrk7Qkuq 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:(13230001)(4636009)(46966006)(40470700004)(36840700001)(7696005)(336012)(4326008)(8676002)(40460700003)(26005)(9686003)(55016003)(47076005)(83380400001)(86362001)(70586007)(6506007)(6916009)(4744005)(33656002)(70206006)(107886003)(316002)(36860700001)(2906002)(356005)(8936002)(5660300002)(508600001)(82310400005)(52536014)(186003)(81166007); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2022 15:47:42.0958 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 11e67710-0e2f-48cd-b250-08da3cd3929f 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: VE1EUR03FT049.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR08MB3212 X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, 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: Wilco Dijkstra via Libc-alpha From: Wilco Dijkstra Reply-To: Wilco Dijkstra Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" v2: remove flags2 update altogether since it isn't needed. Remove an unconditional RMW on flags2 in flockfile - we don't need to change _IO_FLAGS2_NEED_LOCK since it isn't used in flockfile or funlockfile. This fixes BZ #27842. Reviewed-by: Adhemerval Zanella diff --git a/stdio-common/flockfile.c b/stdio-common/flockfile.c index a5decb450f8d477e3105d02661282afeab58f88b..49f72c69ab7a4ccca6f21d443c6fc3a0eca76376 100644 --- a/stdio-common/flockfile.c +++ b/stdio-common/flockfile.c @@ -22,7 +22,6 @@ void __flockfile (FILE *stream) { - stream->_flags2 |= _IO_FLAGS2_NEED_LOCK; _IO_lock_lock (*stream->_lock); } weak_alias (__flockfile, flockfile);