From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:50906)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <m.gibula@beyond.pl>) id 1X78wY-0000rl-QO
	for qemu-devel@nongnu.org; Tue, 15 Jul 2014 16:03:26 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <m.gibula@beyond.pl>) id 1X78wR-0001Zv-Ap
	for qemu-devel@nongnu.org; Tue, 15 Jul 2014 16:03:18 -0400
Received: from mx.beyond.pl ([92.43.117.49]:46747)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <m.gibula@beyond.pl>) id 1X78wR-0001ZC-3v
	for qemu-devel@nongnu.org; Tue, 15 Jul 2014 16:03:11 -0400
Message-ID: <53C588F4.4040307@beyond.pl>
Date: Tue, 15 Jul 2014 22:03:00 +0200
From: =?UTF-8?B?TWFyY2luIEdpYnXFgmE=?= <m.gibula@beyond.pl>
MIME-Version: 1.0
References: <1400253321-9239-1-git-send-email-agraf@suse.de>	<538CDF30.9050902@beyond.pl>	<20140603051630.GA2289@amt.cnet>	<538DADED.4040609@redhat.com>	<20140603163448.GA11829@amt.cnet>
	<53C584D3.8090109@redhat.com>
In-Reply-To: <53C584D3.8090109@redhat.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH uq/master] kvmclock: Ensure proper env->tsc
 value for kvmclock_current_nsec calculation
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paolo Bonzini <pbonzini@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>
Cc: Alexander Graf <agraf@suse.de>, qemu-devel@nongnu.org

>> @@ -65,6 +66,7 @@ static uint64_t kvmclock_current_nsec(KVMClockState *s)
>>
>>      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,8 @@ static void kvmclock_vm_state_change(void *opaque,
>> int running,
>>          if (s->clock_valid) {
>>              return;
>>          }
>> +
>> +        cpu_synchronize_all_states();
>>          ret = kvm_vm_ioctl(kvm_state, KVM_GET_CLOCK, &data);
>>          if (ret < 0) {
>>              fprintf(stderr, "KVM_GET_CLOCK failed: %s\n",
>> strerror(ret));
>>
>>
>
> This causes a hang during migration, so I'll revert the patch from 2.1.

For me this patch series fixed all hangs I had with migration (at least 
with qemu 2.0).

-- 
mg