From patchwork Mon Apr 25 11:00:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: OHMURA Kei X-Patchwork-Id: 92739 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E486FB6F0C for ; Mon, 25 Apr 2011 21:09:57 +1000 (EST) Received: from localhost ([::1]:42709 helo=lists2.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QEJfs-0001GB-VJ for incoming@patchwork.ozlabs.org; Mon, 25 Apr 2011 07:09:52 -0400 Received: from eggs.gnu.org ([140.186.70.92]:43717) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QEJad-0000Kh-L7 for qemu-devel@nongnu.org; Mon, 25 Apr 2011 07:04:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QEJaY-0004s0-Nk for qemu-devel@nongnu.org; Mon, 25 Apr 2011 07:04:27 -0400 Received: from sh.osrg.net ([192.16.179.4]:50532) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QEJaY-0004q4-5Q for qemu-devel@nongnu.org; Mon, 25 Apr 2011 07:04:22 -0400 Received: from fs.osrg.net (postfix@fs.osrg.net [10.0.0.12]) by sh.osrg.net (8.14.3/8.14.3/OSRG-NET) with ESMTP id p3PB45Cr017210; Mon, 25 Apr 2011 20:04:05 +0900 Received: from localhost (klift-nh0.osrg.net [10.84.0.5]) by fs.osrg.net (Postfix) with ESMTP id 3A9CF3E030F; Mon, 25 Apr 2011 20:04:01 +0900 (JST) From: OHMURA Kei To: qemu-devel@nongnu.org, kvm@vger.kernel.org Date: Mon, 25 Apr 2011 20:00:55 +0900 Message-Id: <1303729257-9034-17-git-send-email-ohmura.kei@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.0.2 In-Reply-To: <1303729257-9034-1-git-send-email-ohmura.kei@lab.ntt.co.jp> References: <1303729257-9034-1-git-send-email-ohmura.kei@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 337 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Mon, 25 Apr 2011 20:04:07 +0900 (JST) X-Virus-Scanned: clamav-milter 0.97 at sh X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 192.16.179.4 Cc: kwolf@redhat.com, aliguori@us.ibm.com, mtosatti@redhat.com, ohmura.kei@lab.ntt.co.jp, ananth@in.ibm.com, mst@redhat.com, dlaor@redhat.com, vatsa@linux.vnet.ibm.com, Yoshiaki Tamura , blauwirbel@gmail.com, quintela@redhat.com, tamura.yoshiaki@gmail.com, avi@redhat.com, pbonzini@redhat.com, psuriset@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 16/18] migration: introduce migrate_ft_trans_{put, get}_ready(), and modify migrate_fd_put_ready() when ft_mode is on. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Yoshiaki Tamura Introduce migrate_ft_trans_put_ready() which kicks the FT transaction cycle. When ft_mode is on, migrate_fd_put_ready() would open ft_trans_file and turn on event_tap. To end or cancel FT transaction, ft_mode and event_tap is turned off. migrate_ft_trans_get_ready() is called to receive ack from the receiver. Signed-off-by: Yoshiaki Tamura Signed-off-by: OHMURA Kei --- migration.c | 266 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 265 insertions(+), 1 deletions(-) diff --git a/migration.c b/migration.c index 1c2d956..d536df0 100644 --- a/migration.c +++ b/migration.c @@ -21,6 +21,7 @@ #include "qemu_socket.h" #include "block-migration.h" #include "qemu-objects.h" +#include "event-tap.h" //#define DEBUG_MIGRATION @@ -283,6 +284,17 @@ void migrate_fd_error(FdMigrationState *s) migrate_fd_cleanup(s); } +static void migrate_ft_trans_error(FdMigrationState *s) +{ + ft_mode = FT_ERROR; + qemu_savevm_state_cancel(s->mon, s->file); + migrate_fd_error(s); + /* we need to set vm running to avoid assert in virtio-net */ + vm_start(); + event_tap_unregister(); + vm_stop(0); +} + int migrate_fd_cleanup(FdMigrationState *s) { int ret = 0; @@ -318,6 +330,17 @@ void migrate_fd_put_notify(void *opaque) qemu_file_put_notify(s->file); } +static void migrate_fd_get_notify(void *opaque) +{ + FdMigrationState *s = opaque; + + qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL); + qemu_file_get_notify(s->file); + if (qemu_file_has_error(s->file)) { + migrate_ft_trans_error(s); + } +} + ssize_t migrate_fd_put_buffer(void *opaque, const void *data, size_t size) { FdMigrationState *s = opaque; @@ -353,6 +376,10 @@ int migrate_fd_get_buffer(void *opaque, uint8_t *data, int64_t pos, size_t size) ret = -(s->get_error(s)); } + if (ret == -EAGAIN) { + qemu_set_fd_handler2(s->fd, NULL, migrate_fd_get_notify, NULL, s); + } + return ret; } @@ -379,6 +406,230 @@ void migrate_fd_connect(FdMigrationState *s) migrate_fd_put_ready(s); } +static int migrate_ft_trans_commit(void *opaque) +{ + FdMigrationState *s = opaque; + int ret = -1; + + if (ft_mode != FT_TRANSACTION_COMMIT && ft_mode != FT_TRANSACTION_ATOMIC) { + fprintf(stderr, + "migrate_ft_trans_commit: invalid ft_mode %d\n", ft_mode); + goto out; + } + + do { + if (ft_mode == FT_TRANSACTION_ATOMIC) { + if (qemu_ft_trans_begin(s->file) < 0) { + fprintf(stderr, "qemu_ft_trans_begin failed\n"); + goto out; + } + + ret = qemu_savevm_trans_begin(s->mon, s->file, 0); + if (ret < 0) { + fprintf(stderr, "qemu_savevm_trans_begin failed\n"); + goto out; + } + + ft_mode = FT_TRANSACTION_COMMIT; + if (ret) { + /* don't proceed until if fd isn't ready */ + goto out; + } + } + + /* make the VM state consistent by flushing outstanding events */ + vm_stop(0); + + /* send at full speed */ + qemu_file_set_rate_limit(s->file, 0); + + ret = qemu_savevm_trans_complete(s->mon, s->file); + if (ret < 0) { + fprintf(stderr, "qemu_savevm_trans_complete failed\n"); + goto out; + } + + ret = qemu_ft_trans_commit(s->file); + if (ret < 0) { + fprintf(stderr, "qemu_ft_trans_commit failed\n"); + goto out; + } + + if (ret) { + ft_mode = FT_TRANSACTION_RECV; + ret = 1; + goto out; + } + + /* flush and check if events are remaining */ + vm_start(); + ret = event_tap_flush_one(); + if (ret < 0) { + fprintf(stderr, "event_tap_flush_one failed\n"); + goto out; + } + + ft_mode = ret ? FT_TRANSACTION_BEGIN : FT_TRANSACTION_ATOMIC; + } while (ft_mode != FT_TRANSACTION_BEGIN); + + vm_start(); + ret = 0; + +out: + return ret; +} + +static int migrate_ft_trans_get_ready(void *opaque) +{ + FdMigrationState *s = opaque; + int ret = -1; + + if (ft_mode != FT_TRANSACTION_RECV) { + fprintf(stderr, + "migrate_ft_trans_get_ready: invalid ft_mode %d\n", ft_mode); + goto error_out; + } + + /* flush and check if events are remaining */ + vm_start(); + ret = event_tap_flush_one(); + if (ret < 0) { + fprintf(stderr, "event_tap_flush_one failed\n"); + goto error_out; + } + + if (ret) { + ft_mode = FT_TRANSACTION_BEGIN; + } else { + ft_mode = FT_TRANSACTION_ATOMIC; + + ret = migrate_ft_trans_commit(s); + if (ret < 0) { + goto error_out; + } + if (ret) { + goto out; + } + } + + vm_start(); + ret = 0; + goto out; + +error_out: + migrate_ft_trans_error(s); + +out: + return ret; +} + +static int migrate_ft_trans_put_ready(void) +{ + FdMigrationState *s = migrate_to_fms(current_migration); + int ret = -1, init = 0, timeout; + static int64_t start, now; + + switch (ft_mode) { + case FT_INIT: + init = 1; + ft_mode = FT_TRANSACTION_BEGIN; + case FT_TRANSACTION_BEGIN: + now = start = qemu_get_clock_ns(vm_clock); + /* start transatcion at best effort */ + qemu_file_set_rate_limit(s->file, 1); + + if (qemu_ft_trans_begin(s->file) < 0) { + fprintf(stderr, "qemu_transaction_begin failed\n"); + goto error_out; + } + + vm_stop(0); + + ret = qemu_savevm_trans_begin(s->mon, s->file, init); + if (ret < 0) { + fprintf(stderr, "qemu_savevm_trans_begin\n"); + goto error_out; + } + + if (ret) { + ft_mode = FT_TRANSACTION_ITER; + vm_start(); + } else { + ft_mode = FT_TRANSACTION_COMMIT; + if (migrate_ft_trans_commit(s) < 0) { + goto error_out; + } + } + break; + + case FT_TRANSACTION_ITER: + now = qemu_get_clock_ns(vm_clock); + timeout = ((now - start) >= max_downtime); + if (timeout || qemu_savevm_state_iterate(s->mon, s->file) == 1) { + DPRINTF("ft trans iter timeout %d\n", timeout); + + ft_mode = FT_TRANSACTION_COMMIT; + if (migrate_ft_trans_commit(s) < 0) { + goto error_out; + } + return 1; + } + + ft_mode = FT_TRANSACTION_ITER; + break; + + case FT_TRANSACTION_ATOMIC: + case FT_TRANSACTION_COMMIT: + if (migrate_ft_trans_commit(s) < 0) { + goto error_out; + } + break; + + default: + fprintf(stderr, + "migrate_ft_trans_put_ready: invalid ft_mode %d", ft_mode); + goto error_out; + } + + ret = 0; + goto out; + +error_out: + migrate_ft_trans_error(s); + +out: + return ret; +} + +static void migrate_ft_trans_connect(FdMigrationState *s, int old_vm_running) +{ + /* close buffered_file and open ft_trans_file + * NB: fd won't get closed, and reused by ft_trans_file + */ + qemu_fclose(s->file); + + s->file = qemu_fopen_ops_ft_trans(s, + migrate_fd_put_buffer, + migrate_fd_get_buffer, + migrate_ft_trans_put_ready, + migrate_ft_trans_get_ready, + migrate_fd_wait_for_unfreeze, + migrate_fd_close, + 1); + socket_set_nodelay(s->fd); + + /* events are tapped from now */ + if (event_tap_register(migrate_ft_trans_put_ready) < 0) { + migrate_ft_trans_error(s); + } + + event_tap_schedule_suspend(); + + if (old_vm_running) { + vm_start(); + } +} + void migrate_fd_put_ready(void *opaque) { FdMigrationState *s = opaque; @@ -404,6 +655,11 @@ void migrate_fd_put_ready(void *opaque) } else { state = MIG_STATE_COMPLETED; } + + if (ft_mode && state == MIG_STATE_COMPLETED) { + return migrate_ft_trans_connect(s, old_vm_running); + } + if (migrate_fd_cleanup(s) < 0) { if (old_vm_running) { vm_start(); @@ -432,8 +688,16 @@ void migrate_fd_cancel(MigrationState *mig_state) s->state = MIG_STATE_CANCELLED; notifier_list_notify(&migration_state_notifiers); - qemu_savevm_state_cancel(s->mon, s->file); + if (ft_mode) { + if (s->file) { + qemu_ft_trans_cancel(s->file); + } + ft_mode = FT_OFF; + event_tap_unregister(); + } + + qemu_savevm_state_cancel(s->mon, s->file); migrate_fd_cleanup(s); }