From nobody Tue May 10 09:15:32 2022 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 9DBC31AE5EAE; Tue, 10 May 2022 09:15:32 +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 4KyC7S4171z4cVY; Tue, 10 May 2022 09:15:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652174132; 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=nFyHj61m5E0eLG/DSYnF1VSuKq8BKTeM9S8xUZCXOhQ=; b=e6QDnp8HRHM2cyj/fUR3ZutxumVlV4mxAM0japELfZG3svG+KMbEA+bIX6EX/PfV7rlyj9 veJLVBfOlGKYbL892v3OiUgZKZacqsUiNUU1dCiQxoauDhag3qaReb1293l1FRqcRZqVcS hUTjIuzYXQ0s8MbbpVpnunSV2aZVqIDlmb1ihhOMbj/bDSp3ZTYnDM+KC9pua2lOSpZqXX 8VduxQ5R+TMR3w+1aeK/7vwIbutp+1+nETwz8RMQPCLvzk6lLnJqoH0IjfHlntx2c30vub zaDlogwvAp8gWpx67jmHA0X2GTN9KJ1rPcZOpfzD0srIoJWjY1rSPmvyC4ceRg== 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 69A79224D8; Tue, 10 May 2022 09:15:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24A9FWqT024172; Tue, 10 May 2022 09:15:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24A9FWQQ024171; Tue, 10 May 2022 09:15:32 GMT (envelope-from git) Date: Tue, 10 May 2022 09:15:32 GMT Message-Id: <202205100915.24A9FWQQ024171@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Houchard Subject: git: d055e974c4ee - stable/13 - arm64: Handle 32bits breakpoint exception. 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: cognet X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d055e974c4eeb7237cd18c3fe84a87fbd09ae43b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652174132; 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=nFyHj61m5E0eLG/DSYnF1VSuKq8BKTeM9S8xUZCXOhQ=; b=fBfmkhiAQ+atRwLKY3HjH5CMYoLEBfy3LTSXqKiiZkK8lG6cehlFdY39igEMrB6lIDq3eo 4WpHBjK3NdPRzX6GezwRZwio1xZfXBdm+hf8ECAq/RJRKgOVwA4wJVePep5TeypNftS9RG HXZeBEe80AeYhhiZy4bD2iZaZWH/XZSUqVKErEy0kTCaEYWojFbVKTehAEnSnKL6NQxx2o RldZj4KbQxtaqKSgWOjA/lMHRPv/nFGaLkmo6cwNuy567jdCcTlHQNRzohw5JSjw4pqqbW ULfLJd86AK8YUbC9Bf+wVa01dzquIIra9E8Udsxd7EPPTZiKZ16AwKrwBqj/Gg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652174132; a=rsa-sha256; cv=none; b=Zcm+Tsh9Ir2En/t2zrASTBeXx4Y1svWWTjYreZl6c6yS4aFQatIO21bZFvejfV+CAlAC50 kXYS571wByfRcDXBjwntDxJyYbm+FcDGKrPhZXKKU8vR/hUW5+9ZLFk5uZF7Qb0DAmI1lB lMuxRU4V64nEoYPe6YVDQ6FkNtoBQ69wdZN5SwMtsiH0thkfLfDSzIFRYAcx1RQO6zEQkr 2Cez5ZUUYF4q+9mZwQWIYrohiUuGSKQX32zYajow/ZzbqK8pVabi3CU7rjbOOS9EMUdmTk 56fMn3WpuI0GdcDdO0+SXGEppshPnlxccNZr0tiKnk32Yhkka7bZHFY153fhkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cognet: URL: https://cgit.FreeBSD.org/src/commit/?id=d055e974c4eeb7237cd18c3fe84a87fbd09ae43b commit d055e974c4eeb7237cd18c3fe84a87fbd09ae43b Author: Olivier Houchard AuthorDate: 2021-09-21 13:49:45 +0000 Commit: Olivier Houchard CommitDate: 2022-05-10 09:14:40 +0000 arm64: Handle 32bits breakpoint exception. A different exception is raised when we hit a 32bits breakpoint, rather than a 64bits one, so handle those as well when COMPAT_FREEBSD32 is defined. This should fix SIGBUS at least when using breakpoints with thumb2 code. PR: 256468 MFC After: 1 week (cherry picked from commit 2734050154927eaa63d3b65de5d46d05569b3a5b) --- sys/arm64/arm64/trap.c | 3 +++ sys/arm64/include/armreg.h | 1 + 2 files changed, 4 insertions(+) diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index 75ae9e8fedac..5638bb9f496e 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -593,6 +593,9 @@ do_el0_sync(struct thread *td, struct trapframe *frame) break; case EXCP_BRKPT_EL0: case EXCP_BRK: +#ifdef COMPAT_FREEBSD32 + case EXCP_BRKPT_32: +#endif /* COMPAT_FREEBSD32 */ call_trapsignal(td, SIGTRAP, TRAP_BRKPT, (void *)frame->tf_elr, exception); userret(td, frame); diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 1b46d0833429..8dc517f11a20 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -276,6 +276,7 @@ #define EXCP_SOFTSTP_EL1 0x33 /* Software Step, from same EL */ #define EXCP_WATCHPT_EL0 0x34 /* Watchpoint, from lower EL */ #define EXCP_WATCHPT_EL1 0x35 /* Watchpoint, from same EL */ +#define EXCP_BRKPT_32 0x38 /* 32bits breakpoint */ #define EXCP_BRK 0x3c /* Breakpoint */ /* ICC_CTLR_EL1 */