From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42450) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPu0t-0006rq-V9 for qemu-devel@nongnu.org; Fri, 05 Sep 2014 09:57:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XPu0n-0001It-Mu for qemu-devel@nongnu.org; Fri, 05 Sep 2014 09:57:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:5711) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XPu0n-0001IS-Eq for qemu-devel@nongnu.org; Fri, 05 Sep 2014 09:57:13 -0400 Message-Id: <20140905135539.340689829@amt.cnet> Date: Fri, 05 Sep 2014 10:52:47 -0300 From: Marcelo Tosatti References: <20140905135244.104423770@amt.cnet> Content-Disposition: inline; filename=kvmclock-ensure-proper-env-tsc.patch Subject: [Qemu-devel] [patch 3/3] kvmclock: Ensure proper env->tsc value for kvmclock_current_nsec calculation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Andrey Korolyov , =?ISO-8859-15?q?Marcin=20Gibu=C5=82a?= , Marcelo Tosatti Ensure proper env->tsc value for kvmclock_current_nsec calculation. Reported-and-analyzed-by: Marcin GibuĊ‚a Cc: qemu-stable@nongnu.org Signed-off-by: Marcelo Tosatti --- hw/i386/kvm/clock.c | 5 +++++ 1 file changed, 5 insertions(+) Index: qemu/hw/i386/kvm/clock.c =================================================================== --- qemu.orig/hw/i386/kvm/clock.c 2014-09-05 10:07:04.116665549 -0300 +++ qemu/hw/i386/kvm/clock.c 2014-09-05 10:31:06.894106473 -0300 @@ -17,6 +17,7 @@ #include "qemu/host-utils.h" #include "sysemu/sysemu.h" #include "sysemu/kvm.h" +#include "sysemu/cpus.h" #include "hw/sysbus.h" #include "hw/kvm/clock.h" @@ -65,6 +66,7 @@ cpu_physical_memory_read(kvmclock_struct_pa, &time, sizeof(time)); + assert(time.tsc_timestamp <= migration_tsc); delta = migration_tsc - time.tsc_timestamp; if (time.tsc_shift < 0) { delta >>= -time.tsc_shift; @@ -123,6 +125,9 @@ if (s->clock_valid) { return; } + + cpu_synchronize_all_states(); + cpu_clean_all_dirty(); ret = kvm_vm_ioctl(kvm_state, KVM_GET_CLOCK, &data); if (ret < 0) { fprintf(stderr, "KVM_GET_CLOCK failed: %s\n", strerror(ret));