ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

postcopy: Check order of received target pages 

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 <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Dr. David Alan Gilbert 2015-11-05 18:11:12 +00:00 committed by Juan Quintela
parent a71808772a
commit c53b7ddc61
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
migration/ram.c
View File

@ -2097,6 +2097,7 @@ static int ram_load_postcopy(QEMUFile *f)
MigrationIncomingState *mis = migration_incoming_get_current(); MigrationIncomingState *mis = migration_incoming_get_current();
/* Temporary page that is later 'placed' */ /* Temporary page that is later 'placed' */
void *postcopy_host_page = postcopy_get_tmp_page(mis); void *postcopy_host_page = postcopy_get_tmp_page(mis);
void *last_host = NULL;
while (!ret && !(flags & RAM_SAVE_FLAG_EOS)) { while (!ret && !(flags & RAM_SAVE_FLAG_EOS)) {
ram_addr_t addr; 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 all TP are zero then we can optimise the place */
if (!((uintptr_t)host & ~qemu_host_page_mask)) { if (!((uintptr_t)host & ~qemu_host_page_mask)) {
all_zero = true; 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 * If it's the last part of a host page then we place the host
* page * page
@ -2143,6 +2153,7 @@ static int ram_load_postcopy(QEMUFile *f)
~qemu_host_page_mask) == 0; ~qemu_host_page_mask) == 0;
place_source = postcopy_host_page; place_source = postcopy_host_page;
} }
last_host = host;
switch (flags & ~RAM_SAVE_FLAG_CONTINUE) { switch (flags & ~RAM_SAVE_FLAG_CONTINUE) {
case RAM_SAVE_FLAG_COMPRESS: case RAM_SAVE_FLAG_COMPRESS: