From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44206) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tm1q6-000717-0T for qemu-devel@nongnu.org; Fri, 21 Dec 2012 07:36:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tm1q0-0000dk-H8 for qemu-devel@nongnu.org; Fri, 21 Dec 2012 07:36:33 -0500 Received: from mail-ia0-f181.google.com ([209.85.210.181]:47531) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tm1q0-0000dZ-Bp for qemu-devel@nongnu.org; Fri, 21 Dec 2012 07:36:28 -0500 Received: by mail-ia0-f181.google.com with SMTP id s32so3792446iak.40 for ; Fri, 21 Dec 2012 04:36:26 -0800 (PST) Sender: Paolo Bonzini Message-ID: <50D457C3.9040605@redhat.com> Date: Fri, 21 Dec 2012 13:36:19 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1356044532-8511-1-git-send-email-quintela@redhat.com> <87ehikmeqj.fsf@codemonkey.ws> <87d2y4qj2t.fsf@elfo.mitica> In-Reply-To: <87d2y4qj2t.fsf@elfo.mitica> Content-Type: multipart/mixed; boundary="------------020702050900000605030604" Subject: Re: [Qemu-devel] [PULL 00/34] migration thread and queue List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: quintela@redhat.com Cc: qemu-devel@nongnu.org, Anthony Liguori This is a multi-part message in MIME format. --------------020702050900000605030604 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Il 21/12/2012 02:39, Juan Quintela ha scritto: >> I can't bisect tonight but can attempt to tomorrow. How has this been >> tested? > > I have tested with tcp, load/not-load with guests form 4GB to 16GB RAM. > Will test tomorrow with your test case. I didn't tested exec:, though. > >> >> I'm a little concerned here about the timing. With the Christmas >> and New Years holiday we're pretty darn close to soft freeze for 1.4. (To expand on my previous message, might as well declare soft freeze today if that is the case). >> Has this series gone through a full autotest run with multiple guests? > > Will re-test tomorrow with autotest. You haven't integrated the fixes I sent you yesterday (attached and placed at migration-thread-20121220-lite). I'm running autotest now. Paolo --------------020702050900000605030604 Content-Type: text/x-patch; name="migr.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="migr.patch" diff --git a/Makefile.objs b/Makefile.objs index 4ef0a71..971b2f5 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -78,7 +78,6 @@ extra-obj-$(CONFIG_LINUX) += fsdev/ common-obj-y += tcg-runtime.o host-utils.o main-loop.o common-obj-y += migration.o migration-tcp.o -common-obj-y += migration.o migration-tcp.o common-obj-y += qemu-char.o #aio.o common-obj-y += block-migration.o iohandler.o common-obj-y += bitmap.o bitops.o diff --git a/arch_init.c b/arch_init.c index 86f8544..dada6de 100644 --- a/arch_init.c +++ b/arch_init.c @@ -642,12 +642,13 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) i++; } + qemu_mutex_unlock_ramlist(); + if (ret < 0) { bytes_transferred += total_sent; return ret; } - qemu_mutex_unlock_ramlist(); qemu_put_be64(f, RAM_SAVE_FLAG_EOS); total_sent += 8; bytes_transferred += total_sent; @@ -657,9 +658,8 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) static int ram_save_complete(QEMUFile *f, void *opaque) { - migration_bitmap_sync(); - qemu_mutex_lock_ramlist(); + migration_bitmap_sync(); /* try transferring iterative blocks of memory */ diff --git a/migration.c b/migration.c index c69e864..ecda263 100644 --- a/migration.c +++ b/migration.c @@ -20,8 +20,8 @@ #include "sysemu/sysemu.h" #include "block/block.h" #include "qemu/sockets.h" -#include "migration/block.h" #include "qemu/thread.h" +#include "migration/block.h" #include "qmp-commands.h" //#define DEBUG_MIGRATION @@ -650,8 +650,8 @@ static int64_t buffered_set_rate_limit(void *opaque, int64_t new_rate) new_rate = SIZE_MAX; } - s->xfer_limit = new_rate / 10; - + s->xfer_limit = new_rate / XFER_LIMIT_RATIO; + out: return s->xfer_limit; } --------------020702050900000605030604--