From nobody Fri Sep 22 17:16:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Rsf852NKQz4v8kQ; Fri, 22 Sep 2023 17:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rsf851wT7z4R3H; Fri, 22 Sep 2023 17:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695403013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JX6HVdbvQ1US4d81TZlQsL08RcuOOEmfbmKZH1Or3Mg=; b=GZ+oC/wU3MUcczbIcNrdRtx3NGjzyrCCM65M1eHT6jfYUQFs2I86HjV4D330ubI04kbHeq dKycSRavYD34C3QudBUHdgoPIDZMu96t1Hi3A2QStEQTiNG1liZ+qTmTXWOwCe8Q3ryAnm M5/tGUq4y35fcM4i4hPBO88P4BseudxGiovldejaueaoBxDNk2Lg4y5PUWKRYwRen49bn5 blWiUsfBvlpdV8ZNhcUBbKrqT1mFMf1ppaW+m2p55yB6GbxAaTafYBjRWo3ie/nSHoSreh uuoEv8Y7eNI5QbIoHtizcn8q8GyustzeNoionTPaWA4o3i9f7VCqhZTBaKqBiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695403013; a=rsa-sha256; cv=none; b=V+dg1LM23J9YNeBrY9YkjNNmJ/bRBA8vXzSgTSqpVRxUTHF6Xt7YfAA0epgOWbiKiI9894 fvTxRH+AD4VGJ+EcpHdIknBKr2PjiY8Rl0h/V0zDmkj0b+d0THHUoX/dev6dK6PLUo1PJX ykNwmTu7CQxJ8mfY2E+/JtgmluLYhpainyXxcn/YzpHCWDKOCx63ceBgcYYs0LKCaYD8ih rhyGSnOIE5NNKuYduDV4kmltV++59dwDakVRMoIAp1bX+kkjndq0rMytcV5mo+vVQurJdl iVVDwgDAuy58j62MnLbs8LyttIqzcUAZr4lbRL3/cO12nJOrNr0Nk2vF2es2DQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695403013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JX6HVdbvQ1US4d81TZlQsL08RcuOOEmfbmKZH1Or3Mg=; b=Jt1ZZmwYMcS5Ng5V3KA1gwit6jrSjgFH1IPY/jJLjozV3eqLykGhGk87x37z2p3/lOH+RZ am+1zjRHfo8OgY+iWtvLC5hIHlRSmd5K6r2r4L8LwwiZrkQ/hCGBDqnb5Pi9Y15JH5HPN5 g8isksR403vIYh0LXvNik9hWbEH1D27l1f8JQj7cIGHu/pzcQT8bAYxeJwY3DOGThQ+ndG RUkURvCxEHX3/J4m9RTXHidXsYDrhG2VDNm45H/3fDyFJSpX2DAN78uJys8Lsnmrw3smSx M77vfaUkX37gJp45F8mgMzpOVdZUS15TlAMrrm+OazSC7AQ8YKht0Y5MDFSK/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Rsf850sc5zVsk; Fri, 22 Sep 2023 17:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38MHGrCo081177; Fri, 22 Sep 2023 17:16:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38MHGrUj081174; Fri, 22 Sep 2023 17:16:53 GMT (envelope-from git) Date: Fri, 22 Sep 2023 17:16:53 GMT Message-Id: <202309221716.38MHGrUj081174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 450f731b7f23 - main - Add BTI exceptions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 450f731b7f2351d475b43bbc6234eea28adfd2b0 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=450f731b7f2351d475b43bbc6234eea28adfd2b0 commit 450f731b7f2351d475b43bbc6234eea28adfd2b0 Author: Andrew Turner AuthorDate: 2023-04-05 12:28:46 +0000 Commit: Andrew Turner CommitDate: 2023-09-22 17:15:14 +0000 Add BTI exceptions We could hit these when executing code marked as using BTI but jumps to a non-branch target instruction. Sponsored by: Arm Ltd Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39450 --- sys/arm64/arm64/locore.S | 2 +- sys/arm64/arm64/trap.c | 10 ++++++++++ sys/arm64/include/armreg.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index 0ceb01eda5c0..bc2a84c404ab 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -864,7 +864,7 @@ sctlr_set: .quad (SCTLR_LSMAOE | SCTLR_nTLSMD | SCTLR_UCI | SCTLR_SPAN | \ SCTLR_nTWE | SCTLR_nTWI | SCTLR_UCT | SCTLR_DZE | \ SCTLR_I | SCTLR_SED | SCTLR_SA0 | SCTLR_SA | SCTLR_C | \ - SCTLR_M | SCTLR_CP15BEN) + SCTLR_M | SCTLR_CP15BEN | SCTLR_BT1 | SCTLR_BT0) sctlr_clear: /* Bits to clear */ .quad (SCTLR_EE | SCTLR_E0E | SCTLR_IESB | SCTLR_WXN | SCTLR_UMA | \ diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index d1a48a2fd9f4..c3221e9faf9f 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -559,6 +559,11 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) panic("Undefined instruction: %08x", *(uint32_t *)frame->tf_elr); break; + case EXCP_BTI: + print_registers(frame); + print_gp_register("far", far); + panic("Branch Target exception"); + break; default: print_registers(frame); print_gp_register("far", far); @@ -699,6 +704,11 @@ do_el0_sync(struct thread *td, struct trapframe *frame) (void *)frame->tf_elr, exception); userret(td, frame); break; + case EXCP_BTI: + call_trapsignal(td, SIGILL, ILL_ILLOPC, (void *)frame->tf_elr, + exception); + userret(td, frame); + break; default: call_trapsignal(td, SIGBUS, BUS_OBJERR, (void *)frame->tf_elr, exception); diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 8251a687a5d1..953c9af220b9 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -408,6 +408,7 @@ #define EXCP_UNKNOWN 0x00 /* Unkwn exception */ #define EXCP_TRAP_WFI_WFE 0x01 /* Trapped WFI or WFE */ #define EXCP_FP_SIMD 0x07 /* VFP/SIMD trap */ +#define EXCP_BTI 0x0d /* Branch Target Exception */ #define EXCP_ILL_STATE 0x0e /* Illegal execution state */ #define EXCP_SVC32 0x11 /* SVC trap for AArch32 */ #define EXCP_SVC64 0x15 /* SVC trap for AArch64 */