From nobody Fri Nov 18 18:26:28 2022
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 4NDQGX2xcWz4d84g;
	Fri, 18 Nov 2022 18:26:28 +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 4NDQGX2SWLz4HWp;
	Fri, 18 Nov 2022 18:26:28 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1668795988;
	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=wSO32l/9N78nTgmzGJ4/2OtbJNxqw9XCuliQSgMm8VE=;
	b=nyRSqcYyxWUJIo4/YIYzWRXvQ3VKgzWoEw9hqNO6JN3QXtC/t16Js46MQ9LsPzqi9WDWn6
	Wz/pyHX6SxCpqB0j26phwHShhY2QER9LGP5GSAQot88xF/R0CHQtfx46nvSH591wO27QzA
	3QbUKh8PUE1qgCoFSUi+o7r7ZMmpBjZsNJs9leanXDRSxyVu/QaowDOgf+Pd1V6kTwtMxh
	780+QYPhiJQVndXFcU8STbTh1mPZI71e7o1pCgt4LCPOYA28AJzJ4EHmVFuALEKxbT4t3/
	oW0VvYPq7REz//SL8jnOHtPaUWIFSWZ+pgnpYMxiA60mrRSdI5X+4jmOXusaQg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1668795988;
	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=wSO32l/9N78nTgmzGJ4/2OtbJNxqw9XCuliQSgMm8VE=;
	b=CqYrtuoKt56W+pJU6AGjsHLeeMAjyKWb5He7fPxyhbruNCRGeg+zMDL6jRHDW199JRDsh3
	4O0obM9VByF71c0rFghQu2XoMAOogFpNnPqpLgoprkFosowlN0Ny5ZKQkLRDq3lzWziVKr
	8Yo+84bG/8Kr5gmG/zQFXHusCVYhm3KZedjmBy6ROJwMs7l4k/ZXlX/+8GphmDiS5wF4N/
	W7QdhrEMR3hQu2c/bIKFP2vlnli0ppo+5uQDgJu6qFAw4kTun/pnNWM3UwyFEBLMrX9wnV
	i5ktVTbLafWxdjtDKmzPsHC1X+C45HSt8x8bLAjuElL/eUQkLLIOhSBnl8/+ZA==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668795988; a=rsa-sha256; cv=none;
	b=n+/0bg/Z8PyOs+cCLIwuVUVr2Pm1JpTViZ8S/ETmt9eqQyc7G478jLXAXWtGOMBgI3RHsd
	E85Xqn/9bpLgkRSPiRJqqUsCmFuqZgkCnpBWUBPT7125yDrL8vnOxaihUUkZJA/Q7ekUhi
	Doh11c86VGmB0pIw0wc+xq8dBgLvIAjCRKWgeDT59qtAppRiQX/dUNBAyK7jcTyKkBKGqj
	aiKtQAniLDhBB+AEKINZl1YJqGr8sDYVEt005t5hZCnwE9/gJgYcIELr7yg27c6Sv25esL
	gYGU6YsUkqxAiCyB8lt6ZwQ4L4yFYlprtGfmKiSRTXC2w5g0NWVq/Eg1iTDz5Q==
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 4NDQGX14Q7zG5F;
	Fri, 18 Nov 2022 18:26:28 +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 2AIIQS3H030014;
	Fri, 18 Nov 2022 18:26:28 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AIIQStN030013;
	Fri, 18 Nov 2022 18:26:28 GMT
	(envelope-from git)
Date: Fri, 18 Nov 2022 18:26:28 GMT
Message-Id: <202211181826.2AIIQStN030013@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
        dev-commits-src-main@FreeBSD.org
From: John Baldwin <jhb@FreeBSD.org>
Subject: git: 73abae449378 - main - vmm vmx: Add a global bool to indicate if the host has the TSC_AUX MSR.
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-main@freebsd.org
X-BeenThere: dev-commits-src-main@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: jhb
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 73abae4493782e44a3382b15f5563c3f400bf51f
Auto-Submitted: auto-generated
X-ThisMailContainsUnwantedMimeParts: N

The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=73abae4493782e44a3382b15f5563c3f400bf51f

commit 73abae4493782e44a3382b15f5563c3f400bf51f
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-11-18 17:58:56 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-11-18 18:25:35 +0000

    vmm vmx: Add a global bool to indicate if the host has the TSC_AUX MSR.
    
    A future commit will remove direct access to vCPU structures from
    struct vmx, so add a dedicated boolean for this rather than checking
    the capabilities for vCPU 0.
    
    Reviewed by:    corvink, markj
    Differential Revision:  https://reviews.freebsd.org/D37269
---
 sys/amd64/vmm/intel/vmx.c     |  6 +++++-
 sys/amd64/vmm/intel/vmx.h     | 16 ++--------------
 sys/amd64/vmm/intel/vmx_msr.c |  6 +++---
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c
index 7ece03a44952..96e7907622cf 100644
--- a/sys/amd64/vmm/intel/vmx.c
+++ b/sys/amd64/vmm/intel/vmx.c
@@ -127,6 +127,8 @@ __FBSDID("$FreeBSD$");
 static MALLOC_DEFINE(M_VMX, "vmx", "vmx");
 static MALLOC_DEFINE(M_VLAPIC, "vlapic", "vlapic");
 
