From nobody Tue Nov 15 17:32:00 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 4NBYC449Fqz4hJZ9; Tue, 15 Nov 2022 17:32:00 +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 4NBYC43PyBz429K; Tue, 15 Nov 2022 17:32:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668533520; 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=3VWCIWnrlyJr6UoL/9ria970LBXjiZqcBh57enKkQnE=; b=CNypwCBXfg0salZHX61bQLY74AcUNCASANXimm0k+AIF6bxlAR9sEQC2h5M0E2i7+rtXoY he8Wkq0uBiRFr1lBzfMkW1z0qyJCu0Z8qdBGMYYmeZmXG5pSep8bbVRtCR9UOB48ygqqVt Sgm5aW7sv3XBPvU6AkFGSumxdssn5/MfkjglZTX5s5PWCPbvCSkJuSTWtwFVWOy+p7BfnZ 5mPkFzxEWOVq1iBYZ6jOeMGaggm3ZlJ4rCv4RMoIBtUUVZTxFCSFTybXDIHrgnbST8tBqi jS8OXTGx3GWhh56JjRxq3C8JHPiko7Al7qQLnKD9qW1qYTLo6IteIsGVFuMr/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668533520; 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=3VWCIWnrlyJr6UoL/9ria970LBXjiZqcBh57enKkQnE=; b=wM8Wq17tzfASV7DbZ14CJ/Y7+eGn3VmBF4SWnpFtV5jbaMgrfPkRteG7OKux5LY4aOXRwO pWXs1h9LyNa3wQNS0z9uvjdcmyPucfxhYSCyO6yTKq3m9zT3gm/i9cRC/UcvOqMtHPEWCG PRQdco5+iDxNbOkYqFklqXW2/a8P/KgRsQbUhUske2ffWaSNCDFiEJxmNHgDQZjuz8V23H Tn+0zuDwK6SFujAtTKbDr7sSNVpkTNlqnkv1LH3oyPNFd67uSgB4gqDZsegn/6jLo/46nR rUqlt3z54L8klX1bNssRlS+mLUbY69PApbzDhdssQqFHOIPFjv9q4Z/+sd01FQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668533520; a=rsa-sha256; cv=none; b=DJHVdi2v584B90bFuY1EGzN1G0l7brQDMWJELfaZKUicLaydlgOyBW0VUfZ1zEFEBug59l 96CVNykCqS7/kjLG2Zmy4cPUV+7lcHXOpfSnHXJLPUB65D1qunPhRsC4bTJ9YVyJsuBQb7 OL35SLcdcbhWIEgjKbAF2d0uM6d09LQYaKkY2sRHlvt+itbyeJdH9viU5SKpfGfEmGQ7rA vwHERYvypRp6eKeruAibhCKYDCgKASFsyyY946NddBc+kI5JwBGPEyexJWWoLXXuJdTx34 x7qqrN583oqlMFKdfOFs9mRpGxSfn9Vbu4MmDfllFcuSKV4atS3SVEP7PsFEDg== 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 4NBYC42VLNzVyk; Tue, 15 Nov 2022 17:32:00 +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 2AFHW07P013055; Tue, 15 Nov 2022 17:32:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AFHW08p013054; Tue, 15 Nov 2022 17:32:00 GMT (envelope-from git) Date: Tue, 15 Nov 2022 17:32:00 GMT Message-Id: <202211151732.2AFHW08p013054@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: ae43a817d33d - main - Put the arm64 vttbr_el2 register into a state 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: ae43a817d33db3aa51f6dfce8dd940f06716e2a9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=ae43a817d33db3aa51f6dfce8dd940f06716e2a9 commit ae43a817d33db3aa51f6dfce8dd940f06716e2a9 Author: Andrew Turner AuthorDate: 2022-11-15 12:53:28 +0000 Commit: Andrew Turner CommitDate: 2022-11-15 17:26:52 +0000 Put the arm64 vttbr_el2 register into a state Zero the vttbr_el2 register on each CPU so we can tell if we are running the host or guest kernel from a hypervisor. Obtained from: https://github.com/FreeBSD-UPB/freebsd-src (earlier version) Sponsored by: Innovate UK Sponsored by: The FreeBSD Foundation --- sys/arm64/arm64/locore.S | 3 +++ sys/arm64/include/hypervisor.h | 1 + 2 files changed, 4 insertions(+) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index 059b6fd0fe1c..3b4f2ccc5353 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -295,6 +295,9 @@ LENTRY(drop_to_el1) add x2, x2, :lo12:hyp_vectors msr vbar_el2, x2 + /* Zero vttbr_el2 so a hypervisor can tell the host and guest apart */ + msr vttbr_el2, xzr + mov x2, #(PSR_F | PSR_I | PSR_A | PSR_D | PSR_M_EL1h) msr spsr_el2, x2 diff --git a/sys/arm64/include/hypervisor.h b/sys/arm64/include/hypervisor.h index f209ecde120a..dc6ccbfe20a9 100644 --- a/sys/arm64/include/hypervisor.h +++ b/sys/arm64/include/hypervisor.h @@ -199,6 +199,7 @@ /* VTTBR_EL2 - Virtualization Translation Table Base Register */ #define VTTBR_VMID_MASK 0xffff000000000000 #define VTTBR_VMID_SHIFT 48 +/* Assumed to be 0 by locore.S */ #define VTTBR_HOST 0x0000000000000000 #endif /* !_MACHINE_HYPERVISOR_H_ */