[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v9 45/56] postcopy: Check order of received target p
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PATCH v9 45/56] postcopy: Check order of received target pages |
Date: |
Thu, 5 Nov 2015 18:11:12 +0000 |
From: "Dr. David Alan Gilbert" <address@hidden>
Ensure that target pages received within a host page are in order.
This shouldn't trigger, but in the cases where the sender goes
wrong and sends stuff out of order it produces a corruption that's
really nasty to debug.
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
---
migration/ram.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/migration/ram.c b/migration/ram.c
index af5f369..8bf0841 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -2097,6 +2097,7 @@ static int ram_load_postcopy(QEMUFile *f)
MigrationIncomingState *mis = migration_incoming_get_current();
/* Temporary page that is later 'placed' */
void *postcopy_host_page = postcopy_get_tmp_page(mis);
+ void *last_host = NULL;
while (!ret && !(flags & RAM_SAVE_FLAG_EOS)) {
ram_addr_t addr;
@@ -2133,8 +2134,17 @@ static int ram_load_postcopy(QEMUFile *f)
/* If all TP are zero then we can optimise the place */
if (!((uintptr_t)host & ~qemu_host_page_mask)) {
all_zero = true;
+ } else {
+ /* not the 1st TP within the HP */
+ if (host != (last_host + TARGET_PAGE_SIZE)) {
+ error_report("Non-sequential target page %p/%p\n",
+ host, last_host);
+ ret = -EINVAL;
+ break;
+ }
}
+
/*
* If it's the last part of a host page then we place the host
* page
@@ -2143,6 +2153,7 @@ static int ram_load_postcopy(QEMUFile *f)
~qemu_host_page_mask) == 0;
place_source = postcopy_host_page;
}
+ last_host = host;
switch (flags & ~RAM_SAVE_FLAG_CONTINUE) {
case RAM_SAVE_FLAG_COMPRESS:
--
2.5.0
- Re: [Qemu-devel] [PATCH v9 36/56] postcopy: Incoming initialisation, (continued)
- [Qemu-devel] [PATCH v9 38/56] Postcopy: Postcopy startup in migration thread, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 40/56] Page request: Add MIG_RP_MSG_REQ_PAGES reverse command, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 39/56] Postcopy: End of iteration, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 41/56] Page request: Process incoming page request, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 42/56] Page request: Consume pages off the post-copy queue, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 44/56] Postcopy: Use helpers to map pages during migration, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 43/56] postcopy_ram.c: place_page and helpers, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 45/56] postcopy: Check order of received target pages,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PATCH v9 46/56] Don't sync dirty bitmaps in postcopy, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 47/56] Don't iterate on precopy-only devices during postcopy, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 48/56] Host page!=target page: Cleanup bitmaps, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 49/56] Round up RAMBlock sizes to host page sizes, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 50/56] Postcopy; Handle userfault requests, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 51/56] Start up a postcopy/listener thread ready for incoming page data, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 52/56] postcopy: Wire up loadvm_postcopy_handle_ commands, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 53/56] Postcopy: Mark nohugepage before discard, Dr. David Alan Gilbert (git), 2015/11/05
- [Qemu-devel] [PATCH v9 54/56] End of migration for postcopy, Dr. David Alan Gilbert (git), 2015/11/05