+bool vmx_have_msr_tsc_aux;
+
 SYSCTL_DECL(_hw_vmm);
 SYSCTL_NODE(_hw_vmm, OID_AUTO, vmx, CTLFLAG_RW | CTLFLAG_MPSAFE, NULL,
     NULL);
@@ -821,8 +823,10 @@ vmx_modinit(int ipinum)
 			       PROCBASED2_ENABLE_RDTSCP, 0, &tmp);
 	cap_rdpid = error == 0 && host_has_rdpid();
 	cap_rdtscp = error == 0 && host_has_rdtscp();
-	if (cap_rdpid || cap_rdtscp)
+	if (cap_rdpid || cap_rdtscp) {
 		procbased_ctls2 |= PROCBASED2_ENABLE_RDTSCP;
+		vmx_have_msr_tsc_aux = true;
+	}
 
 	cap_unrestricted_guest = (vmx_set_ctlreg(MSR_VMX_PROCBASED_CTLS2,
 					MSR_VMX_PROCBASED_CTLS2,
diff --git a/sys/amd64/vmm/intel/vmx.h b/sys/amd64/vmm/intel/vmx.h
index 8168b82bfe5c..39594473cd43 100644
--- a/sys/amd64/vmm/intel/vmx.h
+++ b/sys/amd64/vmm/intel/vmx.h
@@ -142,6 +142,8 @@ struct vmx {
 	long		eptgen[MAXCPU];		/* cached pmap->pm_eptgen */
 };
 
+extern bool vmx_have_msr_tsc_aux;
+
 #define	VMX_GUEST_VMEXIT	0
 #define	VMX_VMRESUME_ERROR	1
 #define	VMX_VMLAUNCH_ERROR	2
@@ -156,18 +158,4 @@ int	vmx_set_tsc_offset(struct vmx *vmx, int vcpu, uint64_t offset);
 extern char	vmx_exit_guest[];
 extern char	vmx_exit_guest_flush_rsb[];
 
-static inline bool
-vmx_have_msr_tsc_aux(struct vmx *vmx)
-{
-	int rdpid_rdtscp_bits = ((1 << VM_CAP_RDPID) | (1 << VM_CAP_RDTSCP));
-
-	/*
-	 * Since the values of these bits are uniform across all vCPUs
-	 * (see discussion in vmx_modinit() and initialization of these bits
-	 * in vmx_init()), just always use vCPU-zero's capability set and
-	 * remove the need to require a vcpuid argument.
-	 */
-	return ((vmx->vcpus[0].cap.set & rdpid_rdtscp_bits) != 0);
-}
-
 #endif
diff --git a/sys/amd64/vmm/intel/vmx_msr.c b/sys/amd64/vmm/intel/vmx_msr.c
index 0d4e86edf60c..40f0057f2cdd 100644
--- a/sys/amd64/vmm/intel/vmx_msr.c
+++ b/sys/amd64/vmm/intel/vmx_msr.c
@@ -366,7 +366,7 @@ vmx_msr_guest_enter_tsc_aux(struct vmx *vmx, int vcpuid)
 	uint64_t guest_tsc_aux = vmx_vcpu->guest_msrs[IDX_MSR_TSC_AUX];
 	uint32_t host_aux = cpu_auxmsr();
 
-	if (vmx_have_msr_tsc_aux(vmx) && guest_tsc_aux != host_aux)
+	if (vmx_have_msr_tsc_aux && guest_tsc_aux != host_aux)
 		wrmsr(MSR_TSC_AUX, guest_tsc_aux);
 }
 
@@ -398,7 +398,7 @@ vmx_msr_guest_exit_tsc_aux(struct vmx *vmx, int vcpuid)
 	uint64_t guest_tsc_aux = vmx_vcpu->guest_msrs[IDX_MSR_TSC_AUX];
 	uint32_t host_aux = cpu_auxmsr();
 
-	if (vmx_have_msr_tsc_aux(vmx) && guest_tsc_aux != host_aux)
+	if (vmx_have_msr_tsc_aux && guest_tsc_aux != host_aux)
 		/*
 		 * Note that it is not necessary to save the guest value
 		 * here; vmx->guest_msrs[vcpuid][IDX_MSR_TSC_AUX] always
@@ -505,7 +505,7 @@ vmx_wrmsr(struct vmx *vmx, int vcpuid, u_int num, uint64_t val, bool *retu)
 		error = vmx_set_tsc_offset(vmx, vcpuid, val - rdtsc());
 		break;
 	case MSR_TSC_AUX:
-		if (vmx_have_msr_tsc_aux(vmx))
+		if (vmx_have_msr_tsc_aux)
 			/*
 			 * vmx_msr_guest_enter_tsc_aux() will apply this
 			 * value when it is called immediately before guest