Commit dedfb4b2 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Michael S. Tsirkin
Browse files

vhost+postcopy: Call wakeups 



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: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent c07e3615

migration/postcopy-ram.c

+10 −4
Original line number Diff line number Diff line
@@ -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;

}



/*

migration/trace-events

+1 −0
Original line number Diff line number Diff line
@@ -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) ""