From patchwork Thu Apr 30 17:44:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szabolcs Nagy X-Patchwork-Id: 38891 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 8C0D0395CCC1; Thu, 30 Apr 2020 17:45:05 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140057.outbound.protection.outlook.com [40.107.14.57]) by sourceware.org (Postfix) with ESMTPS id A34DB395C826 for ; Thu, 30 Apr 2020 17:45:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A34DB395C826 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=Szabolcs.Nagy@arm.com 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=+6jNoikWpeJEhW7sQAFlp0Jjs/bkQpTDso+Un6YEGco=; b=Meu7QVgeXOVlHk3RVc9UOz24axSj80a/Fo2+4nGLleEjWPsY8R49ywJqGmfdHVbICz8l9/ejeOjYa+e/xNxYEK5vJB0U1PpsXwl1nbvDCaTKmxrg/1GxVuy8XVVxlGzCcXEc99JLpt8q7FDalTNndcmuOyS4LWh9QvBpwddrydI= Received: from DB6P191CA0016.EURP191.PROD.OUTLOOK.COM (2603:10a6:6:28::26) by AM6PR08MB4721.eurprd08.prod.outlook.com (2603:10a6:20b:c7::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20; Thu, 30 Apr 2020 17:44:59 +0000 Received: from DB5EUR03FT022.eop-EUR03.prod.protection.outlook.com (2603:10a6:6:28:cafe::1c) by DB6P191CA0016.outlook.office365.com (2603:10a6:6:28::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.19 via Frontend Transport; Thu, 30 Apr 2020 17:44:59 +0000 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=bestguesspass 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 DB5EUR03FT022.mail.protection.outlook.com (10.152.20.171) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20 via Frontend Transport; Thu, 30 Apr 2020 17:44:59 +0000 Received: ("Tessian outbound 5abcb386707e:v54"); Thu, 30 Apr 2020 17:44:59 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 92429e92061b9e83 X-CR-MTA-TID: 64aa7808 Received: from 055f61050c78.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 26D5CE72-B3F7-435B-A5FF-8C77ADE20E13.1; Thu, 30 Apr 2020 17:44:54 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 055f61050c78.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Thu, 30 Apr 2020 17:44:54 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TNY/vbjiL6LpcR0PEwxCTdax+dM3MHxg5vPWNv/9UB7CUctNXXqIECNAS0TstW1wHkr694nAY889DBQtCfk1QXuJpulSUlzwVuiwXIeI0RnQDMX+LnKphYAOEd3dPp9EkAoIRvyQ66Hu0pULam8e3Re5Yy8B3Epz1B+OVmpIa9Y/E/v0DEiSsBY9GZ8Kplkkrf8HJV/Prs9E6UGy8jUtozzNRkYK81pRUpdM2ua14DYoRtUEK4sHatNBjV0zneCnHH8r9Xoa3SciIOKlQZRLZcJgQhWmfhpGzChliD5OoyW+h6FJd3Tk88TJs9ruiCoD9FP/vI2Q0173J2aspSGo3Q== 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=+6jNoikWpeJEhW7sQAFlp0Jjs/bkQpTDso+Un6YEGco=; b=AhGBmlxLIg/xYiETkrVyenGE9jyA02SH/i2/v9DGdbEi+VrQy+vaoehxiMh/UX9RZWmzwrvw4xDJC0y8z97Klg5YY8LBytK6z2MEdywC7WY1D5Zk258VxxpM31cqzkS6xXVhRYfPCUEOG22V9/NLwVKkIHmOtIFwX/Rkdp5XCfiFuOvmsekrGqHNWoysuHrNKK2qzwn6ILl8AQtNyzL5A5uZHMvqfZXDx9N43h70Hld7hoR7n8Sx/MlE+Zavh7G8oasC/6xIAsOvRKBCl/Y2l9Q6PvsNXmsIxMQgobgoGKQ3iXSD1Wmp0H15znYOZfayzK15PlF6GODME6fUXJgiSA== 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 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=+6jNoikWpeJEhW7sQAFlp0Jjs/bkQpTDso+Un6YEGco=; b=Meu7QVgeXOVlHk3RVc9UOz24axSj80a/Fo2+4nGLleEjWPsY8R49ywJqGmfdHVbICz8l9/ejeOjYa+e/xNxYEK5vJB0U1PpsXwl1nbvDCaTKmxrg/1GxVuy8XVVxlGzCcXEc99JLpt8q7FDalTNndcmuOyS4LWh9QvBpwddrydI= 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 AM6PR08MB3047.eurprd08.prod.outlook.com (2603:10a6:209:4c::23) by AM6PR08MB3224.eurprd08.prod.outlook.com (2603:10a6:209:47::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.19; Thu, 30 Apr 2020 17:44:53 +0000 Received: from AM6PR08MB3047.eurprd08.prod.outlook.com ([fe80::49fd:6ded:4da7:8862]) by AM6PR08MB3047.eurprd08.prod.outlook.com ([fe80::49fd:6ded:4da7:8862%7]) with mapi id 15.20.2958.020; Thu, 30 Apr 2020 17:44:53 +0000 Date: Thu, 30 Apr 2020 18:44:46 +0100 From: Szabolcs Nagy To: libc-alpha@sourceware.org Subject: [PATCH 10/12] aarch64: Add pac-ret support to asm files Message-ID: <20200430174446.GF29015@arm.com> References: <20200430173458.GV29015@arm.com> In-Reply-To: <20200430173458.GV29015@arm.com> User-Agent: Mutt/1.9.4 (2018-02-28) X-ClientProxiedBy: SN4PR0601CA0012.namprd06.prod.outlook.com (2603:10b6:803:2f::22) To AM6PR08MB3047.eurprd08.prod.outlook.com (2603:10a6:209:4c::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from arm.com (217.140.106.55) by SN4PR0601CA0012.namprd06.prod.outlook.com (2603:10b6:803:2f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20 via Frontend Transport; Thu, 30 Apr 2020 17:44:52 +0000 X-Originating-IP: [217.140.106.55] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 24a70589-10bd-4a44-8460-08d7ed2e3434 X-MS-TrafficTypeDiagnostic: AM6PR08MB3224:|AM6PR08MB3224:|AM6PR08MB4721: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:6108;OLM:6108; X-Forefront-PRVS: 0389EDA07F X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: 4KR6pNrLAp6ARdlGh2Qb4d0WVW7mSpZDb/US70W5ZsUo3u4WxvI6EjTMQYtOCIzyJBAnF2c6EiV6JMvW/sUhvcJk0t/99MywBvAgWKGpP2l3DTZqV6O7AczABo5vwh63Z4jc8YRUXX5SKix1Q3YS1bkP5t/tMTG3uatVtIYQpoSSpbMFEUE82/wzQN5SEOt26N62qBLdimgGfyLX3MIa0JJzaiqh5tI4o+fo69HLkwRxOhKrjAs1d+UQcSqexMMw4ThDAo5SWOo9WtLNGcZSAtkCBYm4T8x/VCn8o8DIYlebkVDa1ft9+HZWKC5ib0zPzbRPxfZ30AXvR8t55x41+EUQW0mDyka+4LQvrcIXNf3XTEcsjJ6xkj2rElK7vyPd X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR08MB3047.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(346002)(376002)(366004)(396003)(136003)(39860400002)(1076003)(86362001)(33656002)(36756003)(66946007)(235185007)(66476007)(8886007)(55016002)(66556008)(66616009)(564344004)(478600001)(16526019)(26005)(186003)(52116002)(6916009)(44832011)(7696005)(33964004)(2906002)(4326008)(8676002)(8936002)(44144004)(6666004)(956004)(2616005)(316002)(2700100001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: g8CUyDEW2D/Q8s1Qo8fLLXnQEMBFzZtOJnckaNMQGdA/OEH/lCKsT6pnHwfmSqUT/mKDoREtXlRrJNmYq6Yi8r5RMoUUBtHvnxR0Hv7sSvtnkRiRZL7brrhPevtdV4Vzw47o4OZYXYJgCL1j/Qzhndgo8PRjGmLONUy6hllL4T0xps9go8EfG57aNjzJPj74MBtcszNGmmEpps82nBR+6GpsXZg0hiZCZMV6q4DOesSYRy0MVJbPKFZuccl1eoJyPcZzSoOFRjxkBJ6MBJrtbVKQdWzjY5n0yZXmQ4lA0y5BsgQqAbmsEumhISjw3X/4B0GJH7Mo/WA6fo1KQwC/y8mi+FkJN5UodCNyygMmPeNKjdyF84lbdlnb1dU0dOA2xY1llvndm0hV6SsUOUM0Py9iDSjjKbuLKhCjFDiOhsK9HSaw4V8ynYCXT2mPI/Om4t3X1d9JqM700yROB/8RT+iy/D5kUx2k27YOUJrGU2ECz7Wz8kydjIoisJvMTNr08CiqOTd3tLTOhPiumVSUSHWQTfLD/AITrglzzYeuSslyL6ErInwkEyFxGHJNJfhf0Z7tTb79p9QUuK/sMU/GoCPycJl4RZbOoEGyJJfY1rFAJVWBlx7zl+RKIPSizdDfqNL+vmlrH0a9kLdwshth7PN69k+Aj8qPhiTT20C3RI8QjZdDWdqYrbm4Rpto8ITZl3KP2EGZ29ozVwc70S2+PWxD6Vsf1NtAqc5Z9UiFm1x1CHiUKyCaa+ZFc6bCuBnMt8hjO9KzOPcclA5wvwYydmuX5S2J0OiVKLjWerbcC9Q= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3224 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: DB5EUR03FT022.eop-EUR03.prod.protection.outlook.com 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; SFTY:; SFS:(4636009)(376002)(396003)(136003)(39860400002)(346002)(46966005)(16526019)(1076003)(956004)(336012)(356005)(4326008)(186003)(36756003)(26005)(81166007)(47076004)(2906002)(44832011)(82310400002)(564344004)(82740400003)(2616005)(6916009)(8936002)(86362001)(316002)(235185007)(33656002)(70206006)(8676002)(6666004)(478600001)(8886007)(7696005)(55016002)(44144004)(33964004)(66616009)(70586007)(2700100001); DIR:OUT; SFP:1101; X-MS-Office365-Filtering-Correlation-Id-Prvs: 76a5c4d3-b5e1-4de4-4df7-08d7ed2e306d X-Forefront-PRVS: 0389EDA07F X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: THNe7Q7wGsvgf8Y67KWSRWYPlrhtQPgPAcZBtJUgISNTJJU//ecATPNv2M10I+HaujLn5/pNiJe9E7ehXWYjlb0s8hVNn3xVVPntuxJfEPgNbVmzRMWO529/eCgYKYQPfTZ6tLHvHYDct4/W5FXp6NjFD0aEE6jbSXhjEUezyAFkn1mSt3givkdtdKQ3WN9ru/Z7UhV7XZe9oqOLDcfoRUMsgI9N3LTMvlCg/a1OQDugcG7im8EHzdocxdZ/TIdcTFefNb7xj8QHFOKBw6O5JofFsMn5fIjhmPEu9fYbUk7JX9V8bJQ64+nbRdRHDDx9EfYLrZjMKpIQ76q5PQwHIOMyR0Yoqjib5LC3/3q0iOOLdlUdbjJYLJvl0Z007BtyKsR4h/3/qrCxnRxJut3nwLIcNaPavNW0KINKWUpyWA0= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2020 17:44:59.6280 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 24a70589-10bd-4a44-8460-08d7ed2e3434 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-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4721 X-Spam-Status: No, score=-29.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, 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 Content-Disposition: attachment; filename="0010-aarch64-Add-pac-ret-support-to-asm-files.patch" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 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: , Cc: Sudakshina Das Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" From de8968ed58686c26391de8343184a1283bb5e305 Mon Sep 17 00:00:00 2001 From: Szabolcs Nagy Date: Wed, 29 Apr 2020 11:49:20 +0100 Subject: [PATCH 10/12] aarch64: Add pac-ret support to asm files This patch unconditionally enables pac-ret in asm files. TODO: This will need configure checks, cannot be done unconditionally because we cannot guarantee pac-ret compatibility (e.g. libgcc unwinder had no support for it before gcc-7 and newer libgcc had bugs that could cause unwind crash when pac-ret and non-pac-ret stack frames are mixed) --- sysdeps/aarch64/crti.S | 8 ++++++++ sysdeps/aarch64/crtn.S | 6 ++++++ sysdeps/aarch64/dl-tlsdesc.S | 8 ++++++++ sysdeps/aarch64/dl-trampoline.S | 15 ++++++++++++++- sysdeps/aarch64/sysdep.h | 18 +++++++++++++++++- 5 files changed, 53 insertions(+), 2 deletions(-) diff --git a/sysdeps/aarch64/crti.S b/sysdeps/aarch64/crti.S index 89a9e25f5b..36f58c9a01 100644 --- a/sysdeps/aarch64/crti.S +++ b/sysdeps/aarch64/crti.S @@ -75,7 +75,11 @@ call_weak_fn: .hidden _init .type _init, %function _init: +#if ENABLE_PAC_RET + PACIASP +#else BTI_C +#endif stp x29, x30, [sp, -16]! mov x29, sp #if PREINIT_FUNCTION_WEAK @@ -90,7 +94,11 @@ _init: .hidden _fini .type _fini, %function _fini: +#if ENABLE_PAC_RET + PACIASP +#else BTI_C +#endif stp x29, x30, [sp, -16]! mov x29, sp diff --git a/sysdeps/aarch64/crtn.S b/sysdeps/aarch64/crtn.S index 94a6f970ef..e1cb74a572 100644 --- a/sysdeps/aarch64/crtn.S +++ b/sysdeps/aarch64/crtn.S @@ -41,10 +41,16 @@ .section .init,"ax",%progbits ldp x29, x30, [sp], 16 +#if ENABLE_PAC_RET + AUTIASP +#endif RET .section .fini,"ax",%progbits ldp x29, x30, [sp], 16 +#if ENABLE_PAC_RET + AUTIASP +#endif RET END_FILE diff --git a/sysdeps/aarch64/dl-tlsdesc.S b/sysdeps/aarch64/dl-tlsdesc.S index d55e0443aa..25628d942f 100644 --- a/sysdeps/aarch64/dl-tlsdesc.S +++ b/sysdeps/aarch64/dl-tlsdesc.S @@ -183,6 +183,10 @@ _dl_tlsdesc_dynamic: callee will trash. */ /* Save the remaining registers that we must treat as caller save. */ +# if ENABLE_PAC_RET + PACIASP + cfi_window_save +# endif # define NSAVEXREGPAIRS 8 stp x29, x30, [sp,#-16*NSAVEXREGPAIRS]! cfi_adjust_cfa_offset (16*NSAVEXREGPAIRS) @@ -233,6 +237,10 @@ _dl_tlsdesc_dynamic: cfi_adjust_cfa_offset (-16*NSAVEXREGPAIRS) cfi_restore (x29) cfi_restore (x30) +#if ENABLE_PAC_RET + AUTIASP + cfi_window_save +#endif b 1b cfi_endproc .size _dl_tlsdesc_dynamic, .-_dl_tlsdesc_dynamic diff --git a/sysdeps/aarch64/dl-trampoline.S b/sysdeps/aarch64/dl-trampoline.S index fba5689d09..c0c4c23128 100644 --- a/sysdeps/aarch64/dl-trampoline.S +++ b/sysdeps/aarch64/dl-trampoline.S @@ -127,7 +127,12 @@ _dl_runtime_resolve: cfi_startproc .align 2 _dl_runtime_profile: +# if ENABLE_PAC_RET + PACIASP + cfi_window_save +# else BTI_C +# endif /* AArch64 we get called with: ip0 &PLTGOT[2] ip1 temp(dl resolver entry point) @@ -291,9 +296,17 @@ _dl_runtime_profile: cfi_def_cfa_register (sp) ldr x29, [x29, #0] cfi_restore(x29) +# if ENABLE_PAC_RET + add sp, sp, SF_SIZE + cfi_adjust_cfa_offset (-SF_SIZE) + AUTIASP + cfi_window_save + add sp, sp, 16 + cfi_adjust_cfa_offset (-16) +# else add sp, sp, SF_SIZE + 16 cfi_adjust_cfa_offset (- SF_SIZE - 16) - +# endif br lr cfi_endproc diff --git a/sysdeps/aarch64/sysdep.h b/sysdeps/aarch64/sysdep.h index 07dc7858a5..63a04a70cd 100644 --- a/sysdeps/aarch64/sysdep.h +++ b/sysdeps/aarch64/sysdep.h @@ -45,6 +45,18 @@ #define BTI_C hint 34 #define BTI_J hint 36 +/* Return address signing support (pac-ret). */ +#define ENABLE_PAC_RET 1 +#if ENABLE_PAC_RET +# define PACIASP hint 25 +# define AUTIASP hint 29 +# define PACIASP_AND_BTI_C PACIASP +#else +# define PACIASP +# define AUTIASP +# define PACIASP_AND_BTI_C BTI_C +#endif + #define FEATURE_1_BTI 1 #define FEATURE_1_PAC 2 @@ -61,7 +73,11 @@ .word features; \ .word 0; -#define END_FILE GNU_PROPERTY(FEATURE_1_BTI) +#if ENABLE_PAC_RET +# define END_FILE GNU_PROPERTY(FEATURE_1_BTI|FEATURE_1_PAC) +#else +# define END_FILE GNU_PROPERTY(FEATURE_1_BTI) +#endif /* Define an entry point visible from C. */ #define ENTRY(name) \ -- 2.17.1