From patchwork Tue Jun 28 09:21:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Corallo X-Patchwork-Id: 55476 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 02C973856DCA for ; Tue, 28 Jun 2022 09:23:16 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 02C973856DCA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1656408196; bh=I6d0RcybUtInfLPFJ0izFRUc+Dy00hqCFJbi7NvAjoQ=; h=To:Subject:References:Date:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=I0eIieCjCBjqQiNgw0h771CXJgy5V8XdsFekP2NNulXMI/L0YQ5CfcDOAYPbT9r9q DFX7/QeEu1+D+2c+gmAiNh8oUOOeXxsZa85/7OsC9oc1XfX0Vqs/4LsRzQ0vR4kSiB Rl53bflshzTzG96LNev38yqJ4pH4P4FLnttIfjOM= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2055.outbound.protection.outlook.com [40.107.21.55]) by sourceware.org (Postfix) with ESMTPS id 0E463383577C for ; Tue, 28 Jun 2022 09:22:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 0E463383577C ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=lxp0MMDqu5tpZGxTn5pvncK+maAmCa9U3U9ap9y2R3S+k+chc3Y7EgzQCx6MmT7kqakbDeWd4frOtRzCVnbdDV6Zuz8DvarFQ9N7j5qIongGfxRnRGSk7AfHOKwd74NcUgFnSNf0mD8escLo6t7UsdDxds2f6s0hs1h9tHLQE6YE1y/d8BJ/dZrKMmdjLqgtMF54/UF7hUroeuaIrttP4gmOgU1srhy0ywsta8cTJOyARXhllTzjCfRM9B3VbboV8vP+YEfl2RfpUCv5Z5m+WrTIMzAKzFKOhGpJHTwC4LKT8AG3Kk7BQbA1usNOCj4Xc64kY+WDvXAIC8uexnBqeA== 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=I6d0RcybUtInfLPFJ0izFRUc+Dy00hqCFJbi7NvAjoQ=; b=f7V9y4PEDWkwHhYDocBJI1y0Mv8MOeni/WbTcGXBw2V0QhJUGtQVDAAAE3BjYyc4mtACwpKp8hWhoDa5+fhIDusgX63bFIVaq88pTwMsrbP0mtw8p+wnR9GCD+J/BU8E7EB8el+rSmFW+3emBkUBBzSSEQUh3Iy9RSoXVLXbS7ZJf/VwMMqVF0LP//eYn4kxW9zzCblqyPDP/xRNKbbIS44trgAE5HPHllcLjZHul2nUQFAmRWlIb9gvZ1iK5ncoO7b7cTDQuUPVE5OocYI11m7sc8oFadXshmioxzvc1ogBPstxz4lxTricwO7Up5/CkEpB8WEccKB7MFV0mQ4vNQ== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=gcc.gnu.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] dmarc=[1,1,header.from=arm.com]) Received: from DB9PR06CA0026.eurprd06.prod.outlook.com (2603:10a6:10:1db::31) by VE1PR08MB4733.eurprd08.prod.outlook.com (2603:10a6:802:aa::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.16; Tue, 28 Jun 2022 09:21:57 +0000 Received: from DBAEUR03FT012.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:1db:cafe::a7) by DB9PR06CA0026.outlook.office365.com (2603:10a6:10:1db::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.15 via Frontend Transport; Tue, 28 Jun 2022 09:21:56 +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 DBAEUR03FT012.mail.protection.outlook.com (100.127.142.126) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.15 via Frontend Transport; Tue, 28 Jun 2022 09:21:56 +0000 Received: ("Tessian outbound 6f53897bcd4e:v120"); Tue, 28 Jun 2022 09:21:56 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 3a048edda104c560 X-CR-MTA-TID: 64aa7808 Received: from 4fb1abb637d7.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 574955AA-9879-4252-AC91-456FF8378E66.1; Tue, 28 Jun 2022 09:21:50 +0000 Received: from EUR05-AM6-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 4fb1abb637d7.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 28 Jun 2022 09:21:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KRbLdR932uQUseXihwpP50KQ47MtHCFt91xMiGsQI1x4H0SoCzoy6eczNJRYxQOoMcN7nRvHuZcIwRSRvBw//f+d952BDhhkWk0HYfLimmg7z0PPlIBRtTcAph+8enqnXWcb3l9LAK+vTaCnCqHj108x3em7v1f8KxoN3TEpwgVcaO/oxnI7i4HG69wjommtMhi3eNv4Ot4P75nVH7/WQRxyOZNx+Zy+m0EOXo85SYJld71+s7UFUuUY/3/YBvrFrERzicCkUQliRdtwwxRL+ftxt3Uqd1nvpr0rmgfF0jTMMFAYDT2duBqeYZbFCCe7s3epYsIJj3Lffhqh97TstQ== 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=I6d0RcybUtInfLPFJ0izFRUc+Dy00hqCFJbi7NvAjoQ=; b=Zvpu3W803tWa+gLXPfN7UveZ1BAhynUN+ueg1eLkODqoMKFIu0K+XgrHYrOUIJ0j/nvQpnQqiE9wBOfmRwKPKPKAwmnQShqUGBhABHIktrGWSyNT/yKEvK42wmzACLOeOIfgsaUgDlG5hNSNQ7MGWdFvOB6Rtiatxc7T2axZ7dzsLknM402NQIl9O2GZSObJEiA52LQhHm8B6sDXk2KmqojJgcDciPrhQk1vEU56u2jNA8D4827trH8RjEOd1rV9w6ittp6LccfIyvP4QfLfoi873mJsz3w0miVl/lf17jzzUO+Kjeft6k7xbIkXUavbjSENl30JF4AiTRt3piZBnQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=gcc.gnu.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 Received: from DB7PR03CA0093.eurprd03.prod.outlook.com (2603:10a6:10:72::34) by PAXPR08MB6703.eurprd08.prod.outlook.com (2603:10a6:102:138::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.16; Tue, 28 Jun 2022 09:21:48 +0000 Received: from DBAEUR03FT005.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:72:cafe::47) by DB7PR03CA0093.outlook.office365.com (2603:10a6:10:72::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.21 via Frontend Transport; Tue, 28 Jun 2022 09:21:48 +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 DBAEUR03FT005.mail.protection.outlook.com (100.127.142.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5373.15 via Frontend Transport; Tue, 28 Jun 2022 09:21:48 +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.9; Tue, 28 Jun 2022 09:21:47 +0000 Received: from e124257 (10.34.105.24) 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.9 via Frontend Transport; Tue, 28 Jun 2022 09:21:47 +0000 To: Andrea Corallo via Gcc-patches Subject: [PATCH 12/12 V2] arm: implement bti injection References: Date: Tue, 28 Jun 2022 11:21:47 +0200 In-Reply-To: (Andrea Corallo via Gcc-patches's message of "Thu, 28 Apr 2022 11:53:39 +0200") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.1.50 (gnu/linux) MIME-Version: 1.0 X-EOPAttributedMessage: 1 X-MS-Office365-Filtering-Correlation-Id: fec66beb-7664-4d27-c383-08da58e7a5d7 X-MS-TrafficTypeDiagnostic: PAXPR08MB6703:EE_|DBAEUR03FT012:EE_|VE1PR08MB4733:EE_ 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: zUd68hyhu3AAIYvMPSkAWDOaoVEuC6vMNrvk+bvBo2rwvRUyf2T3yMmI3ZvLPyB0kOQYoLl8owQHUDfTC2tKIFjtw+JXv9R7GBhKFj8/VIL91iMQPYWgNVFc4j7U0+5zD7Ek55LxJbt5Bk/GMdnD74lfK2528F+/vqgyA7sHygg87OUvYuZj5acj3EjGXslZzPPz8iryC19Sk0Mxp6BinEqtqXl84ASUqz/sR4aW/O+uamzftuYgnYdbeDexhQvTL0fj8VSpNI2mHdwUWvnm6aKtMURTHGsKxRZZwo4aF30eNjivKnXlAnwiPmmyORHFq2kinUoFQjQN/114UgRx6DNzKA9y6sgikB+pJ5X5oNt1IQ3zINFmKWmgTGF08tf14Ym6CEELuAIpMzH4tAC0Dins40bYlZVZFxg6+ayec/p9NE0Y91ZO6QS3/1VP/cMz4B/rWnr7AOJof4G6nWDAY979N0vQmPSEC/BImbLsm8Ikzu9cxrZOj5qADR8R+9MRcQPLo+CDFj9B2+KtqVGr3aHhRag/sriDsICNKp9HHTROHD2YsuZa8lxOwmConnXDGO02vGc7FxEhBcOSupwn6b1XoNS04lGTUsdghgrKUy+q5AJ0tB4uJINMmcjMLzvpisw6GU/oYwPcOmuRKQ3t3PjWfN8/6rFBao0kjUFTV2CFjjkqvnhr2L1p9afEjZ43cx48VvfJSOKyBP1ic1+Bnxh6ctqwaHvddZ9II2H4NzIN4VFV1oys4qJzT5qIi/EJWfD8N9df9RtpZfp2Vdj3INdH9DdXmNEKxTuHFlSsnEQXAwXy5nI8/TWPGHd2eO6LvNzhQzeTBwz7NgZydmEojXURoowPC9CNd5BM1vOvpEygrW71GZue+5McjIm1++i+VaEqX9SE2Pdu5Y4tZIabqg== 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:(13230016)(4636009)(396003)(39860400002)(136003)(376002)(346002)(36840700001)(46966006)(40470700004)(2906002)(26005)(4326008)(33964004)(70586007)(70206006)(82310400005)(84970400001)(356005)(86362001)(82740400003)(41300700001)(8676002)(316002)(6916009)(54906003)(44832011)(40480700001)(235185007)(36860700001)(8936002)(426003)(40460700003)(47076005)(336012)(186003)(2616005)(5660300002)(478600001)(36756003)(83380400001)(81166007)(36900700001); DIR:OUT; SFP:1101; X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR08MB6703 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DBAEUR03FT012.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 7bcbad8f-a53f-479e-995e-08da58e7a0ef X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hDUUq4StLUiE/FH6z7Wc/ZwIDx2QhAuBz6XLjON/oHrMUTuTe77Uj3j/CrH0nasj3g0Ac0cIfcvRPIN4Prp9UT2n03whBQ70scb2bbbQhsC3pf/pDacZ3wlSL5AFApVT7RY+SUKnSitseOFGoU25oYXetotM3qcQUvwHdGH/zsmqa0qqKK9DSLzAyoNkS0ebeS8A/Tzm5B+PzIEEu+3w4lOsL5odSOeO0rLk4aj1cJVp7Vy/Vhli3plSg/JY2wq11y2WkXAcbbEY0alq4LwQCoDjRlNzNodVzu08OtIB7e8KlJoicxFBdbA6oVXEhQLqsyqVesCkCso+eNRatu5Md1bd4LTOpGbA16UfHh5tpzOYMBPGlWpEWu7lh0wNq+xbl+2RC0td8O4sl9yWW4oFrjbroF7wbqcOkCzwyPLUYd38OyVii+2TdS9EmdhQkoFCy0Z5dZgq9qRZgCRhJ0dTKZ/X/tSOtZhmZcqM1tY8xbaH4DmRWQcZGnZdQJ2fqI3a+CTVUa8Fim/pyChQSY1A73hKEfVqEfB59VtnzW/iteTGc3bcjzqw4XRiH4KGmjc8Y29o+0aZKHkugbmS9FIR21Z8Rx22UNnIlDrCS3vz4YxC49Ej3/vhSHAyNQNP6b/tWyYp5yHzQpMsCapyrQiL5cohUjq1/8EX/y0f1267zOCWoYtNNmZgw5X0c+mPRQfFkdn0T6FlzWjs5JKeW/hXGY52zOlPjOjWWvxGYqX1GjRlYSloDTf5O8tpdchsdqgbxHPZceczf/ZqjI5wBs3pAYB0juont1By21O9XI+HLYp5wrx439NrqPDO7MwLJCTZOiRkRjKdKCk3iqyY1+uqM8/7jvDiocvOPVcvu1wjPnpOLUO2a/TClmvy9XlyMFYF 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:(13230016)(4636009)(376002)(346002)(396003)(136003)(39860400002)(40470700004)(46966006)(36840700001)(8936002)(33964004)(86362001)(26005)(44832011)(41300700001)(426003)(235185007)(2906002)(478600001)(84970400001)(6916009)(81166007)(5660300002)(336012)(186003)(70586007)(54906003)(82740400003)(8676002)(4326008)(70206006)(316002)(47076005)(2616005)(40460700003)(83380400001)(40480700001)(36756003)(36860700001)(82310400005); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2022 09:21:56.9260 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fec66beb-7664-4d27-c383-08da58e7a5d7 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: DBAEUR03FT012.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR08MB4733 X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FORGED_SPF_HELO, GIT_PATCH_0, KAM_DMARC_NONE, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_NONE, 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Andrea Corallo via Gcc-patches From: Andrea Corallo Reply-To: Andrea Corallo Cc: Richard Earnshaw , nd Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Hi all, second iteration of this patch enabling Branch Target Identification Armv8.1-M Mechanism [1]. This is achieved by using the bti pass made common with Aarch64. The pass iterates through the instructions and adds the necessary BTI instructions at the beginning of every function and at every landing pads targeted by indirect jumps. Best Regards Andrea [1] gcc/ChangeLog 2022-04-07 Andrea Corallo * config.gcc (arm*-*-*): Add 'aarch-bti-insert.o' object. * config/arm/arm-protos.h: Update. * config/arm/arm.cc (aarch_bti_enabled, aarch_bti_j_insn_p) (aarch_pac_insn_p, aarch_gen_bti_c, aarch_gen_bti_j): New functions. * config/arm/arm.md (bti_nop): New insn. * config/arm/t-arm (PASSES_EXTRA): Add 'arm-passes.def'. (aarch-bti-insert.o): New target. * config/arm/unspecs.md (UNSPEC_BTI_NOP): New unspec. * config/arm/aarch-bti-insert.cc (rest_of_insert_bti): Update to verify arch compatibility. gcc/testsuite/ChangeLog 2022-04-07 Andrea Corallo * gcc.target/arm/bti-1.c: New testcase. * gcc.target/arm/bti-2.c: Likewise. diff --git a/gcc/config.gcc b/gcc/config.gcc index 2021bdf9d2f..004e1dfa8d8 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -353,7 +353,7 @@ arc*-*-*) ;; arm*-*-*) cpu_type=arm - extra_objs="arm-builtins.o arm-mve-builtins.o aarch-common.o" + extra_objs="arm-builtins.o arm-mve-builtins.o aarch-common.o aarch-bti-insert.o" extra_headers="mmintrin.h arm_neon.h arm_acle.h arm_fp16.h arm_cmse.h arm_bf16.h arm_mve_types.h arm_mve.h arm_cde.h" target_type_format_char='%' c_target_objs="arm-c.o" diff --git a/gcc/config/arm/aarch-bti-insert.cc b/gcc/config/arm/aarch-bti-insert.cc index 2d1d2e334a9..38f5a58ef2f 100644 --- a/gcc/config/arm/aarch-bti-insert.cc +++ b/gcc/config/arm/aarch-bti-insert.cc @@ -41,6 +41,7 @@ #include "cfgrtl.h" #include "tree-pass.h" #include "cgraph.h" +#include "diagnostic-core.h" /* This pass enables the support for Branch Target Identification Mechanism for Arm/AArch64. This is a security feature introduced in ARMv8.5-A @@ -104,6 +105,14 @@ rest_of_insert_bti (void) rtx_insn *insn; basic_block bb; +#if defined (TARGET_32BIT) || defined (TARGET_THUMB1) + if (!arm_arch8) + { + error ("This architecture does not support branch protection instructions"); + goto exit; + } +#endif + bb = 0; FOR_EACH_BB_FN (bb, cfun) { @@ -175,6 +184,7 @@ rest_of_insert_bti (void) } } + exit: timevar_pop (TV_MACH_DEP); return 0; } diff --git a/gcc/config/arm/arm-protos.h b/gcc/config/arm/arm-protos.h index 84764bf27ce..6befb6c4445 100644 --- a/gcc/config/arm/arm-protos.h +++ b/gcc/config/arm/arm-protos.h @@ -24,6 +24,8 @@ #include "sbitmap.h" +rtl_opt_pass *make_pass_insert_bti (gcc::context *ctxt); + extern enum unwind_info_type arm_except_unwind_info (struct gcc_options *); extern int use_return_insn (int, rtx); extern bool use_simple_return_p (void); diff --git a/gcc/config/arm/arm.cc b/gcc/config/arm/arm.cc index 6760a01d68a..059075e2c95 100644 --- a/gcc/config/arm/arm.cc +++ b/gcc/config/arm/arm.cc @@ -23360,11 +23360,6 @@ output_probe_stack_range (rtx reg1, rtx reg2) return ""; } -static bool aarch_bti_enabled () -{ - return false; -} - /* Generate the prologue instructions for entry into an ARM or Thumb-2 function. */ void @@ -32980,6 +32975,56 @@ arm_current_function_pac_enabled_p (void) && !crtl->is_leaf); } +/* Return TRUE if Branch Target Identification Mechanism is enabled. */ +bool +aarch_bti_enabled (void) +{ + return aarch_enable_bti == 1; +} + +/* Check if INSN is a BTI J insn. */ +bool +aarch_bti_j_insn_p (rtx_insn *insn) +{ + if (!insn || !INSN_P (insn)) + return false; + + rtx pat = PATTERN (insn); + return GET_CODE (pat) == UNSPEC_VOLATILE && XINT (pat, 1) == UNSPEC_BTI_NOP; +} + +/* Check if X (or any sub-rtx of X) is a PACIASP/PACIBSP instruction. */ +bool +aarch_pac_insn_p (rtx x) +{ + if (!x || !INSN_P (x)) + return false; + + rtx pat = PATTERN (x); + + if (GET_CODE (pat) == SET) + { + rtx tmp = XEXP (pat, 1); + if (tmp + && GET_CODE (tmp) == UNSPEC + && (XINT (tmp, 1) == UNSPEC_PAC_NOP + || XINT (tmp, 1) == UNSPEC_PACBTI_NOP)) + return true; + } + + return false; +} + +rtx aarch_gen_bti_c (void) +{ + return gen_bti_nop (); +} + +rtx aarch_gen_bti_j (void) +{ + return gen_bti_nop (); +} + /* Implement TARGET_SCHED_CAN_SPECULATE_INSN. Return true if INSN can be scheduled for speculative execution. Reject the long-running division and square-root instructions. */ diff --git a/gcc/config/arm/arm.md b/gcc/config/arm/arm.md index ae032e70a7d..b14c45638a8 100644 --- a/gcc/config/arm/arm.md +++ b/gcc/config/arm/arm.md @@ -12919,6 +12919,12 @@ "aut\t%|ip, %|lr, %|sp" [(set_attr "length" "2")]) +(define_insn "bti_nop" + [(unspec_volatile [(const_int 0)] UNSPEC_BTI_NOP)] + "TARGET_THUMB2" + "bti" + [(set_attr "type" "mov_reg")]) + ;; Vector bits common to IWMMXT, Neon and MVE (include "vec-common.md") ;; Load the Intel Wireless Multimedia Extension patterns diff --git a/gcc/config/arm/t-arm b/gcc/config/arm/t-arm index 041cc6ec045..683342cb528 100644 --- a/gcc/config/arm/t-arm +++ b/gcc/config/arm/t-arm @@ -175,3 +175,13 @@ arm-d.o: $(srcdir)/config/arm/arm-d.cc arm-common.o: arm-cpu-cdata.h driver-arm.o: arm-native.h + +PASSES_EXTRA += $(srcdir)/config/arm/arm-passes.def + +aarch-bti-insert.o: $(srcdir)/config/arm/aarch-bti-insert.cc \ + $(CONFIG_H) $(SYSTEM_H) $(TM_H) $(REGS_H) insn-config.h $(RTL_BASE_H) \ + dominance.h cfg.h cfganal.h $(BASIC_BLOCK_H) $(INSN_ATTR_H) $(RECOG_H) \ + output.h hash-map.h $(DF_H) $(OBSTACK_H) $(TARGET_H) $(RTL_H) \ + $(CONTEXT_H) $(TREE_PASS_H) regrename.h + $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ + $(srcdir)/config/arm/aarch-bti-insert.cc diff --git a/gcc/config/arm/unspecs.md b/gcc/config/arm/unspecs.md index dbe243a03f6..78e723a4b3c 100644 --- a/gcc/config/arm/unspecs.md +++ b/gcc/config/arm/unspecs.md @@ -162,6 +162,7 @@ UNSPEC_PAC_NOP ; Represents PAC signing LR UNSPEC_PACBTI_NOP ; Represents PAC signing LR + valid landing pad UNSPEC_AUT_NOP ; Represents PAC verifying LR + UNSPEC_BTI_NOP ; Represent BTI ]) diff --git a/gcc/testsuite/gcc.target/arm/bti-1.c b/gcc/testsuite/gcc.target/arm/bti-1.c new file mode 100644 index 00000000000..230ebb5a1da --- /dev/null +++ b/gcc/testsuite/gcc.target/arm/bti-1.c @@ -0,0 +1,12 @@ +/* Check that GCC does bti instruction. */ +/* { dg-do compile } */ +/* { dg-skip-if "avoid conflicting multilib options" { *-*-* } { "-marm" "-mcpu=*" } } */ +/* { dg-options "-march=armv8.1-m.main -mthumb -mbranch-protection=bti --save-temps" } */ + +int +main (void) +{ + return 0; +} + +/* { dg-final { scan-assembler "bti" } } */ diff --git a/gcc/testsuite/gcc.target/arm/bti-2.c b/gcc/testsuite/gcc.target/arm/bti-2.c new file mode 100644 index 00000000000..35aef6992e2 --- /dev/null +++ b/gcc/testsuite/gcc.target/arm/bti-2.c @@ -0,0 +1,58 @@ +/* { dg-do compile } */ +/* -Os to create jump table. */ +/* { dg-options "-Os" } */ +/* { dg-skip-if "avoid conflicting multilib options" { *-*-* } { "-marm" "-mcpu=*" } } */ +/* { dg-options "-march=armv8.1-m.main -mthumb -mbranch-protection=bti --save-temps" } */ + +extern int f1 (void); +extern int f2 (void); +extern int f3 (void); +extern int f4 (void); +extern int f5 (void); +extern int f6 (void); +extern int f7 (void); +extern int f8 (void); +extern int f9 (void); +extern int f10 (void); + +int (*ptr) (void); + +int +f_jump_table (int y, int n) +{ + int i; + for (i = 0; i < n ;i ++) + { + switch (y) + { + case 0 : ptr = f1; break; + case 1 : ptr = f2; break; + case 2 : ptr = f3; break; + case 3 : ptr = f4; break; + case 4 : ptr = f5; break; + case 5 : ptr = f6; break; + case 6 : ptr = f7; break; + case 7 : ptr = f8; break; + case 8 : ptr = f9; break; + case 9 : ptr = f10; break; + default: break; + } + y += ptr (); + } + return (y == 0)? y+1:4; +} + +int +f_label_address () +{ + static void * addr = &&lab1; + goto *addr; +lab1: + addr = &&lab2; + return 1; +lab2: + addr = &&lab1; + return 2; +} + +/* { dg-final { scan-assembler-times "bti" 15 } } */