Commit 0beb5ed3 authored by Juan Quintela's avatar Juan Quintela
Browse files

migration: Add block where to send/receive packets 



Once there add tracepoints.

Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
parent d82628e4

migration/ram.c

+44 −5
Original line number Diff line number Diff line
@@ -560,6 +560,8 @@ typedef struct { 
    bool running;

    /* should this thread finish */

    bool quit;

    /* thread has work to do */

    int pending_job;

    /* array of pages to sent */

    MultiFDPages_t *pages;

    /* packet allocated len */
@@ -595,6 +597,8 @@ typedef struct { 
    bool running;

    /* should this thread finish */

    bool quit;

    /* thread has work to do */

    bool pending_job;

    /* array of pages to receive */

    MultiFDPages_t *pages;

    /* packet allocated len */
@@ -877,8 +881,28 @@ static void *multifd_send_thread(void *opaque) 
    while (true) {

        qemu_sem_wait(&p->sem);

        qemu_mutex_lock(&p->mutex);



        if (p->pending_job) {

            uint32_t used = p->pages->used;

            uint64_t packet_num = p->packet_num;

            uint32_t flags = p->flags;



            multifd_send_fill_packet(p);

        if (p->quit) {

            p->flags = 0;

            p->num_packets++;

            p->num_pages += used;

            p->pages->used = 0;

            qemu_mutex_unlock(&p->mutex);



            trace_multifd_send(p->id, packet_num, used, flags);



            /* ToDo: send packet here */



            qemu_mutex_lock(&p->mutex);

            p->pending_job--;

            qemu_mutex_unlock(&p->mutex);

            continue;

        } else if (p->quit) {

            qemu_mutex_unlock(&p->mutex);

            break;

        }
@@ -944,6 +968,7 @@ int multifd_save_setup(void) 
        qemu_mutex_init(&p->mutex);

        qemu_sem_init(&p->sem, 0);

        p->quit = false;

        p->pending_job = 0;

        p->id = i;

        p->pages = multifd_pages_init(page_count);

        p->packet_len = sizeof(MultiFDPacket_t)
@@ -1031,14 +1056,27 @@ static void *multifd_recv_thread(void *opaque) 
    while (true) {

        qemu_sem_wait(&p->sem);

        qemu_mutex_lock(&p->mutex);

        if (false)  {

            /* ToDo: Packet reception goes here */

        if (p->pending_job) {

            uint32_t used;

            uint32_t flags;

            qemu_mutex_unlock(&p->mutex);



            /* ToDo: recv packet here */



            qemu_mutex_lock(&p->mutex);

            ret = multifd_recv_unfill_packet(p, &local_err);

            qemu_mutex_unlock(&p->mutex);

            if (ret) {

                qemu_mutex_unlock(&p->mutex);

                break;

            }



            used = p->pages->used;

            flags = p->flags;

            trace_multifd_recv(p->id, p->packet_num, used, flags);

            p->pending_job = false;

            p->num_packets++;

            p->num_pages += used;

            qemu_mutex_unlock(&p->mutex);

        } else if (p->quit) {

            qemu_mutex_unlock(&p->mutex);

            break;
@@ -1081,6 +1119,7 @@ int multifd_load_setup(void) 
        qemu_mutex_init(&p->mutex);

        qemu_sem_init(&p->sem, 0);

        p->quit = false;

        p->pending_job = false;

        p->id = i;

        p->pages = multifd_pages_init(page_count);

        p->packet_len = sizeof(MultiFDPacket_t)

migration/trace-events

+2 −0
Original line number Diff line number Diff line
@@ -76,8 +76,10 @@ get_queued_page_not_dirty(const char *block_name, uint64_t tmp_offset, unsigned 
migration_bitmap_sync_start(void) ""

migration_bitmap_sync_end(uint64_t dirty_pages) "dirty_pages %" PRIu64

migration_throttle(void) ""

multifd_recv(uint8_t id, uint64_t packet_num, uint32_t used, uint32_t flags) "channel %d packet number %" PRIu64 " pages %d flags 0x%x"

multifd_recv_thread_end(uint8_t id, uint64_t packets, uint64_t pages) "channel %d packets %" PRIu64 " pages %" PRIu64

multifd_recv_thread_start(uint8_t id) "%d"

multifd_send(uint8_t id, uint64_t packet_num, uint32_t used, uint32_t flags) "channel %d packet_num %" PRIu64 " pages %d flags 0x%x"

multifd_send_thread_end(uint8_t id, uint64_t packets, uint64_t pages) "channel %d packets %" PRIu64 " pages %"  PRIu64

multifd_send_thread_start(uint8_t id) "%d"

ram_discard_range(const char *rbname, uint64_t start, size_t len) "%s: start: %" PRIx64 " %zx"