From nobody Mon Jun 23 16:34:24 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 4bQtvh6xqBz60W3C; Mon, 23 Jun 2025 16:34:24 +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 4bQtvh3fpfz4F1D; Mon, 23 Jun 2025 16:34:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750696464; 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=gsIWCWqj5NWOzgevdmqIjQnx0IfKYbuyRta/Vh7sZw4=; b=qRaHEliGQnrtMTlMQh+TmFZvUPd5+XAWQdT8TTv7aNqLaJPmOuZ+DTBWPZRHPaB2sQnCnO ruNtUj52AeS6CImdtOvxtDsHcqrt+JPaHShGEl7Nb/4c6Rpn5pTaZpp/XljraOg3q1xBzz CloGaC2oReAN8llyn+cqAp/eyL0w+74FMTZT8XbqhZeYtCBq3yAwFoR70Qm+/1I9QqNwM0 TQHyRbQBVlAd6z9fyH7gmLfL9WN+hnZheO83QVo2H2xskPLHLDq+D5K27+OTh4oWvyhZYE uhTDs3klrzcAZg2UgG/KC1O7vwO5XZ0TLGaWuu6uQAUa7YzDcvcmA3enGNLoew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750696464; 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=gsIWCWqj5NWOzgevdmqIjQnx0IfKYbuyRta/Vh7sZw4=; b=bD2RplLrrYAAPOjEen4swUmBAguMZ1jMqMsnVD5kTgnYGdbcxpdUU4/o86DsSxTlbp0ksR r0wjtSMUDf8VwkCQfQFUW4h17bwQ/fMRhMuKYZGsUPx+otRxvoLTX9J1LsGDzy1q1o2MUq wcikGRm8SFM8iOcqXET0Rz17CH5WAoDPeLyviTUASqa1exJQY9BQ2uME5fLdQFOpArKTOO p/RXNOu9KaVmpsMbfnqoUSZaruZd16F8ZQLQ5kXETT4viW61BoebKsCpywxcTUzBnPTxuQ q3gG6/7HWDxpzE9jX0iqGizIAbZ4TeoA9Jq2TXlXQCAuzdHRO3APPtSCW60o+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750696464; a=rsa-sha256; cv=none; b=aFlPR2gdhx7qBAzpxIPHnm78sajZZAVKxpP+FE0wt62DX3jQpaABifa5fteLr+RFzCErGO 9N5stGVJvqFP/6tblAoSaw8EuVdLr2piETjl8uWkexoqwkE5t5nV9SLvhK8KL0qv08cqWZ g32EyZ5A8jgPHMD4S7gIMJKegiRr/J3ZEzjoHoDvGDtT7fuctq5iVeP0GIoeFxct3uoYKh wr0e/x+QbrwQBGFW0yezg0os8OzXG6Kvpx9ptu/84HVqxnXaRVMvY+4CC5g/UWVPnrJBDN XURKRYz6BOC2FExuQuzmlJzYltLatSVxdJO1t8BfJEDS9OZd+O4Hkn5V0Q73eQ== 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 4bQtvh3CwTz195M; Mon, 23 Jun 2025 16:34:24 +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 55NGYOFD066221; Mon, 23 Jun 2025 16:34:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55NGYOeq066218; Mon, 23 Jun 2025 16:34:24 GMT (envelope-from git) Date: Mon, 23 Jun 2025 16:34:24 GMT Message-Id: <202506231634.55NGYOeq066218@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: fe55780e5f10 - main - arm64: Enable pointer authentication with QARMA3 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: fe55780e5f104d05475726eba0b05236358a9864 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=fe55780e5f104d05475726eba0b05236358a9864 commit fe55780e5f104d05475726eba0b05236358a9864 Author: Andrew Turner AuthorDate: 2025-06-21 00:28:56 +0000 Commit: Andrew Turner CommitDate: 2025-06-21 00:28:56 +0000 arm64: Enable pointer authentication with QARMA3 When the QARMA3 algorithm is used the ID_AA64ISAR2_EL1.APA3 field is non-zero. Include this in the check for enabling pointer auth. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D49710 --- sys/arm64/arm64/ptrauth.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/sys/arm64/arm64/ptrauth.c b/sys/arm64/arm64/ptrauth.c index dd36e66c85bb..a943220d66cd 100644 --- a/sys/arm64/arm64/ptrauth.c +++ b/sys/arm64/arm64/ptrauth.c @@ -85,7 +85,7 @@ ptrauth_disable(void) static bool ptrauth_check(const struct cpu_feat *feat __unused, u_int midr __unused) { - uint64_t isar1; + uint64_t isar; int pac_enable; /* @@ -100,9 +100,6 @@ ptrauth_check(const struct cpu_feat *feat __unused, u_int midr __unused) goto out; } - if (!get_kernel_reg(ID_AA64ISAR1_EL1, &isar1)) - goto out; - if (ptrauth_disable()) goto out; @@ -111,13 +108,36 @@ ptrauth_check(const struct cpu_feat *feat __unused, u_int midr __unused) * it will also be available on any non-boot CPUs. If this is ever * not the case we will have to add a quirk. */ - return (ID_AA64ISAR1_APA_VAL(isar1) > 0 || - ID_AA64ISAR1_API_VAL(isar1) > 0); + + /* + * The QARMA5 or implementation efined algorithms are reported in + * ID_AA64ISAR1_EL1. + */ + if (get_kernel_reg(ID_AA64ISAR1_EL1, &isar)) { + if (ID_AA64ISAR1_APA_VAL(isar) > 0 || + ID_AA64ISAR1_API_VAL(isar) > 0) { + return (true); + } + } + + /* The QARMA3 algorithm is reported in ID_AA64ISAR2_EL1. */ + if (get_kernel_reg(ID_AA64ISAR2_EL1, &isar)) { + if (ID_AA64ISAR2_APA3_VAL(isar) > 0) { + return (true); + } + } out: + /* + * Pointer authentication may be disabled, mask out the ID fields we + * expose to userspace and the rest of the kernel so they don't try + * to use it. + */ update_special_reg(ID_AA64ISAR1_EL1, ID_AA64ISAR1_API_MASK | ID_AA64ISAR1_APA_MASK | ID_AA64ISAR1_GPA_MASK | ID_AA64ISAR1_GPI_MASK, 0); + update_special_reg(ID_AA64ISAR2_EL1, ID_AA64ISAR2_APA3_MASK, 0); + return (false); }