From nobody Tue Aug 20 09:02:26 2024 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 4Wp3Pv186Jz5Shy2; Tue, 20 Aug 2024 09:02:27 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wp3Pt5ps1z4vZx; Tue, 20 Aug 2024 09:02:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724144546; 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=4UerdfGlkNOKJYGJih9svpd4L2vyq7dHMQFZPYBQrNY=; b=PbhZe8KCsQwm+jddUjMxt1g1/ODTlm5lyFKm7SCjXJKvlc4q07uYutz74EExpc3ULZhGaj neLLnBSIDuLlobTzBXlp/38B7sg0l758DQRsF7Dqb1g8ok6hPkrVUMGU4e5hOqUW7509ch fW002JqYMvzuMksD92RXHCuEqiMJqgcZEvj/vs74jzddd7R6vmlAqc+kgqs/l6iXuj9LWN 7X8cf7KJpTeKkkORmRRp5Ta+YJjqlfwkQUu0u3T1HKxjXOF1e87MEqOpEXmj+LAKjffHNZ 2Cbza8z/eRFo7koP80ewDF5KihFFSLWOA9rOZXu5kflJTaH/SoXKWAY3qOHVYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724144546; a=rsa-sha256; cv=none; b=b/jpWEPvJlAi1qPzI1bBZJZSJ5o4oyX/4s90Kl0mifjTXK+tBN8p8AfGDgZ9Xhpdcc6/xv npByLVaNhrKEoiAN6lBu7DeZTLxIPphYrsYd1lqTfMtckg6z69Ipx1uwZNj+KIrHubrdfp rNPGH9zzw37+5hwL7M6ZQvw6PYv/u2YNqhw95OVf/BbJQsIjEB/6M7iAA5NUtYuk0lZZat ZlVhu33FP8b4GKTtF2Mb0JH1lWhCgklXMfLJAMiKcOS7jz4ucjNVUfrTaekR6c60IEpr5w sUeO/Ye9MLqv+echKtMvJoF9E8Ht88FwPFSIOETzeohV/X1wArBAKxbn/Y0MYw== 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=1724144546; 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=4UerdfGlkNOKJYGJih9svpd4L2vyq7dHMQFZPYBQrNY=; b=jRTIEyDJOYgP2qy5Hm1mUdmlFMTpQcPaErY1EOkt+bzfmjk8vZ5i31azsU+cDz9wKBNveb hw4oitlVcTT3sDkbXdKtBq2zLpbJ+KL7004IB69W1oeFK8sAm2H/kI+rNwXuBsxzHWL4jf lY7KPXape1qPN8n5C3fyzdoEHb/X6YqaZw+gTgBxsIDEQs/A3G74t59Xqy3xcQu+PDc/b8 hYp7HfM/ZoTQ9fBJBRlf1owSix2jJn59pHuWuDwbyrFcx6sYpJLEro/FH74iV62FzYXbTK GNOTwnJxqoW3smqDNL4GK919+tgSmBQjEs3Nh6VjY38X5cFmu3z26KW8O4olrQ== 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 4Wp3Pt5BlWztm5; Tue, 20 Aug 2024 09:02:26 +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 47K92Q60081889; Tue, 20 Aug 2024 09:02:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47K92Q1B081886; Tue, 20 Aug 2024 09:02:26 GMT (envelope-from git) Date: Tue, 20 Aug 2024 09:02:26 GMT Message-Id: <202408200902.47K92Q1B081886@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: b87952e837ec - main - arm64/vmm: Mark asm files as supporting BTI 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: b87952e837ec1e42a573557a8e938693d8952705 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=b87952e837ec1e42a573557a8e938693d8952705 commit b87952e837ec1e42a573557a8e938693d8952705 Author: Andrew Turner AuthorDate: 2024-08-19 13:28:39 +0000 Commit: Andrew Turner CommitDate: 2024-08-20 08:49:16 +0000 arm64/vmm: Mark asm files as supporting BTI These already support BTI as they use the ENTRY macro. While the non-VHE code doesn't need this the new VHE code will need it as it is linked into either the kernel or the vmm module so will be included in the BTI check. Sponsored by: Arm Ltd --- sys/arm64/vmm/vmm_hyp_exception.S | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/arm64/vmm/vmm_hyp_exception.S b/sys/arm64/vmm/vmm_hyp_exception.S index 95b0e20f37ed..50c2490f37bf 100644 --- a/sys/arm64/vmm/vmm_hyp_exception.S +++ b/sys/arm64/vmm/vmm_hyp_exception.S @@ -30,6 +30,7 @@ */ +#include #include #include @@ -316,3 +317,5 @@ ENTRY(VMM_HYP_FUNC(do_call_guest)) /* Enter guest */ ERET END(VMM_HYP_FUNC(do_call_guest)) + +GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL)