From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50252) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yi4HR-0007J8-Jm for qemu-devel@nongnu.org; Tue, 14 Apr 2015 13:05:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yi4HQ-0002yt-5s for qemu-devel@nongnu.org; Tue, 14 Apr 2015 13:05:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29500) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yi4HP-0002yn-T9 for qemu-devel@nongnu.org; Tue, 14 Apr 2015 13:05:44 -0400 From: "Dr. David Alan Gilbert (git)" Date: Tue, 14 Apr 2015 18:04:00 +0100 Message-Id: <1429031053-4454-35-git-send-email-dgilbert@redhat.com> In-Reply-To: <1429031053-4454-1-git-send-email-dgilbert@redhat.com> References: <1429031053-4454-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH v6 34/47] Page request: Add MIG_RP_MSG_REQ_PAGES reverse command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aarcange@redhat.com, yamahata@private.email.ne.jp, quintela@redhat.com, amit.shah@redhat.com, pbonzini@redhat.com, david@gibson.dropbear.id.au, yayanghy@cn.fujitsu.com From: "Dr. David Alan Gilbert" Add MIG_RP_MSG_REQ_PAGES command on Return path for the postcopy destination to request a page from the source. Signed-off-by: Dr. David Alan Gilbert --- include/migration/migration.h | 4 +++ migration/migration.c | 70 +++++++++++++++++++++++++++++++++++++++++++ trace-events | 1 + 3 files changed, 75 insertions(+) diff --git a/include/migration/migration.h b/include/migration/migration.h index c02266e..37bd54a 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -46,6 +46,8 @@ enum mig_rp_message_type { MIG_RP_MSG_INVALID = 0, /* Must be 0 */ MIG_RP_MSG_SHUT, /* sibling will not send any more RP messages */ MIG_RP_MSG_PONG, /* Response to a PING; data (seq: be32 ) */ + + MIG_RP_MSG_REQ_PAGES, /* data (start: be64, len: be64) */ }; typedef QLIST_HEAD(, LoadStateEntry) LoadStateEntry_Head; @@ -236,6 +238,8 @@ void migrate_send_rp_shut(MigrationIncomingState *mis, uint32_t value); void migrate_send_rp_pong(MigrationIncomingState *mis, uint32_t value); +void migrate_send_rp_req_pages(MigrationIncomingState *mis, const char* rbname, + ram_addr_t start, ram_addr_t len); void ram_control_before_iterate(QEMUFile *f, uint64_t flags); void ram_control_after_iterate(QEMUFile *f, uint64_t flags); diff --git a/migration/migration.c b/migration/migration.c index cf26d0d..41f377c 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -99,6 +99,36 @@ static void deferred_incoming_migration(Error **errp) deferred_incoming = true; } +/* Request a range of pages from the source VM at the given + * start address. + * rbname: Name of the RAMBlock to request the page in, if NULL it's the same + * as the last request (a name must have been given previously) + * Start: Address offset within the RB + * Len: Length in bytes required - must be a multiple of pagesize + */ +void migrate_send_rp_req_pages(MigrationIncomingState *mis, const char *rbname, + ram_addr_t start, ram_addr_t len) +{ + uint8_t bufc[16+1+255]; /* start (8 byte), len (8 byte), rbname upto 256 */ + uint64_t *buf64 = (uint64_t *)bufc; + size_t msglen = 16; /* start + len */ + + assert(!(len & 1)); + if (rbname) { + int rbname_len = strlen(rbname); + assert(rbname_len < 256); + + len |= 1; /* Flag to say we've got a name */ + bufc[msglen++] = rbname_len; + memcpy(bufc + msglen, rbname, rbname_len); + msglen += rbname_len; + } + + buf64[0] = cpu_to_be64((uint64_t)start); + buf64[1] = cpu_to_be64((uint64_t)len); + migrate_send_rp_message(mis, MIG_RP_MSG_REQ_PAGES, msglen, bufc); +} + void qemu_start_incoming_migration(const char *uri, Error **errp) { const char *p; @@ -804,6 +834,17 @@ static void source_return_path_bad(MigrationState *s) } /* + * Process a request for pages received on the return path, + * We're allowed to send more than requested (e.g. to round to our page size) + * and we don't need to send pages that have already been sent. + */ +static void migrate_handle_rp_req_pages(MigrationState *ms, const char* rbname, + ram_addr_t start, ram_addr_t len) +{ + trace_migrate_handle_rp_req_pages(rbname, start, len); +} + +/* * Handles messages sent on the return path towards the source VM * */ @@ -815,6 +856,8 @@ static void *source_return_path_thread(void *opaque) const int max_len = 512; uint8_t buf[max_len]; uint32_t tmp32; + ram_addr_t start, len; + char *tmpstr; int res; trace_source_return_path_thread_entry(); @@ -830,6 +873,11 @@ static void *source_return_path_thread(void *opaque) expected_len = 4; break; + case MIG_RP_MSG_REQ_PAGES: + /* 16 byte start/len _possibly_ plus an id str */ + expected_len = 16 + 256; + break; + default: error_report("RP: Received invalid message 0x%04x length 0x%04x", header_type, header_len); @@ -875,6 +923,28 @@ static void *source_return_path_thread(void *opaque) trace_source_return_path_thread_pong(tmp32); break; + case MIG_RP_MSG_REQ_PAGES: + start = be64_to_cpup((uint64_t *)buf); + len = be64_to_cpup(((uint64_t *)buf)+1); + tmpstr = NULL; + if (len & 1) { + len -= 1; /* Remove the flag */ + /* Now we expect an idstr */ + tmp32 = buf[16]; /* Length of the following idstr */ + tmpstr = (char *)&buf[17]; + buf[17+tmp32] = '\0'; + expected_len = 16+1+tmp32; + } else { + expected_len = 16; + } + if (header_len != expected_len) { + error_report("RP: Req_Page with length %d expecting %d", + header_len, expected_len); + source_return_path_bad(ms); + } + migrate_handle_rp_req_pages(ms, tmpstr, start, len); + break; + default: break; } diff --git a/trace-events b/trace-events index a83eec2..8379c1f 100644 --- a/trace-events +++ b/trace-events @@ -1406,6 +1406,7 @@ migrate_fd_error(void) "" migrate_fd_cancel(void) "" migrate_pending(uint64_t size, uint64_t max, uint64_t post, uint64_t nonpost) "pending size %" PRIu64 " max %" PRIu64 " (post=%" PRIu64 " nonpost=%" PRIu64 ")" migrate_send_rp_message(int msg_type, uint16_t len) "%d: len %d" +migrate_handle_rp_req_pages(const char *rbname, size_t start, size_t len) "in %s at %zx len %zx" migration_thread_after_loop(void) "" migration_thread_file_err(void) "" migration_thread_setup_complete(void) "" -- 2.1.0