qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] kvmclock: Ensure time in migration never goes backward
@ 2014-05-05 13:51 Alexander Graf
  2014-05-05 17:46 ` Marcin Gibuła
                   ` (2 more replies)
  0 siblings, 3 replies; 25+ messages in thread
From: Alexander Graf @ 2014-05-05 13:51 UTC (permalink / raw)
  To: qemu-devel; +Cc: kvm

When we migrate we ask the kernel about its current belief on what the guest
time would be. However, I've seen cases where the kvmclock guest structure
indicates a time more recent than the kvm returned time.

To make sure we never go backwards, calculate what the guest would have seen
as time at the point of migration and use that value instead of the kernel
returned one when it's more recent.

While this doesn't fix the underlying issue that the kernel's view of time
is skewed, it allows us to safely migrate guests even from sources that are
known broken.

Signed-off-by: Alexander Graf <agraf@suse.de>
---
 hw/i386/kvm/clock.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c
index 892aa02..c6521cf 100644
--- a/hw/i386/kvm/clock.c
+++ b/hw/i386/kvm/clock.c
@@ -14,6 +14,7 @@
  */
 
 #include "qemu-common.h"
+#include "qemu/host-utils.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/kvm.h"
 #include "hw/sysbus.h"
@@ -34,6 +35,47 @@ typedef struct KVMClockState {
     bool clock_valid;
 } KVMClockState;
 
+struct pvclock_vcpu_time_info {
+    uint32_t   version;
+    uint32_t   pad0;
+    uint64_t   tsc_timestamp;
+    uint64_t   system_time;
+    uint32_t   tsc_to_system_mul;
+    int8_t     tsc_shift;
+    uint8_t    flags;
+    uint8_t    pad[2];
+} __attribute__((__packed__)); /* 32 bytes */
+
+static uint64_t kvmclock_current_nsec(KVMClockState *s)
+{
+    CPUState *cpu = first_cpu;
+    CPUX86State *env = cpu->env_ptr;
+    hwaddr kvmclock_struct_pa = env->system_time_msr & ~1ULL;
+    uint64_t migration_tsc = env->tsc;
+    struct pvclock_vcpu_time_info time;
+    uint64_t delta;
+    uint64_t nsec_lo;
+    uint64_t nsec_hi;
+    uint64_t nsec;
+
+    if (!(env->system_time_msr & 1ULL)) {
+        /* KVM clock not active */
+        return 0;
+    }
+
+    cpu_physical_memory_read(kvmclock_struct_pa, &time, sizeof(time));
+
+    delta = migration_tsc - time.tsc_timestamp;
+    if (time.tsc_shift < 0) {
+        delta >>= -time.tsc_shift;
+    } else {
+        delta <<= time.tsc_shift;
+    }
+
+    mulu64(&nsec_lo, &nsec_hi, delta, time.tsc_to_system_mul);
+    nsec = (nsec_lo >> 32) | (nsec_hi << 32);
+    return nsec + time.system_time;
+}
 
 static void kvmclock_vm_state_change(void *opaque, int running,
                                      RunState state)
@@ -45,9 +87,15 @@ static void kvmclock_vm_state_change(void *opaque, int running,
 
     if (running) {
         struct kvm_clock_data data;
+        uint64_t time_at_migration = kvmclock_current_nsec(s);
 
         s->clock_valid = false;
 
+        if (time_at_migration > s->clock) {
+            fprintf(stderr, "KVM Clock migrated backwards, using later time\n");
+            s->clock = time_at_migration;
+        }
+
         data.clock = s->clock;
         data.flags = 0;
         ret = kvm_vm_ioctl(kvm_state, KVM_SET_CLOCK, &data);
-- 
1.7.12.4

^ permalink raw reply related	[flat|nested] 25+ messages in thread
end of thread, other threads:[~2014-05-14  7:41 UTC | newest]

Thread overview: 25+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-05 13:51 [Qemu-devel] [PATCH] kvmclock: Ensure time in migration never goes backward Alexander Graf
2014-05-05 17:46 ` Marcin Gibuła
2014-05-05 18:05   ` Alexander Graf
2014-05-05 18:26     ` Marcin Gibuła
2014-05-05 23:27       ` Marcelo Tosatti
2014-05-05 23:31         ` Marcelo Tosatti
2014-05-06  8:07           ` Marcin Gibuła
2014-05-06  7:11         ` Alexander Graf
2014-05-06  7:37         ` Marcin Gibuła
2014-05-05 23:23 ` Marcelo Tosatti
2014-05-05 23:31   ` Marcelo Tosatti
2014-05-06  7:18     ` Alexander Graf
2014-05-06 19:54       ` Marcin Gibuła
2014-05-07 23:23         ` Marcelo Tosatti
2014-05-07 23:21       ` Marcelo Tosatti
2014-05-07 23:29         ` Alexander Graf
2014-05-06  7:16   ` Alexander Graf
2014-05-07 10:04     ` Nick Thomas
2014-05-08  1:33 ` Marcelo Tosatti
2014-05-08  7:21   ` Alexander Graf
2014-05-09  2:28     ` Marcelo Tosatti
2014-05-09 11:53       ` Paolo Bonzini
2014-05-12 20:26         ` Alexander Graf
2014-05-14  7:26           ` Marcelo Tosatti
2014-05-14  6:47         ` Marcelo Tosatti

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).