Page MenuHomeFreeBSD
Files F115813042

D37269.diff
No OneTemporary
Actions

D37269.diff
View Options

diff --git a/sys/amd64/vmm/intel/vmx.h b/sys/amd64/vmm/intel/vmx.h
--- a/sys/amd64/vmm/intel/vmx.h
+++ b/sys/amd64/vmm/intel/vmx.h
@@ -142,6 +142,8 @@
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 @@
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.c b/sys/amd64/vmm/intel/vmx.c
--- a/sys/amd64/vmm/intel/vmx.c
+++ b/sys/amd64/vmm/intel/vmx.c
@@ -127,6 +127,8 @@
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 @@
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_msr.c b/sys/amd64/vmm/intel/vmx_msr.c
--- a/sys/amd64/vmm/intel/vmx_msr.c
+++ b/sys/amd64/vmm/intel/vmx_msr.c
@@ -366,7 +366,7 @@
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 @@
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 @@
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

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 30, 12:51 AM (10 h, 58 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
17849057
Default Alt Text
D37269.diff (2 KB)

Event Timeline