From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
To: qemu-devel@nongnu.org
Cc: aarcange@redhat.com, yamahata@private.email.ne.jp,
quintela@redhat.com, liang.z.li@intel.com, luis@cs.umu.se,
amit.shah@redhat.com, pbonzini@redhat.com,
david@gibson.dropbear.id.au
Subject: [Qemu-devel] [PATCH v7 30/42] Page request: Add MIG_RP_MSG_REQ_PAGES reverse command
Date: Tue, 16 Jun 2015 11:26:43 +0100 [thread overview]
Message-ID: <1434450415-11339-31-git-send-email-dgilbert@redhat.com> (raw)
In-Reply-To: <1434450415-11339-1-git-send-email-dgilbert@redhat.com>
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
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 <dgilbert@redhat.com>
---
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 68a1731..8742d53 100644
--- a/include/migration/migration.h
+++ b/include/migration/migration.h
@@ -47,6 +47,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;
@@ -246,6 +248,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 3e5a7c8..0373b77 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -113,6 +113,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;
@@ -939,6 +969,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
*
*/
@@ -950,6 +991,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();
@@ -965,6 +1008,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);
@@ -1010,6 +1058,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 528d5a3..328d64c 100644
--- a/trace-events
+++ b/trace-events
@@ -1422,6 +1422,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.4.3
next prev parent reply other threads:[~2015-06-16 10:28 UTC|newest]
Thread overview: 209+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-16 10:26 [Qemu-devel] [PATCH v7 00/42] Postcopy implementation Dr. David Alan Gilbert (git)
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 01/42] Start documenting how postcopy works Dr. David Alan Gilbert (git)
2015-06-17 11:42 ` Juan Quintela
2015-06-17 12:30 ` Dr. David Alan Gilbert
2015-06-18 7:50 ` Li, Liang Z
2015-06-18 8:10 ` Dr. David Alan Gilbert
2015-06-18 8:28 ` Paolo Bonzini
2015-06-19 17:52 ` Dr. David Alan Gilbert
2015-06-26 6:46 ` Yang Hongyang
2015-06-26 7:53 ` zhanghailiang
2015-06-26 8:00 ` Yang Hongyang
2015-06-26 8:10 ` Dr. David Alan Gilbert
2015-06-26 8:19 ` Yang Hongyang
2015-08-04 5:20 ` Amit Shah
2015-08-05 12:21 ` Dr. David Alan Gilbert
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 02/42] Provide runtime Target page information Dr. David Alan Gilbert (git)
2015-06-17 11:43 ` Juan Quintela
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 03/42] Init page sizes in qtest Dr. David Alan Gilbert (git)
2015-06-17 11:49 ` Juan Quintela
2015-07-06 6:14 ` Amit Shah
2015-08-04 5:23 ` Amit Shah
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 04/42] qemu_ram_block_from_host Dr. David Alan Gilbert (git)
2015-06-17 11:54 ` Juan Quintela
2015-07-10 8:36 ` Amit Shah
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 05/42] Add qemu_get_buffer_less_copy to avoid copies some of the time Dr. David Alan Gilbert (git)
2015-06-17 11:57 ` Juan Quintela
2015-06-17 12:33 ` Dr. David Alan Gilbert
2015-07-13 9:08 ` Amit Shah
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 06/42] Add wrapper for setting blocking status on a QEMUFile Dr. David Alan Gilbert (git)
2015-06-17 11:59 ` Juan Quintela
2015-06-17 12:34 ` Dr. David Alan Gilbert
2015-06-17 12:57 ` Juan Quintela
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 07/42] ram_debug_dump_bitmap: Dump a migration bitmap as text Dr. David Alan Gilbert (git)
2015-06-17 12:17 ` Juan Quintela
2015-06-19 17:04 ` Dr. David Alan Gilbert
2015-07-13 10:15 ` Juan Quintela
2015-07-13 9:12 ` Amit Shah
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 08/42] migrate_init: Call from savevm Dr. David Alan Gilbert (git)
2015-06-17 12:18 ` Juan Quintela
2015-07-13 9:13 ` Amit Shah
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 09/42] Rename save_live_complete to save_live_complete_precopy Dr. David Alan Gilbert (git)
2015-06-17 12:20 ` Juan Quintela
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 10/42] Return path: Open a return path on QEMUFile for sockets Dr. David Alan Gilbert (git)
2015-06-17 12:23 ` Juan Quintela
2015-06-17 17:07 ` Dr. David Alan Gilbert
2015-07-13 10:12 ` Amit Shah
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 11/42] Return path: socket_writev_buffer: Block even on non-blocking fd's Dr. David Alan Gilbert (git)
2015-06-17 12:28 ` Juan Quintela
2015-06-19 17:18 ` Dr. David Alan Gilbert
2015-07-13 12:37 ` Amit Shah
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 12/42] Migration commands Dr. David Alan Gilbert (git)
2015-06-17 12:31 ` Juan Quintela
2015-06-19 17:38 ` Dr. David Alan Gilbert
2015-07-13 12:45 ` Amit Shah
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 13/42] Return path: Control commands Dr. David Alan Gilbert (git)
2015-06-17 12:49 ` Juan Quintela
2015-06-23 18:57 ` Dr. David Alan Gilbert
2015-07-13 12:55 ` Amit Shah
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 14/42] Return path: Send responses from destination to source Dr. David Alan Gilbert (git)
2015-06-17 16:30 ` Juan Quintela
2015-06-19 18:42 ` Dr. David Alan Gilbert
2015-07-01 9:29 ` Juan Quintela
2015-08-06 12:18 ` Dr. David Alan Gilbert
2015-07-15 7:31 ` Amit Shah
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 15/42] Return path: Source handling of return path Dr. David Alan Gilbert (git)
2015-07-13 10:29 ` Juan Quintela
2015-08-18 10:23 ` Dr. David Alan Gilbert
2015-07-15 7:50 ` Amit Shah
2015-07-16 11:32 ` Dr. David Alan Gilbert
2015-08-05 8:06 ` zhanghailiang
2015-08-18 10:45 ` Dr. David Alan Gilbert
2015-08-18 11:29 ` zhanghailiang
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 16/42] Rework loadvm path for subloops Dr. David Alan Gilbert (git)
2015-07-13 10:33 ` Juan Quintela
2015-07-15 9:34 ` Amit Shah
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 17/42] Add migration-capability boolean for postcopy-ram Dr. David Alan Gilbert (git)
2015-06-16 15:43 ` Eric Blake
2015-06-16 15:58 ` Dr. David Alan Gilbert
2015-07-15 9:39 ` Amit Shah
2015-07-13 10:35 ` Juan Quintela
2015-07-15 9:40 ` Amit Shah
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 18/42] Add wrappers and handlers for sending/receiving the postcopy-ram migration messages Dr. David Alan Gilbert (git)
2015-07-13 11:02 ` Juan Quintela
2015-07-20 10:13 ` Amit Shah
2015-08-26 14:48 ` Dr. David Alan Gilbert
2015-07-20 10:06 ` Amit Shah
2015-07-27 9:55 ` Dr. David Alan Gilbert
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 19/42] MIG_CMD_PACKAGED: Send a packaged chunk of migration stream Dr. David Alan Gilbert (git)
2015-07-13 11:07 ` Juan Quintela
2015-07-21 6:11 ` Amit Shah
2015-07-27 17:28 ` Dr. David Alan Gilbert
2015-08-04 5:27 ` Amit Shah
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 20/42] Modify save_live_pending for postcopy Dr. David Alan Gilbert (git)
2015-07-13 11:12 ` Juan Quintela
2015-07-31 16:13 ` Dr. David Alan Gilbert
2015-07-21 6:17 ` Amit Shah
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 21/42] postcopy: OS support test Dr. David Alan Gilbert (git)
2015-07-13 11:20 ` Juan Quintela
2015-07-13 16:31 ` Dr. David Alan Gilbert
2015-07-21 7:29 ` Amit Shah
2015-07-27 17:38 ` Dr. David Alan Gilbert
2015-08-04 5:28 ` Amit Shah
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 22/42] migrate_start_postcopy: Command to trigger transition to postcopy Dr. David Alan Gilbert (git)
2015-07-13 11:23 ` Juan Quintela
2015-07-13 17:13 ` Dr. David Alan Gilbert
2015-07-13 18:07 ` Juan Quintela
2015-07-21 7:40 ` Amit Shah
2015-09-24 9:59 ` Dr. David Alan Gilbert
2015-09-24 14:20 ` Dr. David Alan Gilbert
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 23/42] MIGRATION_STATUS_POSTCOPY_ACTIVE: Add new migration state Dr. David Alan Gilbert (git)
2015-07-13 11:27 ` Juan Quintela
2015-07-13 15:53 ` Dr. David Alan Gilbert
2015-07-13 16:26 ` Juan Quintela
2015-07-13 16:48 ` Dr. David Alan Gilbert
2015-07-13 18:05 ` Juan Quintela
2015-07-21 10:33 ` Amit Shah
2015-09-23 17:04 ` Dr. David Alan Gilbert
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 24/42] Add qemu_savevm_state_complete_postcopy Dr. David Alan Gilbert (git)
2015-07-13 11:35 ` Juan Quintela
2015-07-13 15:33 ` Dr. David Alan Gilbert
2015-07-21 10:42 ` Amit Shah
2015-07-27 17:58 ` Dr. David Alan Gilbert
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 25/42] Postcopy: Maintain sentmap and calculate discard Dr. David Alan Gilbert (git)
2015-07-13 11:47 ` Juan Quintela
2015-09-15 17:01 ` Dr. David Alan Gilbert
2015-07-21 11:36 ` Amit Shah
2015-07-31 16:51 ` Dr. David Alan Gilbert
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 26/42] postcopy: Incoming initialisation Dr. David Alan Gilbert (git)
2015-07-13 12:04 ` Juan Quintela
2015-09-23 19:06 ` Dr. David Alan Gilbert
2015-07-22 6:19 ` Amit Shah
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 27/42] postcopy: ram_enable_notify to switch on userfault Dr. David Alan Gilbert (git)
2015-07-13 12:10 ` Juan Quintela
2015-07-13 17:36 ` Dr. David Alan Gilbert
2015-07-23 5:22 ` Amit Shah
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 28/42] Postcopy: Postcopy startup in migration thread Dr. David Alan Gilbert (git)
2015-07-13 12:56 ` Juan Quintela
2015-07-13 17:56 ` Dr. David Alan Gilbert
2015-07-13 18:09 ` Juan Quintela
2015-09-23 17:56 ` Dr. David Alan Gilbert
2015-07-23 5:53 ` Amit Shah
2015-07-23 5:55 ` Amit Shah
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 29/42] Postcopy end in migration_thread Dr. David Alan Gilbert (git)
2015-07-13 13:15 ` Juan Quintela
2015-07-23 6:41 ` Amit Shah
2015-08-04 11:31 ` Dr. David Alan Gilbert
2015-07-23 6:41 ` Amit Shah
2015-06-16 10:26 ` Dr. David Alan Gilbert (git) [this message]
2015-07-13 13:24 ` [Qemu-devel] [PATCH v7 30/42] Page request: Add MIG_RP_MSG_REQ_PAGES reverse command Juan Quintela
2015-08-06 14:15 ` Dr. David Alan Gilbert
2015-07-23 6:50 ` Amit Shah
2015-08-06 14:21 ` Dr. David Alan Gilbert
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 31/42] Page request: Process incoming page request Dr. David Alan Gilbert (git)
2015-07-14 9:18 ` Juan Quintela
2015-08-06 10:45 ` Dr. David Alan Gilbert
2015-10-20 10:29 ` Juan Quintela
2015-07-23 12:23 ` Amit Shah
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 32/42] Page request: Consume pages off the post-copy queue Dr. David Alan Gilbert (git)
2015-07-14 9:40 ` Juan Quintela
2015-09-16 18:36 ` Dr. David Alan Gilbert
2015-07-27 6:05 ` Amit Shah
2015-09-16 18:48 ` Dr. David Alan Gilbert
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 33/42] postcopy_ram.c: place_page and helpers Dr. David Alan Gilbert (git)
2015-07-14 10:05 ` Juan Quintela
2015-07-27 6:11 ` Amit Shah
2015-09-23 16:45 ` Dr. David Alan Gilbert
2015-07-27 6:11 ` Amit Shah
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 34/42] Postcopy: Use helpers to map pages during migration Dr. David Alan Gilbert (git)
2015-07-14 12:34 ` Juan Quintela
2015-07-17 17:31 ` Dr. David Alan Gilbert
2015-07-27 7:39 ` Amit Shah
2015-08-06 11:22 ` Dr. David Alan Gilbert
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 35/42] Don't sync dirty bitmaps in postcopy Dr. David Alan Gilbert (git)
2015-07-14 12:36 ` Juan Quintela
2015-07-14 13:13 ` Dr. David Alan Gilbert
2015-07-27 7:43 ` Amit Shah
2015-07-31 9:50 ` Dr. David Alan Gilbert
2015-08-04 5:46 ` Amit Shah
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 36/42] Host page!=target page: Cleanup bitmaps Dr. David Alan Gilbert (git)
2015-07-14 15:01 ` Juan Quintela
2015-07-31 15:53 ` Dr. David Alan Gilbert
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 37/42] Postcopy; Handle userfault requests Dr. David Alan Gilbert (git)
2015-07-14 15:10 ` Juan Quintela
2015-07-14 15:15 ` Dr. David Alan Gilbert
2015-07-14 15:25 ` Juan Quintela
2015-07-27 14:29 ` Amit Shah
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 38/42] Start up a postcopy/listener thread ready for incoming page data Dr. David Alan Gilbert (git)
2015-07-14 15:12 ` Juan Quintela
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 39/42] postcopy: Wire up loadvm_postcopy_handle_ commands Dr. David Alan Gilbert (git)
2015-07-14 15:14 ` Juan Quintela
2015-07-28 5:53 ` Amit Shah
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 40/42] End of migration for postcopy Dr. David Alan Gilbert (git)
2015-07-14 15:15 ` Juan Quintela
2015-07-28 5:55 ` Amit Shah
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 41/42] Disable mlock around incoming postcopy Dr. David Alan Gilbert (git)
2015-07-14 15:22 ` Juan Quintela
2015-07-28 6:02 ` Amit Shah
2015-07-28 11:32 ` Juan Quintela
2015-08-06 14:55 ` Dr. David Alan Gilbert
2015-08-07 3:05 ` zhanghailiang
2015-09-24 10:36 ` Dr. David Alan Gilbert
2015-07-28 6:02 ` Amit Shah
2015-06-16 10:26 ` [Qemu-devel] [PATCH v7 42/42] Inhibit ballooning during postcopy Dr. David Alan Gilbert (git)
2015-07-14 15:24 ` Juan Quintela
2015-07-28 6:15 ` Amit Shah
2015-07-28 9:08 ` Dr. David Alan Gilbert
2015-07-28 10:01 ` Amit Shah
2015-07-28 11:16 ` Dr. David Alan Gilbert
2015-07-28 6:21 ` [Qemu-devel] [PATCH v7 00/42] Postcopy implementation Amit Shah
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=1434450415-11339-31-git-send-email-dgilbert@redhat.com \
--to=dgilbert@redhat.com \
--cc=aarcange@redhat.com \
--cc=amit.shah@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=liang.z.li@intel.com \
--cc=luis@cs.umu.se \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=yamahata@private.email.ne.jp \
/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: link
Be 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.