From nobody Thu Jan 26 22:11:41 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 4P2w0Z0CNGz3c83q; Thu, 26 Jan 2023 22:11:42 +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 4P2w0Y6rRkz3tsg; Thu, 26 Jan 2023 22:11:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771102; 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=YAwEyCxPk43Zib+qNLc0lsT03H1d3Zi39QIrG+c2CHo=; b=oFNPz4p3HK8A3mLazqYu1wNwXYYo2mL4TRrlaJbdIPuZO6uF7ds6LJi4msgxv/mQSKbHit mdbr2Y2COcs+Etgv6IIdm7YZ9mNSAG3pV8p5D6MbEIOLyuPvTC64vAseCbddoKcKMG8MNL KT5qyP/u5fEcYkf4cmUPqv7GdaYC/yBcO9Orrv+hSx/qlaIwqKnC480pLE9cBOPdyd0gNb Z00TLA6wH9EZf9ZKYpK9dcECzgaOqQm0zqNYVgAIrNk7kIJ3tHFM806KQI+7Dh4MRd/sNR 5MGNqfutFNRv5sWZogMOk3uznqCdTDANcKYI4/Fl2b4SE+QrcA5zOdd1D+14TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674771102; 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=YAwEyCxPk43Zib+qNLc0lsT03H1d3Zi39QIrG+c2CHo=; b=PsyDqeatN66VKcOx83eFgw7/xWAadcR0ZCGb+sllwK40+FeJ7G8niqktG0Dase163t056g RG3VyzUser/hLS0G2YxCLPlTuA0iR1vpvdUaSfMQsbz2JucTSl4uP2TKAEcb805DxBUcNb UY9xeh5aW77UBqRRBSuRUBb4S+WAInZEldtIExJuO+kdda1bN+VLd2KP7I4DLAaHbxZlxv 8ctNUGogJIaPEYgx2+QLIZVmCc0ixeG2Ie4IR6+b4l2flEpqw8SibWr21ZU7+JpT7KSc5k eEpdozo8czyNMlEqzAKH3uLTWl+NS1DdG1qb1BPg2erN2KsP2KHKJ//sd0xs7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674771102; a=rsa-sha256; cv=none; b=LdZo1b7Vr/3JnrlFbOdZBQfLkcALjmpfmms0Og2qNtPLmSuiERN3CtniLdtTsKEVRSEsTA 3c7BNBl2phYw2IEK1qDG5RDIHR4VIjf41IlJTw8tdKhDmgUwoUTZWp/in0guuATkg49pb3 k6iaYtwVJLcMHQ7xgdWRRNo3Zm2k6KGQZ3hStHv3W7Qnzvmz6q4kL2nFaw6Z/W5eLG4i49 Y2OVcpbsg1PDAjfatRxC06NogNSGvFao4Y5o9h86jbsy8AfALpQERfgDgLO3sXVBIYeJo+ Eb+StejDol/IEhP1h6MekqgoIC99jZQB3Mrc8S1P14sqW0capDsxRy0fE6n+jA== 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 4P2w0Y5gmzzm5T; Thu, 26 Jan 2023 22:11:41 +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 30QMBfwN019161; Thu, 26 Jan 2023 22:11:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QMBfxq019149; Thu, 26 Jan 2023 22:11:41 GMT (envelope-from git) Date: Thu, 26 Jan 2023 22:11:41 GMT Message-Id: <202301262211.30QMBfxq019149@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: bf5683caedae - stable/13 - vmm vmx: Add a global bool to indicate if the host has the TSC_AUX MSR. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bf5683caedae298a17dfed91aeddb8249772c136 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bf5683caedae298a17dfed91aeddb8249772c136 commit bf5683caedae298a17dfed91aeddb8249772c136 Author: John Baldwin AuthorDate: 2022-11-18 17:58:56 +0000 Commit: John Baldwin CommitDate: 2023-01-26 21:44:42 +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 (cherry picked from commit 73abae4493782e44a3382b15f5563c3f400bf51f) --- 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