From patchwork Tue Feb 15 17:07:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joey Gouly X-Patchwork-Id: 12747368 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 84471C433F5 for ; Tue, 15 Feb 2022 17:09:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=AtlgIWvMrMoOURXg98UpzIs9XPc5HAnCaIWcB6s79uA=; b=m/7PJCKZgL6Lcf 8tTFMS2IDxe8wSxHI026e0OC1dtHZnmtxjusGx8QrdAuTl87ol3iGZQmMJHPS8g5UD2zlqSMjwc3Q PjS5q/oZn0Un6las5EZFEb/lM2Q0I2BrK5M8mTqmL0vVLcmJzke4rzXzeLtFHzQT23dBLGT/HETtn e3gsoQ8aRG2Et56xIejTSQswDwhsz1nIMiV3Q3XuUZKcQ3sFIpEI8BQlAAjkHGPRKqxuRNXfa/sxQ XSlIwg21SUc72ga6iJZoOcUtYZf8/05sTQ8VJ7kbH/DKJfqe6jUk7Q17xRaSA+H7o4xCWWBPVYnUq l4fWMsKRO/ZyAJ6CsdUw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nK1J6-003plP-MN; Tue, 15 Feb 2022 17:08:04 +0000 Received: from mail-db3eur04on0607.outbound.protection.outlook.com ([2a01:111:f400:fe0c::607] helo=EUR04-DB3-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nK1Iz-003piO-0B for linux-arm-kernel@lists.infradead.org; Tue, 15 Feb 2022 17:08:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0fs8d+LsBei1lc6GMcq1ofTM9odkyhcGFcTO4pCOVMg=; b=eByIVSh4N1YnjQ/k83GxUkFp5Pbz7gmvDwDbAqycLAa0rA4ralWBqiXw5wbB1sUc7ufhI2H7hzQjMXQpEZr5IAdf9BS0k8+gaoWWFvxUXYhR5JiJhjzcbNalg0egguTejhfhHBhcRu/YFh8hhs0f4D30gkh14b04bqrFc2dw1Js= Received: from DB6PR07CA0171.eurprd07.prod.outlook.com (2603:10a6:6:43::25) by DU0PR08MB7463.eurprd08.prod.outlook.com (2603:10a6:10:356::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11; Tue, 15 Feb 2022 17:07:50 +0000 Received: from DB5EUR03FT007.eop-EUR03.prod.protection.outlook.com (2603:10a6:6:43:cafe::b) by DB6PR07CA0171.outlook.office365.com (2603:10a6:6:43::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.6 via Frontend Transport; Tue, 15 Feb 2022 17:07:50 +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; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT007.mail.protection.outlook.com (10.152.20.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11 via Frontend Transport; Tue, 15 Feb 2022 17:07:50 +0000 Received: ("Tessian outbound 18e50a6f0513:v113"); Tue, 15 Feb 2022 17:07:50 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: d490cd566c84371e X-CR-MTA-TID: 64aa7808 Received: from 6426f54f9945.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id C4E3BBDE-D3DA-41D8-84B8-7F6D5B18BE59.1; Tue, 15 Feb 2022 17:07:44 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 6426f54f9945.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 15 Feb 2022 17:07:44 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FfjcxW5bBbAh1665WRvqiZG45YVoWgIFx7Codw3T+bmIBZJc2ap30I04XHJDPb4EwWCQlOYL5JWD5UEmyN7ZjrxmpgjwABMGGDlLv3YDW+BpgdVMGygzcCguVbg/ZQ0psfilI+WNwJnYCRhOKY5gBi0NCJYOnSS1o2wHz8+a7ComAiJpY7C/Yw9Ccdp0JbJi9q5v3Z/DUmXaK1xXM88Dq51IhVHhnhv6ACpW5q+htfkzjENdgTEnkhjgOLKx8UUQ8nN8JzdS52P5KL6xK2PfeGOYH87BHng8VbsXq2UVLlBZDv6RReYVKD5oSABwc3Lmn02bR/Ni2yGSxyxKW9aC2g== 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=0fs8d+LsBei1lc6GMcq1ofTM9odkyhcGFcTO4pCOVMg=; b=iD403IelqMOlQRDtUlw25clq8Omzt2qx7kPsGSwnh5ZmLIRygMGEeLLJrQhnV3r9/2G+nbdAHXoWLTOj+Hqbr7VrXGvjPps14jPuumKvpbI04KtiuNeWsWAWvpNIEUsLW7MJg3CMv+aKh8tsLpmlDjqohbBaicE6TJu3Sp7cPG9Un5xP/8fd96NjrgTcpTduBf47WsRrDdM6lWv32iD+T54AqgJRS4LPYPpjjxi+o5bFb9uviq1+rBarnSauczJEynd67MhlrlZPnF68P1y2xTLWxbT8RLlzfMLv2xqPfhYFT6w6Atxoj52YibvYbJwAYSKfAaKfmb5cEvmbl52lPg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=lists.infradead.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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0fs8d+LsBei1lc6GMcq1ofTM9odkyhcGFcTO4pCOVMg=; b=eByIVSh4N1YnjQ/k83GxUkFp5Pbz7gmvDwDbAqycLAa0rA4ralWBqiXw5wbB1sUc7ufhI2H7hzQjMXQpEZr5IAdf9BS0k8+gaoWWFvxUXYhR5JiJhjzcbNalg0egguTejhfhHBhcRu/YFh8hhs0f4D30gkh14b04bqrFc2dw1Js= Received: from AM6PR05CA0030.eurprd05.prod.outlook.com (2603:10a6:20b:2e::43) by AM9PR08MB6756.eurprd08.prod.outlook.com (2603:10a6:20b:30d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.14; Tue, 15 Feb 2022 17:07:43 +0000 Received: from AM5EUR03FT011.eop-EUR03.prod.protection.outlook.com (2603:10a6:20b:2e:cafe::96) by AM6PR05CA0030.outlook.office365.com (2603:10a6:20b:2e::43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4995.14 via Frontend Transport; Tue, 15 Feb 2022 17:07:43 +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; Received: from nebula.arm.com (40.67.248.234) by AM5EUR03FT011.mail.protection.outlook.com (10.152.16.152) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4975.11 via Frontend Transport; Tue, 15 Feb 2022 17:07:42 +0000 Received: from AZ-NEU-EX03.Arm.com (10.251.24.31) by AZ-NEU-EX04.Arm.com (10.251.24.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.20; Tue, 15 Feb 2022 17:07:43 +0000 Received: from e124191.cambridge.arm.com (10.1.197.45) by mail.arm.com (10.251.24.31) with Microsoft SMTP Server id 15.1.2308.20 via Frontend Transport; Tue, 15 Feb 2022 17:07:43 +0000 From: Joey Gouly To: CC: , , , , , Subject: [PATCH v1 3/3] Revert "arm64: Mitigate MTE issues with str{n}cmp()" Date: Tue, 15 Feb 2022 17:07:23 +0000 Message-ID: <20220215170723.21266-4-joey.gouly@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220215170723.21266-1-joey.gouly@arm.com> References: <20220215170723.21266-1-joey.gouly@arm.com> MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: 033f33cc-b43d-4ebe-3a2f-08d9f0a5b2b2 X-MS-TrafficTypeDiagnostic: AM9PR08MB6756:EE_|DB5EUR03FT007:EE_|DU0PR08MB7463:EE_ X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:843;OLM:843; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: Dn2qAvp6WaC3426Y1TK6xZZ9664jTxU4Bx+18Wxsee3cj8esfTeorE4XPTDqL2ZouWkFbjJuHrcogDk8Xu/ZrMKV/LG4msY/BTIo1C5YU50lYEvL6FNeIe7eoXDDXFaaUtl6W52VMtc4xxllbudTOOoGrP2+QK5AXTzXYPZzq3wh1v0tYoI633qd2JjMDX2kYoAklp4kMslNv/OYEPJCg1qwH16+n04nkpDOKrnKV6g1W/NMgjsXFZaWhjdbSqddMlTqdpSozyLBfO045SJeFem+odej54LSM7N41QFMR0uypv25OL99w/SCS2K+je60EgEyy5uNSAU3h2mAr4NabsARMfouknmxNWIW1Td/awHF2P3tVO3QjODRpCKNUlyHVLnZ3BjAtIDFB2TCCi14pgibfkOd0zjOtILy8EwWEq/HcRXZ1elgm9JMQQqf17lnEf418khjHbBwsvzfJzNRCbeNNo1K/LlJYGnm+dPucFpU+FJWprzb8pRr5EsgvlrpIZlWb2S2R6FlnZqc0JJS9UIiDqe/2TRpxLSAnU0qOhqejYwFMtGHxS7rD+Athu96Roe9nsuraRkT1Jwo6dbbp92BlSCjOLtHQDCfURPEZQU90LIXre2ut5bDBFcqSEga8BHZiWmVTlU6osUWBakPoZwEz6uTX1Ddqr3i6QwxsQUkmgmW9Rc7M4ookWAc2TuloK4e9ZbqTmGc904iXoYATA== 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:(13230001)(4636009)(36840700001)(40470700004)(46966006)(2616005)(8676002)(8936002)(36756003)(86362001)(82310400004)(4326008)(70206006)(70586007)(2906002)(44832011)(40460700003)(426003)(83380400001)(47076005)(1076003)(26005)(186003)(336012)(5660300002)(36860700001)(7696005)(356005)(508600001)(81166007)(316002)(54906003)(6916009)(6666004)(36900700001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR08MB6756 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT007.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 25ad0ca9-4f6e-4a61-25e6-08d9f0a5ae0b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: J1v3nltDmq1t61lcPz9MpK3zE6cE2gzTVhaMVBpSg7OBBCmvev8qRYm1bAbPomCY8x2Gd7FS8GJTWAVZ1goz3kMwx3IrwFpqwx5DWB1rEeJy4bpn43R2uaSzq+CXiRMufKmS+did8pbpAbfWKdNArwCuI2f2N1Yn15CZ+VdE7guxBLgtvXspnHY7Zd83GxNzMIpJhA9tjp1ietwTfcq7MboEahooeHu1EjB9pCusDBE3GHpZQX0Y5uXC9077FW1XzsgHUkFrlE/zvHhkpQzoTGYCwR2jjPtd1xBjyvOKWwWFmMr2Huc8Tfjw7DJYP2WI7jdMKU2Cb5ajY2Z/URdCANpp7i8XabgykTBQelKJjblJFRxJTRdPdkSKWbHd7ExG8YnkuraLEwPE1JvPvQPVM2nlY5gkrhDRpPt3zBiMWg9jcyGnoCBKg8VHvMJGjQmn95enD1H+Lj8Mz5nxA6XsW+xohqri8vFGnzOvC4cMIycGXp3NFFrvUaH3i7oauB+gKnqhq5VgGnhaSAt6iUTvdnCDw9GrtGRRI8tH8ehC7X+dSc8aQb5StyGfZgOdctTYMfbDg50BEf2CLqsHmddh5sJjL97To7lAY8852j4ce5XYaYTQRxqghASwWxLbqM2fGGFZvvQUAX0FsR5GqQray9apjNm+2qUI1ULLWw++mmQClfNq1+q2KjRN71q5tzpV 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)(40470700004)(36840700001)(46966006)(82310400004)(2906002)(2616005)(5660300002)(186003)(26005)(81166007)(36860700001)(47076005)(36756003)(44832011)(83380400001)(426003)(336012)(1076003)(107886003)(4326008)(70586007)(70206006)(508600001)(6666004)(7696005)(86362001)(8936002)(54906003)(316002)(8676002)(40460700003)(6916009); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2022 17:07:50.7845 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 033f33cc-b43d-4ebe-3a2f-08d9f0a5b2b2 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: DB5EUR03FT007.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB7463 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220215_090757_150932_24302789 X-CRM114-Status: GOOD ( 10.83 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This reverts commit 59a68d4138086c015ab8241c3267eec5550fbd44. Now that the str{n}cmp functions have been updated to handle MTE properly, the workaround to use the generic functions is no longer needed. Signed-off-by: Joey Gouly Cc: Robin Murphy Cc: Mark Rutland Cc: Catalin Marinas Cc: Will Deacon --- arch/arm64/include/asm/assembler.h | 5 ----- arch/arm64/include/asm/string.h | 2 -- arch/arm64/lib/strcmp.S | 2 +- arch/arm64/lib/strncmp.S | 2 +- 4 files changed, 2 insertions(+), 9 deletions(-) diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h index e8bd0af0141c..8df412178efb 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@ -535,11 +535,6 @@ alternative_endif #define EXPORT_SYMBOL_NOKASAN(name) EXPORT_SYMBOL(name) #endif -#ifdef CONFIG_KASAN_HW_TAGS -#define EXPORT_SYMBOL_NOHWKASAN(name) -#else -#define EXPORT_SYMBOL_NOHWKASAN(name) EXPORT_SYMBOL_NOKASAN(name) -#endif /* * Emit a 64-bit absolute little endian symbol reference in a way that * ensures that it will be resolved at build time, even when building a diff --git a/arch/arm64/include/asm/string.h b/arch/arm64/include/asm/string.h index 95f7686b728d..3a3264ff47b9 100644 --- a/arch/arm64/include/asm/string.h +++ b/arch/arm64/include/asm/string.h @@ -12,13 +12,11 @@ extern char *strrchr(const char *, int c); #define __HAVE_ARCH_STRCHR extern char *strchr(const char *, int c); -#ifndef CONFIG_KASAN_HW_TAGS #define __HAVE_ARCH_STRCMP extern int strcmp(const char *, const char *); #define __HAVE_ARCH_STRNCMP extern int strncmp(const char *, const char *, __kernel_size_t); -#endif #define __HAVE_ARCH_STRLEN extern __kernel_size_t strlen(const char *); diff --git a/arch/arm64/lib/strcmp.S b/arch/arm64/lib/strcmp.S index 758de77afd2f..e6815a3dd265 100644 --- a/arch/arm64/lib/strcmp.S +++ b/arch/arm64/lib/strcmp.S @@ -187,4 +187,4 @@ L(done): ret SYM_FUNC_END_PI(strcmp) -EXPORT_SYMBOL_NOHWKASAN(strcmp) +EXPORT_SYMBOL_NOKASAN(strcmp) diff --git a/arch/arm64/lib/strncmp.S b/arch/arm64/lib/strncmp.S index a4884b97e9a8..bc195cb86693 100644 --- a/arch/arm64/lib/strncmp.S +++ b/arch/arm64/lib/strncmp.S @@ -306,4 +306,4 @@ L(ret0): mov result, #0 ret SYM_FUNC_END_PI(strncmp) -EXPORT_SYMBOL_NOHWKASAN(strncmp) +EXPORT_SYMBOL_NOKASAN(strncmp)