@@ -588,6 +588,8 @@ struct kvm_x86_ops {
void (*write_tsc_offset)(struct kvm_vcpu *vcpu, u64 offset);
+ bool (*use_virtual_tsc_khz)(struct kvm_vcpu *vcpu);
+
void (*get_exit_info)(struct kvm_vcpu *vcpu, u64 *info1, u64 *info2);
const struct trace_print_flags *exit_reasons_str;
};
@@ -914,6 +914,13 @@ static void svm_adjust_tsc_offset(struct kvm_vcpu *vcpu, s64 adjustment)
mark_dirty(svm->vmcb, VMCB_INTERCEPTS);
}
+static bool svm_use_virtual_tsc_khz(struct kvm_vcpu *vcpu)
+{
+ struct vcpu_svm *svm = to_svm(vcpu);
+
+ return svm->tsc_scale.enabled;
+}
+
static void init_vmcb(struct vcpu_svm *svm)
{
struct vmcb_control_area *control = &svm->vmcb->control;
@@ -3996,6 +4003,7 @@ static struct kvm_x86_ops svm_x86_ops = {
.write_tsc_offset = svm_write_tsc_offset,
.adjust_tsc_offset = svm_adjust_tsc_offset,
+ .use_virtual_tsc_khz = svm_use_virtual_tsc_khz,
.set_tdp_cr3 = set_tdp_cr3,
};
@@ -1163,6 +1163,11 @@ static void vmx_adjust_tsc_offset(struct kvm_vcpu *vcpu, s64 adjustment)
vmcs_write64(TSC_OFFSET, offset + adjustment);
}
+static bool vmx_use_virtual_tsc_khz(struct kvm_vcpu *vcpu)
+{
+ return false;
+}
+
/*
* Reads an msr value (of 'msr_index') into 'pdata'.
* Returns 0 on success, non-0 otherwise.
@@ -4438,6 +4443,7 @@ static struct kvm_x86_ops vmx_x86_ops = {
.write_tsc_offset = vmx_write_tsc_offset,
.adjust_tsc_offset = vmx_adjust_tsc_offset,
+ .use_virtual_tsc_khz = vmx_use_virtual_tsc_khz,
.set_tdp_cr3 = vmx_set_cr3,
};
@@ -982,6 +982,14 @@ static inline int kvm_tsc_changes_freq(void)
return ret;
}
+static u64 vcpu_tsc_khz(struct kvm_vcpu *vcpu)
+{
+ if (kvm_x86_ops->use_virtual_tsc_khz(vcpu))
+ return vcpu->kvm->arch.virtual_tsc_khz;
+ else
+ return __this_cpu_read(cpu_tsc_khz);
+}
+
static inline u64 nsec_to_cycles(u64 nsec)
{
u64 ret;
@@ -1075,8 +1083,7 @@ static int kvm_guest_time_update(struct kvm_vcpu *v)
local_irq_save(flags);
kvm_get_msr(v, MSR_IA32_TSC, &tsc_timestamp);
kernel_ns = get_kernel_ns();
- this_tsc_khz = __this_cpu_read(cpu_tsc_khz);
-
+ this_tsc_khz = vcpu_tsc_khz(v);
if (unlikely(this_tsc_khz == 0)) {
local_irq_restore(flags);
kvm_make_request(KVM_REQ_CLOCK_UPDATE, v);