| Message ID | 20180308195811.24894-23-dgilbert@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | postcopy+vhost-user/shared ram | expand |
On Thu, Mar 8, 2018 at 8:58 PM, Dr. David Alan Gilbert (git) <dgilbert@redhat.com> wrote: > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > Cause the vhost-user client to be woken up whenever: > a) We place a page in postcopy mode > b) We get a fault and the page has already been received > > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > migration/postcopy-ram.c | 14 ++++++++++---- > migration/trace-events | 1 + > 2 files changed, 11 insertions(+), 4 deletions(-) > > diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c > index 585db9467a..36db900e8f 100644 > --- a/migration/postcopy-ram.c > +++ b/migration/postcopy-ram.c > @@ -558,7 +558,11 @@ int postcopy_request_shared_page(struct PostCopyFD *pcfd, RAMBlock *rb, > > trace_postcopy_request_shared_page(pcfd->idstr, qemu_ram_get_idstr(rb), > rb_offset); > - /* TODO: Check bitmap to see if we already have the page */ > + if (ramblock_recv_bitmap_test_byte_offset(rb, aligned_rbo)) { > + trace_postcopy_request_shared_page_present(pcfd->idstr, > + qemu_ram_get_idstr(rb), rb_offset); > + return postcopy_wake_shared(pcfd, client_addr, rb); > + } > if (rb != mis->last_rb) { > mis->last_rb = rb; > migrate_send_rp_req_pages(mis, qemu_ram_get_idstr(rb), > @@ -866,7 +870,8 @@ int postcopy_place_page(MigrationIncomingState *mis, void *host, void *from, > } > > trace_postcopy_place_page(host); > - return 0; > + return postcopy_notify_shared_wake(rb, > + qemu_ram_block_host_offset(rb, host)); > } > > /* > @@ -890,6 +895,9 @@ int postcopy_place_page_zero(MigrationIncomingState *mis, void *host, > > return -e; > } > + return postcopy_notify_shared_wake(rb, > + qemu_ram_block_host_offset(rb, > + host)); > } else { > /* The kernel can't use UFFDIO_ZEROPAGE for hugepages */ > if (!mis->postcopy_tmp_zero_page) { > @@ -909,8 +917,6 @@ int postcopy_place_page_zero(MigrationIncomingState *mis, void *host, > return postcopy_place_page(mis, host, mis->postcopy_tmp_zero_page, > rb); > } > - > - return 0; > } > > /* > diff --git a/migration/trace-events b/migration/trace-events > index b0acaaa8a0..1e353a317f 100644 > --- a/migration/trace-events > +++ b/migration/trace-events > @@ -199,6 +199,7 @@ postcopy_ram_incoming_cleanup_entry(void) "" > postcopy_ram_incoming_cleanup_exit(void) "" > postcopy_ram_incoming_cleanup_join(void) "" > postcopy_request_shared_page(const char *sharer, const char *rb, uint64_t rb_offset) "for %s in %s offset 0x%"PRIx64 > +postcopy_request_shared_page_present(const char *sharer, const char *rb, uint64_t rb_offset) "%s already %s offset 0x%"PRIx64 > postcopy_wake_shared(uint64_t client_addr, const char *rb) "at 0x%"PRIx64" in %s" > > save_xbzrle_page_skipping(void) "" > -- > 2.14.3 > >
diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index 585db9467a..36db900e8f 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -558,7 +558,11 @@ int postcopy_request_shared_page(struct PostCopyFD *pcfd, RAMBlock *rb, trace_postcopy_request_shared_page(pcfd->idstr, qemu_ram_get_idstr(rb), rb_offset); - /* TODO: Check bitmap to see if we already have the page */ + if (ramblock_recv_bitmap_test_byte_offset(rb, aligned_rbo)) { + trace_postcopy_request_shared_page_present(pcfd->idstr, + qemu_ram_get_idstr(rb), rb_offset); + return postcopy_wake_shared(pcfd, client_addr, rb); + } if (rb != mis->last_rb) { mis->last_rb = rb; migrate_send_rp_req_pages(mis, qemu_ram_get_idstr(rb), @@ -866,7 +870,8 @@ int postcopy_place_page(MigrationIncomingState *mis, void *host, void *from, } trace_postcopy_place_page(host); - return 0; + return postcopy_notify_shared_wake(rb, + qemu_ram_block_host_offset(rb, host)); } /* @@ -890,6 +895,9 @@ int postcopy_place_page_zero(MigrationIncomingState *mis, void *host, return -e; } + return postcopy_notify_shared_wake(rb, + qemu_ram_block_host_offset(rb, + host)); } else { /* The kernel can't use UFFDIO_ZEROPAGE for hugepages */ if (!mis->postcopy_tmp_zero_page) { @@ -909,8 +917,6 @@ int postcopy_place_page_zero(MigrationIncomingState *mis, void *host, return postcopy_place_page(mis, host, mis->postcopy_tmp_zero_page, rb); } - - return 0; } /* diff --git a/migration/trace-events b/migration/trace-events index b0acaaa8a0..1e353a317f 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -199,6 +199,7 @@ postcopy_ram_incoming_cleanup_entry(void) "" postcopy_ram_incoming_cleanup_exit(void) "" postcopy_ram_incoming_cleanup_join(void) "" postcopy_request_shared_page(const char *sharer, const char *rb, uint64_t rb_offset) "for %s in %s offset 0x%"PRIx64 +postcopy_request_shared_page_present(const char *sharer, const char *rb, uint64_t rb_offset) "%s already %s offset 0x%"PRIx64 postcopy_wake_shared(uint64_t client_addr, const char *rb) "at 0x%"PRIx64" in %s" save_xbzrle_page_skipping(void) ""