KVM: SVM: Adjust tsc_offset only if tsc_unstable
PATCH 1/1 KVM: SVM: Adjust tsc_offset only if tsc_unstable
The tsc_offset adjustment in svm_vcpu_load is executed unconditionally even if Linux considers the host tsc as stable. This causes a Linux guest detecting an unstable tsc in any case.
This patch removes the tsc_offset adjustment if the host tsc is stable. The guest will now get the benefit of a stable tsc too.
--- arch/x86/kvm/svm.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-)
arch/x86/kvm/svm.c +10 -8
@@ -767,14 +767,16 @@ static void svm_vcpu_load(struct kvm_vcpu *vcpu, int cpu)if (unlikely (cpu != vcpu->cpu)) {u64 delta; -/* -* Make sure that the guest sees a monotonically -* increasing TSC. -*/ - delta = vcpu->arch.host_tsc -native_read_tsc (); - svm->vmcb->control.tsc_offset += delta; -if (is_nested (svm)) - svm->nested.hsave->control.tsc_offset += delta; +if (check_tsc_unstable ()) { +/* +* Make sure that the guest sees a monotonically +* increasing TSC. +*/ + delta = vcpu->arch.host_tsc -native_read_tsc (); + svm->vmcb->control.tsc_offset += delta; +if (is_nested (svm)) + svm->nested.hsave->control.tsc_offset += delta; + } vcpu->cpu = cpu;kvm_migrate_timers (vcpu); svm->asid_generation =0 ;
Signature · 1 line
1.6.5.4
Quoted 9 lines · Joerg Roedel
The
tsc_offsetadjustment insvm_vcpu_loadis executed unconditionally even if Linux considers the host tsc as stable. This causes a Linux guest detecting an unstable tsc in any case.
This patch removes thetsc_offsetadjustment if the host tsc is stable. The guest will now get the benefit of a stable tsc too.
Hi Joerg, I have a much more comprehensive series of patches to address this issue, please take a look.
Thanks,
Zach
Quoted 11 lines · Zachary Amsden
Quoted 8 lines · Joerg Roedel
The
tsc_offsetadjustment insvm_vcpu_loadis executed unconditionally even if Linux considers the host tsc as stable. This causes a Linux guest detecting an unstable tsc in any case.
This patch removes thetsc_offsetadjustment if the host tsc is stable. The guest will now get the benefit of a stable tsc too.Hi Joerg, I have a much more comprehensive series of patches to address this issue, please take a look.
Despite this, I've applied the patch to have this fix in while we review your patch set (haven't started yet, sorry - still recovering from nested vmx).
Signature · 1 line
error compiling committee.c: too many arguments to function
Quoted 10 lines · Avi Kivity
Quoted 9 lines · Zachary Amsden
Quoted 8 lines · Joerg Roedel
The
tsc_offsetadjustment insvm_vcpu_loadis executed unconditionally even if Linux considers the host tsc as stable. This causes a Linux guest detecting an unstable tsc in any case.
This patch removes thetsc_offsetadjustment if the host tsc is stable. The guest will now get the benefit of a stable tsc too.
Quoted 4 lines
Quoted 2 lines
Hi Joerg, I have a much more comprehensive series of patches to address this issue, please take a look.
Despite this, I've applied the patch to have this fix in while we review your patch set (haven't started yet, sorry - still recovering from nested vmx).
No worries, I can always re-base. My patch set needs some other fixed bits for sleep in C-states on Intel CPUs.
Choices are:
1) do nothing; don't support these CPUs
2) do nothing; don't support MWAIT based sleep into C3 on these CPUs, force different idle routine
3) resync the TSC on exit from C3
4) don't use TSC here at all
If the wakeup time for a CPU needs to be fast, I prefer approach #2;
However, if the load is so low that we can drop to C3, then we can consider the state of deep idle to be equivalent to bring a CPU down and then back up, which is a problem we already know how to solve; this is an argument for #3.
It is also pragmatic to suggest #4, now that there exists a patchset for doing intercept based TSC virtualization.
Zach