mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Zachary Amsden <zamsden@redhat.com>
To: avi@redhat.com, mtosatti@redhat.com, glommer@redhat.com,
	kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Zachary Amsden <zamsden@redhat.com>
Subject: [PATCH 16/17] TSC reset compensation
Date: Mon, 14 Jun 2010 21:34:18 -1000	[thread overview]
Message-ID: <1276587259-32319-17-git-send-email-zamsden@redhat.com> (raw)
In-Reply-To: <1276587259-32319-1-git-send-email-zamsden@redhat.com>

Attempt to synchronize TSCs which are reset to the same value.  In the
case of a reliable hardware TSC, we can just re-use the same offset, but
on non-reliable hardware, we can get closer by adjusting the offset to
match the elapsed time.

Signed-off-by: Zachary Amsden <zamsden@redhat.com>
---
 arch/x86/kvm/x86.c |   34 ++++++++++++++++++++++++++++++++--
 1 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 8e836e9..cedb71f 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -937,14 +937,44 @@ static inline void kvm_request_guest_time_update(struct kvm_vcpu *v)
 	set_bit(KVM_REQ_CLOCK_SYNC, &v->requests);
 }
 
+static inline int kvm_tsc_reliable(void)
+{
+	return (boot_cpu_has(X86_FEATURE_CONSTANT_TSC) &&
+		boot_cpu_has(X86_FEATURE_NONSTOP_TSC) &&
+		!check_tsc_unstable());
+}
+
 void guest_write_tsc(struct kvm_vcpu *vcpu, u64 data)
 {
 	struct kvm *kvm = vcpu->kvm;
-	u64 offset;
+	u64 offset, ns, elapsed;
 
 	spin_lock(&kvm->arch.tsc_write_lock);
 	offset = data - native_read_tsc();
-	kvm->arch.last_tsc_nsec = get_kernel_ns();
+	ns = get_kernel_ns();
+	elapsed = ns - kvm->arch.last_tsc_nsec;
+
+	/*
+	 * Special case: identical write to TSC within 5 seconds of
+	 * another CPU is interpreted as an attempt to synchronize
+	 * (the 5 seconds is to accomodate host load / swapping).
+	 *
+	 * In that case, for a reliable TSC, we can match TSC offsets,
+	 * or make a best guest using kernel_ns value.
+	 */
+	if (data == kvm->arch.last_tsc_write && elapsed < 5 * NSEC_PER_SEC) {
+		if (kvm_tsc_reliable()) {
+			offset = kvm->arch.last_tsc_offset;
+			pr_debug("kvm: matched tsc offset for %llu\n", data);
+		} else {
+			u64 tsc_delta = elapsed * __get_cpu_var(cpu_tsc_khz);
+			tsc_delta = tsc_delta / USEC_PER_SEC;
+			offset -= tsc_delta;
+			pr_debug("kvm: adjusted tsc offset by %llu\n", tsc_delta);
+		}
+		ns = kvm->arch.last_tsc_nsec;
+	}
+	kvm->arch.last_tsc_nsec = ns;
 	kvm->arch.last_tsc_write = data;
 	kvm->arch.last_tsc_offset = offset;
 	kvm_x86_ops->write_tsc_offset(vcpu, offset);
-- 
1.7.1


  parent reply	other threads:[~2010-06-15  7:35 UTC|newest]

Thread overview: 70+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-15  7:34 TSC cleanups, fixes, documentation for KVM Zachary Amsden
2010-06-15  7:34 ` [PATCH 01/17] Eliminate duplicated timer code Zachary Amsden
2010-06-16 13:07   ` Glauber Costa
2010-06-15  7:34 ` [PATCH 02/17] Make cpu_tsc_khz updates use local CPU Zachary Amsden
2010-06-15  8:02   ` Avi Kivity
2010-06-15  7:34 ` [PATCH 03/17] Unify vendor TSC logic Zachary Amsden
2010-06-16  8:10   ` Jason Wang
2010-06-16 13:22     ` Glauber Costa
2010-06-17  8:03       ` Jason Wang
2010-06-16 18:42     ` Zachary Amsden
2010-06-17  8:15       ` Jason Wang
2010-06-17 20:30         ` Zachary Amsden
2010-06-15  7:34 ` [PATCH 04/17] Fix deep C-state TSC desynchronization Zachary Amsden
2010-06-15  8:09   ` Avi Kivity
2010-06-15  8:14     ` Zachary Amsden
2010-06-16  8:10   ` Jason Wang
2010-06-16 18:43     ` Zachary Amsden
2010-06-16 13:24   ` Glauber Costa
2010-06-16 19:20     ` Zachary Amsden
2010-06-15  7:34 ` [PATCH 05/17] Keep SMP VMs more in sync on unstable TSC Zachary Amsden
2010-06-15  8:11   ` Avi Kivity
2010-06-16  8:11   ` Jason Wang
2010-06-16 13:32   ` Glauber Costa
2010-06-16 21:15     ` Zachary Amsden
2010-06-15  7:34 ` [PATCH 06/17] Rename KVM_REQ_KVMCLOCK_UPDATE Zachary Amsden
2010-06-15  7:34 ` [PATCH 07/17] Perform hardware_enable in CPU_STARTING callback Zachary Amsden
2010-06-15  7:34 ` [PATCH 08/17] Add clock sync request to hardware enable Zachary Amsden
2010-06-15  8:24   ` Avi Kivity
2010-06-15  7:34 ` [PATCH 09/17] Move scale_delta into common header Zachary Amsden
2010-06-15  7:34 ` [PATCH 10/17] Make KVM clock computation work for other scales Zachary Amsden
2010-06-15  7:34 ` [PATCH 11/17] Fix a possible backwards warp of kvmclock Zachary Amsden
2010-06-15  8:40   ` Avi Kivity
2010-06-15 20:37     ` Zachary Amsden
2010-06-15 23:47   ` Marcelo Tosatti
2010-06-16  0:21     ` Zachary Amsden
2010-06-16  0:39       ` Marcelo Tosatti
2010-06-16  8:11   ` Jason Wang
2010-06-16 13:58     ` Glauber Costa
2010-06-16 14:13       ` Avi Kivity
2010-06-16 14:58         ` Glauber Costa
2010-06-16 22:38       ` Zachary Amsden
2010-06-16 19:36     ` Zachary Amsden
2010-06-15  7:34 ` [PATCH 12/17] Add helper function get_kernel_ns Zachary Amsden
2010-06-15  8:41   ` Avi Kivity
2010-06-15 21:03     ` Zachary Amsden
2010-06-15 21:13       ` john stultz
2010-06-16  8:12       ` Jason Wang
2010-06-16 14:03         ` Glauber Costa
2010-06-15  7:34 ` [PATCH 13/17] Add TSC offset tracking Zachary Amsden
2010-06-15  8:44   ` Avi Kivity
2010-06-15  7:34 ` [PATCH 14/17] Fix SVM VMCB reset Zachary Amsden
2010-06-15  7:34 ` [PATCH 15/17] Fix AMD C1 TSC desynchronization Zachary Amsden
2010-06-15  8:47   ` Avi Kivity
2010-06-15  9:21     ` Zachary Amsden
2010-06-15 14:46       ` Roedel, Joerg
2010-06-15  7:34 ` Zachary Amsden [this message]
2010-06-15  8:51   ` [PATCH 16/17] TSC reset compensation Avi Kivity
2010-06-15 20:32     ` Zachary Amsden
2010-06-16  0:27   ` Marcelo Tosatti
2010-06-16  0:32     ` Zachary Amsden
2010-06-16 13:52   ` Glauber Costa
2010-06-16 22:36     ` Zachary Amsden
2010-06-15  7:34 ` [PATCH 17/17] Add timekeeping documentation Zachary Amsden
2010-06-15  8:51   ` Avi Kivity
2010-06-15 20:27   ` Randy Dunlap
2010-06-16 23:59     ` Zachary Amsden
2010-06-17  8:55   ` Andi Kleen
2010-06-17 21:14     ` Zachary Amsden
2010-06-18  7:49       ` Andi Kleen
2010-06-18 16:33         ` Zachary Amsden

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1276587259-32319-17-git-send-email-zamsden@redhat.com \
    --to=zamsden@redhat.com \
    --cc=avi@redhat.com \
    --cc=glommer@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mtosatti@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®