From nobody Mon Jun 23 12:07:35 2025 X-Original-To: dev-commits-src-main@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 4bQmzr1T76z60GhN; Mon, 23 Jun 2025 12:07:36 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bQmzq5PD0z3gMl; Mon, 23 Jun 2025 12:07:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750680455; 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=npx/j3IeL5UACTj/1vTHAugQC5DDV1qb8AwK/3OCnak=; b=YxESK5KRDX22LYaYbEzhParzhLwAVj6+i2m+M58By7MvPwOxlnsSLJ6ORXSwQGsGFTjhwZ GEdiWFJt4RzQcUPClvrIMhgbYRNzeC3siuRTldqnnokbqkceq+YjT7soO6BQmhhNnuLApI zaVF7/M7c50TUJOgGlH2Y9lxEPdhw6IK2WMdDb/BJhCxRNEkCRmcsPATBhY/xaAHwDaip5 TFspPGVzhMdgsXfe8kj0moxcct37amh/hnvPeyLw3scz1l3W9qUCrPjD2qcyn4U/kevzuD LXkxfqUom6eLsoCvH0PGkiM06lllA7JxWzlrWMr5iSmwQ/x17d3eSacJVVUsaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750680455; 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=npx/j3IeL5UACTj/1vTHAugQC5DDV1qb8AwK/3OCnak=; b=YirVF2Ol+3ly8NkepcHyEbriRMJ2QgczV+0Nr6RVCwTiAR7+GYVLLYGVor8jTBOjrrcRpB ekE5EVOR94LKVDl3hMPZl5Gy6BDt44pSkl1wYR2Bu988YWv/q+U1OveGHWtXFwmKBClac3 ZPEA7Nm0FbkI2hyHNaGpUWei72tC+LEgNt0JXqw6XySql8SP3mLh2wqZKwoaA7SpC53JH8 gxPmCug8iTkZ5mpdYvxwzsg5/BLkAfyj2tbmc5Z37TD7C/9pjnKocZrZlZbWVQARmNvVGX Ly5JY3PkrXs3yTZja1nqdMixWhtTapexgGrCvUMTpEeRCw3vIa4+x4RsbHJQJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750680455; a=rsa-sha256; cv=none; b=bcJJGsRssdq4Hh/lBzoK11k+d3dbMHP6K8KDuc2dT+uE5KqGVGGoECau5vzoJcUbFLjWX4 Ziq3iOmslxd3cfwkjH7iIORA1lRGqxep6MSKdzJM/zEP4A2HaEovB8VHRTVChWd3q4zpYm FYhVzWfteY7DEN22oivz3m+O/0rQlfd2jFGYeBcclt+4cd+xP8OCgGSsgvOmE0fmFdu664 qj7vPe430LmcxH/w/S/qcuI2X620FNFF/n7KYSwv6J3SaG7YN7f2cxT80nHmyqPIS+64en JfHOBpKLoQo/dlSbsIok9/oUJJ3wRxQNWv8u3UnleDnwnkxjqeTaVpB7TvQkVQ== 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 4bQmzq4p30z12TB; Mon, 23 Jun 2025 12:07:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55NC7ZLl059237; Mon, 23 Jun 2025 12:07:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55NC7Z6R059234; Mon, 23 Jun 2025 12:07:35 GMT (envelope-from git) Date: Mon, 23 Jun 2025 12:07:35 GMT Message-Id: <202506231207.55NC7Z6R059234@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: f820b6ed34d5 - main - arm64: Switch to get_user_reg in fill_dbregs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: f820b6ed34d5e97835d7f55d63076f07ed5d7ef5 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=f820b6ed34d5e97835d7f55d63076f07ed5d7ef5 commit f820b6ed34d5e97835d7f55d63076f07ed5d7ef5 Author: Andrew Turner AuthorDate: 2025-06-23 10:15:00 +0000 Commit: Andrew Turner CommitDate: 2025-06-23 10:18:19 +0000 arm64: Switch to get_user_reg in fill_dbregs This lets us read the register in one go then decode it, rather than searching for the register 3 times. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50903 --- sys/arm64/arm64/exec_machdep.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/sys/arm64/arm64/exec_machdep.c b/sys/arm64/arm64/exec_machdep.c index 6a536233a62d..751329affd91 100644 --- a/sys/arm64/arm64/exec_machdep.c +++ b/sys/arm64/arm64/exec_machdep.c @@ -191,17 +191,27 @@ int fill_dbregs(struct thread *td, struct dbreg *regs) { struct debug_monitor_state *monitor; + uint64_t dfr0; int i; uint8_t debug_ver, nbkpts, nwtpts; memset(regs, 0, sizeof(*regs)); - extract_user_id_field(ID_AA64DFR0_EL1, ID_AA64DFR0_DebugVer_SHIFT, - &debug_ver); - extract_user_id_field(ID_AA64DFR0_EL1, ID_AA64DFR0_BRPs_SHIFT, - &nbkpts); - extract_user_id_field(ID_AA64DFR0_EL1, ID_AA64DFR0_WRPs_SHIFT, - &nwtpts); + /* + * Read these the Debug Feature Register 0 to get info we need. + * It will be identical on FreeBSD and Linux, so there is no need + * to check which the target is. + */ + if (!get_user_reg(ID_AA64DFR0_EL1, &dfr0, true)) { + debug_ver = ID_AA64DFR0_DebugVer_8; + nbkpts = 0; + nwtpts = 0; + } else { + debug_ver = ID_AA64DFR0_DebugVer_VAL(dfr0) >> + ID_AA64DFR0_DebugVer_SHIFT; + nbkpts = ID_AA64DFR0_BRPs_VAL(dfr0) >> ID_AA64DFR0_BRPs_SHIFT; + nwtpts = ID_AA64DFR0_WRPs_VAL(dfr0) >> ID_AA64DFR0_WRPs_SHIFT; + } /* * The BRPs field contains the number of breakpoints - 1. Armv8-A