From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2087.outbound.protection.outlook.com [40.107.22.87]) by sourceware.org (Postfix) with ESMTPS id 661893858D33 for ; Tue, 10 Jan 2023 14:03:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 661893858D33 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=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=dC1sRrp0vq4ekTr5BlAx6wndJSe4fFbDYAELuXcKkkc=; b=K3uJ2mZwcJ+qXuGTlTuMlN2mY1nZkKs7UGFe2wW5Per2xvzEzkP1YITx8rCaaeVsjdp0Urkfb/CdgDjU5EcqjF9rMi9ABz8WxUOs5Re4wtFkBS+U1CePzYSoHACt3PPTPPOYV+ZaUt893ROyl5LngNWDjbwVgtr/1boPxxHTFug= Received: from DB6PR0501CA0044.eurprd05.prod.outlook.com (2603:10a6:4:67::30) by DB9PR08MB6730.eurprd08.prod.outlook.com (2603:10a6:10:2a2::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.18; Tue, 10 Jan 2023 14:02:53 +0000 Received: from DBAEUR03FT035.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:67:cafe::65) by DB6PR0501CA0044.outlook.office365.com (2603:10a6:4:67::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.18 via Frontend Transport; Tue, 10 Jan 2023 14:02:53 +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 DBAEUR03FT035.mail.protection.outlook.com (100.127.142.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.18 via Frontend Transport; Tue, 10 Jan 2023 14:02:53 +0000 Received: ("Tessian outbound 0d7b2ab0f13d:v132"); Tue, 10 Jan 2023 14:02:53 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 84ec871837f138ac X-CR-MTA-TID: 64aa7808 Received: from c53a55f6e975.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 786278DB-4F89-4247-AA53-6BAA77E56BD6.1; Tue, 10 Jan 2023 14:02:47 +0000 Received: from EUR01-VE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id c53a55f6e975.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 10 Jan 2023 14:02:47 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z9+6V/rvAbCHg9G9fTtdSOF9QYuQjf5N4miqmu+95sLPwGtUA1811LL0dlmoqm6VxBmQqxPI7UoxLO0XYjG9aCrtQOEykD4rZ9Md+ZZg4Y4b7uDX9RJF6QC3rLSVNkNrm3HqAc5/gEd0JeNruGdCwiZc68c6QJ0udsCzqtJ9OHBJI2AiglhDK7dffr1RyAaXqQd+5CKBaWqn5A8qd2U7B8o5w7iBnNsuEqLMG6+aMyVuU79LXqFKAf6V8sVBxok2GYQwRxUra/SuEVgMW1bK+uNE02g0+wpva3DoUbuuZ9qaCR9VcST80XoomQlhayv9VMxyXL+hAkuQ8uc0U//iag== 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=dC1sRrp0vq4ekTr5BlAx6wndJSe4fFbDYAELuXcKkkc=; b=f196ATAp1D5ABSl4XLsVxjGrI/uk48L3+wC2WjG8bdrNhObcMX8SIHx6QHHHLeXdSSOwxOpIooY7n6Iq09gEYa4NHBgXskIFz4ptKciD1w9B0OiCSDGsfto3CL4fsMs76H9s3+odyDa5CLCY9UQ2Ip2K4fgYg9RKijOk1EODoPPUcWtLbLeBrwdvi1oDJ3+2CZpx1bbbvCPJMhbITf9A+G86H1rMSzYxszEWpKuaVTd+ZdV96ku6PY0GWG7+B1nTbXV8v8kpn+fVretAczUJev1Eb8c5ya4E7reyX129hhX3vFdWqPOp94JVRggkxqn78UjkcKIsltJ0yBVk4PEuFA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=sourceware.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=dC1sRrp0vq4ekTr5BlAx6wndJSe4fFbDYAELuXcKkkc=; b=K3uJ2mZwcJ+qXuGTlTuMlN2mY1nZkKs7UGFe2wW5Per2xvzEzkP1YITx8rCaaeVsjdp0Urkfb/CdgDjU5EcqjF9rMi9ABz8WxUOs5Re4wtFkBS+U1CePzYSoHACt3PPTPPOYV+ZaUt893ROyl5LngNWDjbwVgtr/1boPxxHTFug= Received: from DUZPR01CA0135.eurprd01.prod.exchangelabs.com (2603:10a6:10:4bc::6) by AS8PR08MB8297.eurprd08.prod.outlook.com (2603:10a6:20b:537::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.18; Tue, 10 Jan 2023 14:02:44 +0000 Received: from DBAEUR03FT055.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:4bc:cafe::2f) by DUZPR01CA0135.outlook.office365.com (2603:10a6:10:4bc::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.15 via Frontend Transport; Tue, 10 Jan 2023 14:02:44 +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; pr=C Received: from nebula.arm.com (40.67.248.234) by DBAEUR03FT055.mail.protection.outlook.com (100.127.142.171) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5986.18 via Frontend Transport; Tue, 10 Jan 2023 14:02:44 +0000 Received: from AZ-NEU-EX04.Arm.com (10.251.24.32) 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.2507.16; Tue, 10 Jan 2023 14:02:41 +0000 Received: from e125768 (10.2.78.50) by mail.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.2507.16 via Frontend Transport; Tue, 10 Jan 2023 14:02:41 +0000 Date: Tue, 10 Jan 2023 14:02:08 +0000 Message-ID: From: "Victor L. Do Nascimento" To: CC: Subject: [PATCH v5b 8/8] newlib: libc: setjmp M-profile PACBTI-enablement MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 1 X-MS-TrafficTypeDiagnostic: DBAEUR03FT055:EE_|AS8PR08MB8297:EE_|DBAEUR03FT035:EE_|DB9PR08MB6730:EE_ X-MS-Office365-Filtering-Correlation-Id: 9d610fd7-7a47-4062-e159-08daf3135dea 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: T7mkLC3yxtA9rggcvG6sV6LTBhH05TfjgrJ2SX0m0xNPN1p/BEJKefANmAjGmFHnRwWrsR8KYI/7imyUn+ddxdkqqE8Fj1kgAw8RyG1SUWVk/aoZE2cvXlw9CnDVUkapBQKfzZj7BJVLlvLaOHuZilXokWzoLx7uLvuxEo2oIM1e8UsGfw+hwsAYRIbPGSCk2AA5lL6HEVwv9jFQZn/wH/hWKU9DGY+nGt6zKR0ZbI9eKnCOlBjCfz4wv7KaNeYTlI/NVu/K7ZVkXneF/uSELUZqy8h33J8DqTLloF7mrFBRx0NCGUBtos3b8WqzLaoJRzg8w/JWP6mJOUyyTh+r4UBmVFFmHLk2yuK6yNyxMxSLai8b9ZbXuMrv73rqQRO/x4amqMs7JrufrizfFZngYNMpR4UKnji0tceh2WRNqL27GogeHYigu5OTBl7b0kVLcCiNGTCG+H7XsBDfcoyqHSG6g5ejg9TpqzDDn4uBrtWmE24ThiI9CyyJPKK0QYsQqw70+7Pet80dZuL7XLTeurMNpq9cTFZSnFMRm6XDieQryauzTrcScy01XTxPkZ6/TyFYBdeHPsnyxe5GOJgDNT80Eqy3jVNQWtBnCid2c9qzwHBBKTWHd2Ue4eptNtxxJnykmkh1lhTZ3Ay7JgOdlYX9JfWjkpHj0ZpVajpYk8euLorHBb40tBTnlvF2Q5o+M01xMjRR3qFgPNVuHfwwWUAdUks6gX0hcME0zfGLqSk= 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:(13230022)(4636009)(376002)(39860400002)(346002)(136003)(396003)(451199015)(46966006)(36840700001)(36756003)(70586007)(86362001)(41300700001)(6916009)(4326008)(70206006)(8676002)(81166007)(356005)(82740400003)(36860700001)(478600001)(6666004)(82310400005)(186003)(26005)(2906002)(5660300002)(316002)(8936002)(40480700001)(83380400001)(47076005)(426003)(2616005)(336012)(42413004)(36900700001);DIR:OUT;SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB8297 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DBAEUR03FT035.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: ef243f09-662e-4c27-3ac0-08daf31358b8 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XN6Zjipdbbq7B5EQrU9OsRQgxcX3OTL7V+rli2vnwGYSC1JcAWYlMb8HRQwLk3iHuQ/t56+G8SMziliscZv9lf+K5V38MRU2iZm/9LJRXomJD569Ar0Ts1axMpQeMkAjGd+e5zweISpPUnx0lSF0TWfGXNvLGLt2oHEYfadVF95OMxd1ilBPEYFWK7r8p1VwPN2S3IhFDLyR++xQ9wRZRUSwR3/+N4zsnPiPtaPWiYI76Cp3p/N+CQ6Iq5Rbis33fmysjC/sRpridAH6QuMF9eELU874FAPGR3cagxOUsh/0C2ADEYsK5ldolksB0rJxtyk2f5rF9EhPW7mMoLATZTMRw6FZ74YVdWll/LZjD1jv1DZQczNqj+aK/Oc90mngKRXpiEKtqVQ9SyduOkwulfz4+fm7cuemyClyk26cCe1cZJqWvhmi4o7dND4UpEerWzd9tFEfrk1ANIPDeLYVoTGGtFWZsetpfZzSNOf0kh4mX7ri8iP7FrSDxZavPexpao3ygdZm91/Cj1tS24XWb268853v2/7uD8BYzBsegonkDFae04UAtfa25aHmuqtHwDRQGybK9vIQ3Ps6CCOPO8VyhMwZEC5PPOIP/4SJKbP17V+TFJap+SJY3hUxyEw8eXJDxITxz5vgbCmhui8I4/w4w54t/mvwPY9k9nnOVpH0Yl1AUh6DR7sbXwFl6LGYqgigi7auQI9VCaaGQuGiGfWPjwfXNzkdPScZ0XOgJZE= 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:(13230022)(4636009)(346002)(376002)(396003)(39860400002)(136003)(451199015)(46966006)(40470700004)(36840700001)(26005)(40480700001)(86362001)(186003)(336012)(8676002)(83380400001)(4326008)(47076005)(8936002)(70206006)(70586007)(40460700003)(2616005)(36756003)(426003)(5660300002)(81166007)(2906002)(316002)(6916009)(41300700001)(82310400005)(478600001)(36860700001)(82740400003)(6666004)(42413004);DIR:OUT;SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2023 14:02:53.1792 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9d610fd7-7a47-4062-e159-08daf3135dea 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: DBAEUR03FT035.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6730 X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,FORGED_SPF_HELO,GIT_PATCH_0,KAM_DMARC_NONE,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,TXREP,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 List-Id: This patch revision provides the following improvements to proposed patch implementation: * Load ip directly when restoring PAC code from stack for authentication in longjmp epilogue. * Improve code readability by defining the JUMPBUF_PAC macro to map onto the otherwise obscure 104 constant used in str/ldr instructions. Add function prologue/epilogue to conditionally add BTI landing pads and/or PAC code generation & authentication instructions depending on compilation flags. --- newlib/libc/machine/arm/setjmp.S | 43 ++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/newlib/libc/machine/arm/setjmp.S b/newlib/libc/machine/arm/setjmp.S index d814afea8..5213c063b 100644 --- a/newlib/libc/machine/arm/setjmp.S +++ b/newlib/libc/machine/arm/setjmp.S @@ -22,6 +22,11 @@ #define SIZE(x) #endif +/* Jump buffer allocation sizes. */ +#define JUMPBUF_CORE_REGS_SIZE (10 * 4) +#define JUMPBUF_FP_REGS_SIZE (8 * 8) +#define JUMPBUF_PAC (JUMPBUF_CORE_REGS_SIZE + JUMPBUF_FP_REGS_SIZE + 0) + /* Arm/Thumb interworking support: The interworking scheme expects functions to use a BX instruction @@ -155,6 +160,8 @@ SYM (.arm_start_of.\name): .align 2 MODE .globl SYM (\name) + .fnstart + .cfi_startproc TYPE (\name) SYM (\name): PROLOGUE \name @@ -162,6 +169,8 @@ SYM (\name): .macro FUNC_END name RET + .cfi_endproc + .fnend SIZE (\name) .endm @@ -171,6 +180,21 @@ SYM (\name): FUNC_START setjmp +#if __ARM_FEATURE_PAC_DEFAULT +# if __ARM_FEATURE_BTI_DEFAULT + pacbti ip, lr, sp +# else + pac ip, lr, sp +# endif /* __ARM_FEATURE_BTI_DEFAULT */ + mov r3, ip + str r3, [r0, #JUMPBUF_PAC] + .cfi_register 143, 12 +#else +# if __ARM_FEATURE_BTI_DEFAULT + bti +# endif /* __ARM_FEATURE_BTI_DEFAULT */ +#endif /* __ARM_FEATURE_PAC_DEFAULT */ + /* Save all the callee-preserved registers into the jump buffer. */ #ifdef __thumb2__ mov ip, sp @@ -184,6 +208,10 @@ SYM (\name): /* When setting up the jump buffer return 0. */ mov r0, #0 +#if __ARM_FEATURE_PAC_DEFAULT + mov ip, r3 + aut ip, lr, sp +#endif /* __ARM_FEATURE_PAC_DEFAULT */ FUNC_END setjmp @@ -193,6 +221,16 @@ SYM (\name): FUNC_START longjmp +#if __ARM_FEATURE_BTI_DEFAULT + bti +#endif /* __ARM_FEATURE_BTI_DEFAULT */ + +#if __ARM_FEATURE_PAC_DEFAULT + /* Keep original jmpbuf address for retrieving pac-code + for authentication. */ + mov r2, r0 +#endif /* __ARM_FEATURE_PAC_DEFAULT */ + /* If we have stack extension code it ought to be handled here. */ /* Restore the registers, retrieving the state when setjmp() was called. */ @@ -212,5 +250,10 @@ SYM (\name): it eq moveq r0, #1 +#if __ARM_FEATURE_PAC_DEFAULT + ldr ip, [r2, #JUMPBUF_PAC] + aut ip, lr, sp +#endif /* __ARM_FEATURE_PAC_DEFAULT */ + FUNC_END longjmp #endif -- 2.36.1