Commit 4c011c37 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert
Browse files

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: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Reviewed-by: default avatarLaurent Vivier <lvivier@redhat.com>
Message-Id: <20170224182844.32452-12-dgilbert@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent 332847f0

migration/ram.c

+5 −1
Original line number Diff line number Diff line
@@ -1302,6 +1302,8 @@ static int ram_save_target_page(MigrationState *ms, QEMUFile *f, 
 *                     offset to point into the middle of a host page

 *                     in which case the remainder of the hostpage is 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.

 *
@@ -1320,6 +1322,8 @@ static int ram_save_host_page(MigrationState *ms, QEMUFile *f, 
                              ram_addr_t dirty_ram_abs)

{

    int tmppages, pages = 0;

    size_t pagesize = qemu_ram_pagesize(pss->block);



    do {

        tmppages = ram_save_target_page(ms, f, pss, last_stage,

                                        bytes_transferred, dirty_ram_abs);
@@ -1330,7 +1334,7 @@ static int ram_save_host_page(MigrationState *ms, QEMUFile *f, 
        pages += tmppages;

        pss->offset += 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 */

    pss->offset -= TARGET_PAGE_SIZE;