postcopy: Send whole huge pages

The RAM save code uses ram_save_host_page to send whole
host pages at a time;  change this to use the host page size associated
with the RAM Block which may be a huge page.

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Message-Id: <20170224182844.32452-12-dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Dr. David Alan Gilbert 2017-02-24 18:28:39 +00:00
parent 332847f075
commit 4c011c37ec

View File

@ -1302,6 +1302,8 @@ static int ram_save_target_page(MigrationState *ms, QEMUFile *f,
* offset to point into the middle of a host page * offset to point into the middle of a host page
* in which case the remainder of the hostpage is sent. * in which case the remainder of the hostpage is sent.
* Only dirty target pages are sent. * Only dirty target pages are sent.
* Note that the host page size may be a huge page for this
* block.
* *
* Returns: Number of pages written. * Returns: Number of pages written.
* *
@ -1320,6 +1322,8 @@ static int ram_save_host_page(MigrationState *ms, QEMUFile *f,
ram_addr_t dirty_ram_abs) ram_addr_t dirty_ram_abs)
{ {
int tmppages, pages = 0; int tmppages, pages = 0;
size_t pagesize = qemu_ram_pagesize(pss->block);
do { do {
tmppages = ram_save_target_page(ms, f, pss, last_stage, tmppages = ram_save_target_page(ms, f, pss, last_stage,
bytes_transferred, dirty_ram_abs); bytes_transferred, dirty_ram_abs);
@ -1330,7 +1334,7 @@ static int ram_save_host_page(MigrationState *ms, QEMUFile *f,
pages += tmppages; pages += tmppages;
pss->offset += TARGET_PAGE_SIZE; pss->offset += TARGET_PAGE_SIZE;
dirty_ram_abs += TARGET_PAGE_SIZE; dirty_ram_abs += TARGET_PAGE_SIZE;
} while (pss->offset & (qemu_host_page_size - 1)); } while (pss->offset & (pagesize - 1));
/* The offset we leave with is the last one we looked at */ /* The offset we leave with is the last one we looked at */
pss->offset -= TARGET_PAGE_SIZE; pss->offset -= TARGET_PAGE_SIZE;