From nobody Mon Jan 23 12:37:40 2023 X-Original-To: dev-commits-src-branches@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 4P0qPd0jq9z3bShJ; Mon, 23 Jan 2023 12:37:41 +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 4P0qPd03qZz3CNf; Mon, 23 Jan 2023 12:37:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674477461; 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=A+Cs9EXIp69YHpbPBor/DKip84NO3NaOrN1IMLIURjM=; b=Yqa43+6v4LdYyTDHjooMnMSiXpA2e7I5djMna9eAOW8OtFDQTh6RwuQORdhKM7PRqbi9MZ Ep8FFSkk8rTjBdKqyrMyPqvyLJZDDCwmayWEQTjy6C+MkCvoKpiyQoyIaJleHoUcpc07PQ 8VSC1E1NhUdq9wEQvInIxcwtAXDlpFDtHIv/r9elHPAnx0uSMS4F8YGPzV2rpIXrvDkOY2 fLuDcoLNPf/aQ8w8jvP7XAwmgWNSX/tyAqt8a4tYJPp09LAQHP9BWgNg880nMIiW7UjNUt f8NT+TfRCBTO/wXh5SQf1Lu2WqLqYJtQ8pHUxPh9OzmJvx20A1HY/O2892MQlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674477461; 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=A+Cs9EXIp69YHpbPBor/DKip84NO3NaOrN1IMLIURjM=; b=wybh/+xRK8pcJh238iaAAFa6lcAY5gHjJo5Cs6tRFnJJ/fPOA0J2zeZSWz0KjL4GkCx2ff sSO8gKiJip/z3qWFCQKV6GsMKrb8Ejlge6xfomM8MNCSu29n0Q/ggY0IEapIXkXVQYwDXN 0PkaHRHc1TUe6W9QUpDxOhtAAhdmlHUVezWNlvzlPXp3g/O4cn6b2p0pT1wRunLB4mFW8E pMqLKxXc9KqJaomDEPp2l1YhnReBTwuEC73OQmlBtRyRCY0HAc4P3euGcGq6DmjbuSXHDj NrLtHxrFKpJuoiz3GlZq0sv0EWA30NgrKPdDOBmHRbiS0Iv48CRl7P45wlDXsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674477461; a=rsa-sha256; cv=none; b=N3CCYpWcOU6o8tFFCPkWG4HlAMJamwjJBGl6s5yx4qR4mBaNxVRtrhBlbKwwOBMem/EWMv ICOeRUomGsus/3N/I5kKPomuxGq76Twju50wPdMv3R4Nroi/J8AgSJrc3uRWQi4JHqRUr6 bYKFD6Astjs/cOcmbDYCv1VC1XiabNpII0RXr8XWpd8zcq8T3kqRJv1yN9TlPVw17Cb7Rf 0kMso5P3IcQ7vnVwYRhIEcF67tSCsZY4w616jHQIMNPnUIMdWpHfmimjGESqjZuH4t4zXB krphGEV9/nYw3yKMDDYqxzSvz/kuEWrHI+d2rndtMCJfDB7gtnLzqrwVTA/I9Q== 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 4P0qPc6GQczTCq; Mon, 23 Jan 2023 12:37:40 +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 30NCbeD8085421; Mon, 23 Jan 2023 12:37:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NCbeM6085420; Mon, 23 Jan 2023 12:37:40 GMT (envelope-from git) Date: Mon, 23 Jan 2023 12:37:40 GMT Message-Id: <202301231237.30NCbeM6085420@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 4dd63b65cb76 - stable/13 - Put the arm64 vttbr_el2 register into a state List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 4dd63b65cb76ed963dbd23b651ea8e2895b4dd20 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=4dd63b65cb76ed963dbd23b651ea8e2895b4dd20 commit 4dd63b65cb76ed963dbd23b651ea8e2895b4dd20 Author: Andrew Turner AuthorDate: 2022-11-15 12:53:28 +0000 Commit: Andrew Turner CommitDate: 2023-01-23 12:36:28 +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 (cherry picked from commit ae43a817d33db3aa51f6dfce8dd940f06716e2a9) --- 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 94c8f8b87403..70ddfe4893f3 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -283,6 +283,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_ */