diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2009-09-16 15:24:17 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-10-04 13:57:22 +0200 |
| commit | 77b1ab1732feb5e3dcbaf31d2f7547c5229f5f3a (patch) | |
| tree | bf9378c8d5b36b561b4a3d98f9e96046cb80112a | |
| parent | 8a0382f6fceaf0c6479e582e1054f36333ea3d24 (diff) | |
| download | blackbird-obmc-linux-77b1ab1732feb5e3dcbaf31d2f7547c5229f5f3a.tar.gz blackbird-obmc-linux-77b1ab1732feb5e3dcbaf31d2f7547c5229f5f3a.zip | |
KVM: SVM: Fix tsc offset adjustment when running nested
When svm_vcpu_load is called while the vcpu is running in
guest mode the tsc adjustment made there is lost on the next
emulated #vmexit. This causes the tsc running backwards in
the guest. This patch fixes the issue by also adjusting the
tsc_offset in the emulated hsave area so that it will not
get lost.
Cc: stable@kernel.org
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| -rw-r--r-- | arch/x86/kvm/svm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 944cc9c04b3c..bf5799dc4f9f 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -767,6 +767,8 @@ static void svm_vcpu_load(struct kvm_vcpu *vcpu, int cpu) rdtscll(tsc_this); delta = vcpu->arch.host_tsc - tsc_this; 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; |
