OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

migration: postcopy_place_page factoring out

Browse Source 
Need to mark copied pages as closer as possible to the place where it
tracks down. That will be necessary in futher patch.

Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Alexey Perevalov <a.perevalov@samsung.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Alexey Perevalov 2017-10-05 14:13:18 +03:00 committed by Juan Quintela
parent d6eff5d75d
commit 8be4620be2
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
migration/postcopy-ram.c
View File

@ -646,9 +646,10 @@ int postcopy_ram_enable_notify(MigrationIncomingState *mis)
* returns 0 on success * returns 0 on success
*/ */
int postcopy_place_page(MigrationIncomingState *mis, void *host, void *from, int postcopy_place_page(MigrationIncomingState *mis, void *host, void *from,
size_t pagesize) RAMBlock *rb)
{ {
struct uffdio_copy copy_struct; struct uffdio_copy copy_struct;
size_t pagesize = qemu_ram_pagesize(rb);
copy_struct.dst = (uint64_t)(uintptr_t)host; copy_struct.dst = (uint64_t)(uintptr_t)host;
copy_struct.src = (uint64_t)(uintptr_t)from; copy_struct.src = (uint64_t)(uintptr_t)from;
@ -677,11 +678,11 @@ int postcopy_place_page(MigrationIncomingState *mis, void *host, void *from,
* returns 0 on success * returns 0 on success
*/ */
int postcopy_place_page_zero(MigrationIncomingState *mis, void *host, int postcopy_place_page_zero(MigrationIncomingState *mis, void *host,
size_t pagesize) RAMBlock *rb)
{ {
trace_postcopy_place_page_zero(host); trace_postcopy_place_page_zero(host);
if (pagesize == getpagesize()) { if (qemu_ram_pagesize(rb) == getpagesize()) {
struct uffdio_zeropage zero_struct; struct uffdio_zeropage zero_struct;
zero_struct.range.start = (uint64_t)(uintptr_t)host; zero_struct.range.start = (uint64_t)(uintptr_t)host;
zero_struct.range.len = getpagesize(); zero_struct.range.len = getpagesize();
@ -711,7 +712,7 @@ int postcopy_place_page_zero(MigrationIncomingState *mis, void *host,
memset(mis->postcopy_tmp_zero_page, '\0', mis->largest_page_size); memset(mis->postcopy_tmp_zero_page, '\0', mis->largest_page_size);
} }
return postcopy_place_page(mis, host, mis->postcopy_tmp_zero_page, return postcopy_place_page(mis, host, mis->postcopy_tmp_zero_page,
pagesize); rb);
} }
return 0; return 0;
@ -774,14 +775,14 @@ int postcopy_ram_enable_notify(MigrationIncomingState *mis)
} }
int postcopy_place_page(MigrationIncomingState *mis, void *host, void *from, int postcopy_place_page(MigrationIncomingState *mis, void *host, void *from,
size_t pagesize) RAMBlock *rb)
{ {
assert(0); assert(0);
return -1; return -1;
} }
int postcopy_place_page_zero(MigrationIncomingState *mis, void *host, int postcopy_place_page_zero(MigrationIncomingState *mis, void *host,
size_t pagesize) RAMBlock *rb)
{ {
assert(0); assert(0);
return -1; return -1;

4
migration/postcopy-ram.h
View File

@ -72,14 +72,14 @@ void postcopy_discard_send_finish(MigrationState *ms,
* returns 0 on success * returns 0 on success
*/ */
int postcopy_place_page(MigrationIncomingState *mis, void *host, void *from, int postcopy_place_page(MigrationIncomingState *mis, void *host, void *from,
size_t pagesize); RAMBlock *rb);
/* /*
* Place a zero page at (host) atomically * Place a zero page at (host) atomically
* returns 0 on success * returns 0 on success
*/ */
int postcopy_place_page_zero(MigrationIncomingState *mis, void *host, int postcopy_place_page_zero(MigrationIncomingState *mis, void *host,
size_t pagesize); RAMBlock *rb);
/* The current postcopy state is read/set by postcopy_state_get/set /* The current postcopy state is read/set by postcopy_state_get/set
* which update it atomically. * which update it atomically.

4
migration/ram.c
View File

@ -2753,10 +2753,10 @@ static int ram_load_postcopy(QEMUFile *f)
if (all_zero) { if (all_zero) {
ret = postcopy_place_page_zero(mis, place_dest, ret = postcopy_place_page_zero(mis, place_dest,
block->page_size); block);
} else { } else {
ret = postcopy_place_page(mis, place_dest, ret = postcopy_place_page(mis, place_dest,
place_source, block->page_size); place_source, block);
} }
} }
if (!ret) { if (!ret) {