From: Yoshiaki Tamura <tamura.yoshiaki@lab.ntt.co.jp> To: kvm@vger.kernel.org, qemu-devel@nongnu.org Cc: avi@redhat.com, anthony@codemonkey.ws, aliguori@us.ibm.com, mtosatti@redhat.com, dlaor@redhat.com, mst@redhat.com, kwolf@redhat.com, ananth@in.ibm.com, psuriset@linux.vnet.ibm.com, vatsa@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com, ohmura.kei@lab.ntt.co.jp, Yoshiaki Tamura <tamura.yoshiaki@lab.ntt.co.jp> Subject: [PATCH 17/19] migration-tcp: modify tcp_accept_incoming_migration() to handle ft_mode, and add a hack not to close fd when ft_mode is enabled. Date: Fri, 24 Dec 2010 12:18:26 +0900 [thread overview] Message-ID: <1293160708-30881-18-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> (raw) In-Reply-To: <1293160708-30881-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> When ft_mode is set in the header, tcp_accept_incoming_migration() sets ft_trans_incoming() as a callback, and call qemu_file_get_notify() to receive FT transaction iteratively. We also need a hack no to close fd before moving to ft_transaction mode, so that we can reuse the fd for it. Signed-off-by: Yoshiaki Tamura <tamura.yoshiaki@lab.ntt.co.jp> --- migration-tcp.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 44 insertions(+), 1 deletions(-) diff --git a/migration-tcp.c b/migration-tcp.c index 96e2411..d5926fb 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -18,6 +18,8 @@ #include "sysemu.h" #include "buffered_file.h" #include "block.h" +#include "ft_trans_file.h" +#include "event-tap.h" //#define DEBUG_MIGRATION_TCP @@ -56,7 +58,8 @@ static int socket_read(FdMigrationState *s, const void * buf, size_t size) static int tcp_close(FdMigrationState *s) { DPRINTF("tcp_close\n"); - if (s->fd != -1) { + /* FIX ME: accessing ft_mode here isn't clean */ + if (s->fd != -1 && ft_mode != FT_INIT) { close(s->fd); s->fd = -1; } @@ -150,6 +153,16 @@ MigrationState *tcp_start_outgoing_migration(Monitor *mon, return &s->mig_state; } +static void ft_trans_incoming(void *opaque) { + QEMUFile *f = opaque; + + qemu_file_get_notify(f); + if (qemu_file_has_error(f)) { + ft_mode = FT_ERROR; + qemu_fclose(f); + } +} + static void tcp_accept_incoming_migration(void *opaque) { struct sockaddr_in addr; @@ -175,8 +188,38 @@ static void tcp_accept_incoming_migration(void *opaque) goto out; } + if (ft_mode == FT_INIT) { + autostart = 0; + } + process_incoming_migration(f); + + if (ft_mode == FT_INIT) { + int ret; + + socket_set_nodelay(c); + + f = qemu_fopen_ft_trans(s, c); + if (f == NULL) { + fprintf(stderr, "could not qemu_fopen_ft_trans\n"); + goto out; + } + + /* need to wait sender to setup */ + ret = qemu_ft_trans_begin(f); + if (ret < 0) { + goto out; + } + + qemu_set_fd_handler2(c, NULL, ft_trans_incoming, NULL, f); + event_tap_schedule_replay(); + ft_mode = FT_TRANSACTION_RECV; + + return; + } + qemu_fclose(f); + out: close(c); out2: -- 1.7.1.2
WARNING: multiple messages have this Message-ID (diff)
From: Yoshiaki Tamura <tamura.yoshiaki@lab.ntt.co.jp> To: kvm@vger.kernel.org, qemu-devel@nongnu.org Cc: kwolf@redhat.com, aliguori@us.ibm.com, mtosatti@redhat.com, ananth@in.ibm.com, mst@redhat.com, dlaor@redhat.com, vatsa@linux.vnet.ibm.com, Yoshiaki Tamura <tamura.yoshiaki@lab.ntt.co.jp>, ohmura.kei@lab.ntt.co.jp, avi@redhat.com, psuriset@linux.vnet.ibm.com, stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 17/19] migration-tcp: modify tcp_accept_incoming_migration() to handle ft_mode, and add a hack not to close fd when ft_mode is enabled. Date: Fri, 24 Dec 2010 12:18:26 +0900 [thread overview] Message-ID: <1293160708-30881-18-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> (raw) In-Reply-To: <1293160708-30881-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> When ft_mode is set in the header, tcp_accept_incoming_migration() sets ft_trans_incoming() as a callback, and call qemu_file_get_notify() to receive FT transaction iteratively. We also need a hack no to close fd before moving to ft_transaction mode, so that we can reuse the fd for it. Signed-off-by: Yoshiaki Tamura <tamura.yoshiaki@lab.ntt.co.jp> --- migration-tcp.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 44 insertions(+), 1 deletions(-) diff --git a/migration-tcp.c b/migration-tcp.c index 96e2411..d5926fb 100644 --- a/migration-tcp.c +++ b/migration-tcp.c @@ -18,6 +18,8 @@ #include "sysemu.h" #include "buffered_file.h" #include "block.h" +#include "ft_trans_file.h" +#include "event-tap.h" //#define DEBUG_MIGRATION_TCP @@ -56,7 +58,8 @@ static int socket_read(FdMigrationState *s, const void * buf, size_t size) static int tcp_close(FdMigrationState *s) { DPRINTF("tcp_close\n"); - if (s->fd != -1) { + /* FIX ME: accessing ft_mode here isn't clean */ + if (s->fd != -1 && ft_mode != FT_INIT) { close(s->fd); s->fd = -1; } @@ -150,6 +153,16 @@ MigrationState *tcp_start_outgoing_migration(Monitor *mon, return &s->mig_state; } +static void ft_trans_incoming(void *opaque) { + QEMUFile *f = opaque; + + qemu_file_get_notify(f); + if (qemu_file_has_error(f)) { + ft_mode = FT_ERROR; + qemu_fclose(f); + } +} + static void tcp_accept_incoming_migration(void *opaque) { struct sockaddr_in addr; @@ -175,8 +188,38 @@ static void tcp_accept_incoming_migration(void *opaque) goto out; } + if (ft_mode == FT_INIT) { + autostart = 0; + } + process_incoming_migration(f); + + if (ft_mode == FT_INIT) { + int ret; + + socket_set_nodelay(c); + + f = qemu_fopen_ft_trans(s, c); + if (f == NULL) { + fprintf(stderr, "could not qemu_fopen_ft_trans\n"); + goto out; + } + + /* need to wait sender to setup */ + ret = qemu_ft_trans_begin(f); + if (ret < 0) { + goto out; + } + + qemu_set_fd_handler2(c, NULL, ft_trans_incoming, NULL, f); + event_tap_schedule_replay(); + ft_mode = FT_TRANSACTION_RECV; + + return; + } + qemu_fclose(f); + out: close(c); out2: -- 1.7.1.2
next prev parent reply other threads:[~2010-12-24 3:19 UTC|newest] Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-12-24 3:18 [PATCH 00/19] Kemari for KVM v0.2.1 Yoshiaki Tamura 2010-12-24 3:18 ` [Qemu-devel] " Yoshiaki Tamura 2010-12-24 3:18 ` [PATCH 01/19] Make QEMUFile buf expandable, and introduce qemu_realloc_buffer() and qemu_clear_buffer() Yoshiaki Tamura 2010-12-24 3:18 ` [Qemu-devel] " Yoshiaki Tamura 2010-12-24 3:18 ` [PATCH 02/19] Introduce read() to FdMigrationState Yoshiaki Tamura 2010-12-24 3:18 ` [Qemu-devel] " Yoshiaki Tamura 2010-12-24 3:18 ` [PATCH 03/19] Introduce skip_header parameter to qemu_loadvm_state() Yoshiaki Tamura 2010-12-24 3:18 ` [Qemu-devel] " Yoshiaki Tamura 2010-12-24 3:18 ` [PATCH 04/19] qemu-char: export socket_set_nodelay() Yoshiaki Tamura 2010-12-24 3:18 ` [Qemu-devel] " Yoshiaki Tamura 2010-12-24 3:18 ` [PATCH 05/19] vl.c: add deleted flag for deleting the handler Yoshiaki Tamura 2010-12-24 3:18 ` [Qemu-devel] " Yoshiaki Tamura 2010-12-24 3:18 ` [PATCH 06/19] virtio: update last_avail_idx when inuse is decreased Yoshiaki Tamura 2010-12-24 3:18 ` [Qemu-devel] " Yoshiaki Tamura 2010-12-24 9:44 ` Michael S. Tsirkin 2010-12-24 9:44 ` [Qemu-devel] " Michael S. Tsirkin 2010-12-24 11:22 ` Yoshiaki Tamura 2010-12-24 11:22 ` [Qemu-devel] " Yoshiaki Tamura 2010-12-24 12:40 ` Michael S. Tsirkin 2010-12-24 12:40 ` [Qemu-devel] " Michael S. Tsirkin 2010-12-24 13:14 ` Yoshiaki Tamura 2010-12-24 13:14 ` [Qemu-devel] " Yoshiaki Tamura 2010-12-24 13:23 ` Michael S. Tsirkin 2010-12-24 13:23 ` [Qemu-devel] " Michael S. Tsirkin 2010-12-24 13:31 ` Yoshiaki Tamura 2010-12-24 13:31 ` Yoshiaki Tamura 2010-12-24 3:18 ` [PATCH 07/19] Introduce fault tolerant VM transaction QEMUFile and ft_mode Yoshiaki Tamura 2010-12-24 3:18 ` [Qemu-devel] " Yoshiaki Tamura 2010-12-24 3:18 ` [PATCH 08/19] savevm: introduce util functions to control ft_trans_file from savevm layer Yoshiaki Tamura 2010-12-24 3:18 ` [Qemu-devel] " Yoshiaki Tamura 2010-12-24 3:18 ` [PATCH 09/19] Introduce event-tap Yoshiaki Tamura 2010-12-24 3:18 ` [Qemu-devel] " Yoshiaki Tamura 2010-12-24 3:18 ` [PATCH 10/19] Call init handler of event-tap at main() in vl.c Yoshiaki Tamura 2010-12-24 3:18 ` [Qemu-devel] " Yoshiaki Tamura 2010-12-24 3:18 ` [PATCH 11/19] ioport: insert event_tap_ioport() to ioport_write() Yoshiaki Tamura 2010-12-24 3:18 ` [Qemu-devel] " Yoshiaki Tamura 2010-12-24 3:18 ` [PATCH 12/19] Insert event_tap_mmio() to cpu_physical_memory_rw() in exec.c Yoshiaki Tamura 2010-12-24 3:18 ` [Qemu-devel] " Yoshiaki Tamura 2010-12-24 3:18 ` [PATCH 13/19] net: insert event-tap to qemu_send_packet() and qemu_sendv_packet_async() Yoshiaki Tamura 2010-12-24 3:18 ` [Qemu-devel] " Yoshiaki Tamura 2010-12-24 3:18 ` [PATCH 14/19] block: insert event-tap to bdrv_aio_writev() and bdrv_aio_flush() Yoshiaki Tamura 2010-12-24 3:18 ` [Qemu-devel] " Yoshiaki Tamura 2010-12-24 3:18 ` [PATCH 15/19] savevm: introduce qemu_savevm_trans_{begin,commit} Yoshiaki Tamura 2010-12-24 3:18 ` [Qemu-devel] [PATCH 15/19] savevm: introduce qemu_savevm_trans_{begin, commit} Yoshiaki Tamura 2010-12-24 3:18 ` [PATCH 16/19] migration: introduce migrate_ft_trans_{put,get}_ready(), and modify migrate_fd_put_ready() when ft_mode is on Yoshiaki Tamura 2010-12-24 3:18 ` [Qemu-devel] [PATCH 16/19] migration: introduce migrate_ft_trans_{put, get}_ready(), " Yoshiaki Tamura 2010-12-24 3:18 ` Yoshiaki Tamura [this message] 2010-12-24 3:18 ` [Qemu-devel] [PATCH 17/19] migration-tcp: modify tcp_accept_incoming_migration() to handle ft_mode, and add a hack not to close fd when ft_mode is enabled Yoshiaki Tamura 2010-12-24 3:18 ` [PATCH 18/19] Introduce -k option to enable FT migration mode (Kemari) Yoshiaki Tamura 2010-12-24 3:18 ` [Qemu-devel] " Yoshiaki Tamura 2010-12-24 3:18 ` [PATCH 19/19] migration: add a parser to accept FT migration incoming mode Yoshiaki Tamura 2010-12-24 3:18 ` [Qemu-devel] " Yoshiaki Tamura 2010-12-27 8:25 [PATCH 00/19] Kemari for KVM v0.2.2 Yoshiaki Tamura 2010-12-27 8:25 ` [PATCH 17/19] migration-tcp: modify tcp_accept_incoming_migration() to handle ft_mode, and add a hack not to close fd when ft_mode is enabled Yoshiaki Tamura 2011-01-11 10:59 [PATCH 00/19] Kemari for KVM v0.2.3 Yoshiaki Tamura 2011-01-11 10:59 ` [PATCH 17/19] migration-tcp: modify tcp_accept_incoming_migration() to handle ft_mode, and add a hack not to close fd when ft_mode is enabled Yoshiaki Tamura 2011-01-13 17:15 [PATCH 00/19] Kemari for KVM v0.2.4 Yoshiaki Tamura 2011-01-13 17:15 ` [PATCH 17/19] migration-tcp: modify tcp_accept_incoming_migration() to handle ft_mode, and add a hack not to close fd when ft_mode is enabled Yoshiaki Tamura 2011-01-14 17:33 [PATCH 00/19] Kemari for KVM v0.2.5 Yoshiaki Tamura 2011-01-14 17:33 ` [PATCH 17/19] migration-tcp: modify tcp_accept_incoming_migration() to handle ft_mode, and add a hack not to close fd when ft_mode is enabled Yoshiaki Tamura 2011-01-19 5:44 [PATCH 00/19] Kemari for KVM v0.2.6 Yoshiaki Tamura 2011-01-19 5:45 ` [PATCH 17/19] migration-tcp: modify tcp_accept_incoming_migration() to handle ft_mode, and add a hack not to close fd when ft_mode is enabled Yoshiaki Tamura 2011-01-26 9:41 [PATCH 00/19] Kemari for KVM v0.2.7 Yoshiaki Tamura 2011-01-26 9:42 ` [PATCH 17/19] migration-tcp: modify tcp_accept_incoming_migration() to handle ft_mode, and add a hack not to close fd when ft_mode is enabled Yoshiaki Tamura 2011-01-28 7:21 [PATCH 00/19] Kemari for KVM v0.2.8 Yoshiaki Tamura 2011-01-28 7:21 ` [PATCH 17/19] migration-tcp: modify tcp_accept_incoming_migration() to handle ft_mode, and add a hack not to close fd when ft_mode is enabled Yoshiaki Tamura 2011-02-08 11:01 [PATCH 00/19] Kemari for KVM v0.2.9 Yoshiaki Tamura 2011-02-08 11:01 ` [PATCH 17/19] migration-tcp: modify tcp_accept_incoming_migration() to handle ft_mode, and add a hack not to close fd when ft_mode is enabled Yoshiaki Tamura
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1293160708-30881-18-git-send-email-tamura.yoshiaki@lab.ntt.co.jp \ --to=tamura.yoshiaki@lab.ntt.co.jp \ --cc=aliguori@us.ibm.com \ --cc=ananth@in.ibm.com \ --cc=anthony@codemonkey.ws \ --cc=avi@redhat.com \ --cc=dlaor@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=kwolf@redhat.com \ --cc=mst@redhat.com \ --cc=mtosatti@redhat.com \ --cc=ohmura.kei@lab.ntt.co.jp \ --cc=psuriset@linux.vnet.ibm.com \ --cc=qemu-devel@nongnu.org \ --cc=stefanha@linux.vnet.ibm.com \ --cc=vatsa@linux.vnet.ibm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.