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

postcopy: Mask fault addresses to huge page boundary

Browse Source 
Currently the fault address received by userfault is rounded to
the host page boundary and a host page is requested from the source.
Use the current RAMBlock page size instead of the general host page
size so that for RAMBlocks backed by huge pages we request the whole
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-11-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:38 +00:00
parent 28abd20014
commit 332847f075
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
migration/postcopy-ram.c
View File

@ -403,7 +403,6 @@ static void *postcopy_ram_fault_thread(void *opaque)
MigrationIncomingState *mis = opaque; MigrationIncomingState *mis = opaque;
struct uffd_msg msg; struct uffd_msg msg;
int ret; int ret;
size_t hostpagesize = getpagesize();
RAMBlock *rb = NULL; RAMBlock *rb = NULL;
RAMBlock *last_rb = NULL; /* last RAMBlock we sent part of */ RAMBlock *last_rb = NULL; /* last RAMBlock we sent part of */
@ -470,7 +469,7 @@ static void *postcopy_ram_fault_thread(void *opaque)
break; break;
} }
rb_offset &= ~(hostpagesize - 1); rb_offset &= ~(qemu_ram_pagesize(rb) - 1);
trace_postcopy_ram_fault_thread_request(msg.arg.pagefault.address, trace_postcopy_ram_fault_thread_request(msg.arg.pagefault.address,
qemu_ram_get_idstr(rb), qemu_ram_get_idstr(rb),
rb_offset); rb_offset);
@ -482,11 +481,11 @@ static void *postcopy_ram_fault_thread(void *opaque)
if (rb != last_rb) { if (rb != last_rb) {
last_rb = rb; last_rb = rb;
migrate_send_rp_req_pages(mis, qemu_ram_get_idstr(rb), migrate_send_rp_req_pages(mis, qemu_ram_get_idstr(rb),
rb_offset, hostpagesize); rb_offset, qemu_ram_pagesize(rb));
} else { } else {
/* Save some space */ /* Save some space */
migrate_send_rp_req_pages(mis, NULL, migrate_send_rp_req_pages(mis, NULL,
rb_offset, hostpagesize); rb_offset, qemu_ram_pagesize(rb));
} }
} }
trace_postcopy_ram_fault_thread_exit(); trace_postcopy_ram_fault_thread_exit();