Commit eb13d1cf authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20190925a' into staging 



Migration pull 2019-09-25

  me: test fixes from (should stop hangs in postcopy tests).
  me: An RDMA cleanup hang fix
  Wei: Tidy ups around postcopy
  Marc-Andre: mem leak fix

# gpg: Signature made Wed 25 Sep 2019 15:59:41 BST
# gpg:                using RSA key 45F5C71B4A0CB7FB977A9FA90516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>" [full]
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7

* remotes/dgilbert/tags/pull-migration-20190925a:
  migration/postcopy: Recognise the recovery states as 'in_postcopy'
  tests/migration/postcopy: trim migration bandwidth
  tests/migration: Fail on unexpected migration states
  migration/rdma.c: Swap synchronize_rcu for call_rcu
  migration/rdma: Don't moan about disconnects at the end
  migration: remove sent parameter in get_queued_page_not_dirty
  migration/postcopy: unsentmap is not necessary for postcopy
  migration/postcopy: not necessary to do discard when canonicalizing bitmap
  migration: fix vmdesc leak on vmstate_save() error

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d4e536f3 3748fef9

include/exec/ram_addr.h

+0 −6
Original line number Diff line number Diff line
@@ -44,12 +44,6 @@ struct RAMBlock { 
    size_t page_size;

    /* dirty bitmap used during migration */

    unsigned long *bmap;

    /* bitmap of pages that haven't been sent even once

     * only maintained and used in postcopy at the moment

     * where it's used to send the dirtymap at the start

     * of the postcopy phase

     */

    unsigned long *unsentmap;

    /* bitmap of already received pages in postcopy */

    unsigned long *receivedmap;

migration/migration.c

+8 −1
Original line number Diff line number Diff line
@@ -1659,7 +1659,14 @@ bool migration_in_postcopy(void) 
{

    MigrationState *s = migrate_get_current();



    return (s->state == MIGRATION_STATUS_POSTCOPY_ACTIVE);

    switch (s->state) {

    case MIGRATION_STATUS_POSTCOPY_ACTIVE:

    case MIGRATION_STATUS_POSTCOPY_PAUSED:

    case MIGRATION_STATUS_POSTCOPY_RECOVER:

        return true;

    default:

        return false;

    }

}



bool migration_in_postcopy_after_devices(MigrationState *s)

migration/qjson.h

+2 −0
Original line number Diff line number Diff line
@@ -24,4 +24,6 @@ void json_start_object(QJSON *json, const char *name); 
const char *qjson_get_str(QJSON *json);

void qjson_finish(QJSON *json);



G_DEFINE_AUTOPTR_CLEANUP_FUNC(QJSON, qjson_destroy)



#endif /* QEMU_QJSON_H */

migration/ram.c

+15 −79
Original line number Diff line number Diff line
@@ -2348,7 +2348,7 @@ static bool get_queued_page(RAMState *rs, PageSearchStatus *pss) 
            dirty = test_bit(page, block->bmap);

            if (!dirty) {

                trace_get_queued_page_not_dirty(block->idstr, (uint64_t)offset,

                       page, test_bit(page, block->unsentmap));

                                                page);

            } else {

                trace_get_queued_page(block->idstr, (uint64_t)offset, page);

            }
@@ -2619,10 +2619,6 @@ static int ram_save_host_page(RAMState *rs, PageSearchStatus *pss, 
        }



        pages += tmppages;

        if (pss->block->unsentmap) {

            clear_bit(pss->page, pss->block->unsentmap);

        }



        pss->page++;

    } while ((pss->page & (pagesize_bits - 1)) &&

             offset_in_ramblock(pss->block, pss->page << TARGET_PAGE_BITS));
@@ -2776,8 +2772,6 @@ static void ram_save_cleanup(void *opaque) 
        block->clear_bmap = NULL;

        g_free(block->bmap);

        block->bmap = NULL;

        g_free(block->unsentmap);

        block->unsentmap = NULL;

    }



    xbzrle_cleanup();
@@ -2857,8 +2851,6 @@ void ram_postcopy_migrated_memory_release(MigrationState *ms) 
 * Returns zero on success

 *

 * Callback from postcopy_each_ram_send_discard for each RAMBlock

 * Note: At this point the 'unsentmap' is the processed bitmap combined

 *       with the dirtymap; so a '1' means it's either dirty or unsent.

 *

 * @ms: current migration state

 * @block: RAMBlock to discard
@@ -2867,17 +2859,17 @@ static int postcopy_send_discard_bm_ram(MigrationState *ms, RAMBlock *block) 
{

    unsigned long end = block->used_length >> TARGET_PAGE_BITS;

    unsigned long current;

    unsigned long *unsentmap = block->unsentmap;

    unsigned long *bitmap = block->bmap;



    for (current = 0; current < end; ) {

        unsigned long one = find_next_bit(unsentmap, end, current);

        unsigned long one = find_next_bit(bitmap, end, current);

        unsigned long zero, discard_length;



        if (one >= end) {

            break;

        }



        zero = find_next_zero_bit(unsentmap, end, one + 1);

        zero = find_next_zero_bit(bitmap, end, one + 1);



        if (zero >= end) {

            discard_length = end - one;
@@ -2928,7 +2920,7 @@ static int postcopy_each_ram_send_discard(MigrationState *ms) 
}



/**

 * postcopy_chunk_hostpages_pass: canocalize bitmap in hostpages

 * postcopy_chunk_hostpages_pass: canonicalize bitmap in hostpages

 *

 * Helper for postcopy_chunk_hostpages; it's called twice to

 * canonicalize the two bitmaps, that are similar, but one is
@@ -2938,16 +2930,12 @@ static int postcopy_each_ram_send_discard(MigrationState *ms) 
 * clean, not a mix.  This function canonicalizes the bitmaps.

 *

 * @ms: current migration state

 * @unsent_pass: if true we need to canonicalize partially unsent host pages

 *               otherwise we need to canonicalize partially dirty host pages

 * @block: block that contains the page we want to canonicalize

 */

static void postcopy_chunk_hostpages_pass(MigrationState *ms, bool unsent_pass,

                                          RAMBlock *block)

static void postcopy_chunk_hostpages_pass(MigrationState *ms, RAMBlock *block)

{

    RAMState *rs = ram_state;

    unsigned long *bitmap = block->bmap;

    unsigned long *unsentmap = block->unsentmap;

    unsigned int host_ratio = block->page_size / TARGET_PAGE_SIZE;

    unsigned long pages = block->used_length >> TARGET_PAGE_BITS;

    unsigned long run_start;
@@ -2957,13 +2945,8 @@ static void postcopy_chunk_hostpages_pass(MigrationState *ms, bool unsent_pass, 
        return;

    }



    if (unsent_pass) {

        /* Find a sent page */

        run_start = find_next_zero_bit(unsentmap, pages, 0);

    } else {

    /* Find a dirty page */

    run_start = find_next_bit(bitmap, pages, 0);

    }



    while (run_start < pages) {
@@ -2973,11 +2956,7 @@ static void postcopy_chunk_hostpages_pass(MigrationState *ms, bool unsent_pass, 
         */

        if (QEMU_IS_ALIGNED(run_start, host_ratio)) {

            /* Find the end of this run */

            if (unsent_pass) {

                run_start = find_next_bit(unsentmap, pages, run_start + 1);

            } else {

            run_start = find_next_zero_bit(bitmap, pages, run_start + 1);

            }

            /*

             * If the end isn't at the start of a host page, then the

             * run doesn't finish at the end of a host page
@@ -2991,24 +2970,9 @@ static void postcopy_chunk_hostpages_pass(MigrationState *ms, bool unsent_pass, 
                                                             host_ratio);

            run_start = QEMU_ALIGN_UP(run_start, host_ratio);



            /* Tell the destination to discard this page */

            if (unsent_pass || !test_bit(fixup_start_addr, unsentmap)) {

                /* For the unsent_pass we:

                 *     discard partially sent pages

                 * For the !unsent_pass (dirty) we:

                 *     discard partially dirty pages that were sent

                 *     (any partially sent pages were already discarded

                 *     by the previous unsent_pass)

                 */

                postcopy_discard_send_range(ms, fixup_start_addr, host_ratio);

            }



            /* Clean up the bitmap */

            for (page = fixup_start_addr;

                 page < fixup_start_addr + host_ratio; page++) {

                /* All pages in this host page are now not sent */

                set_bit(page, unsentmap);



                /*

                 * Remark them as dirty, updating the count for any pages

                 * that weren't previously dirty.
@@ -3017,15 +2981,10 @@ static void postcopy_chunk_hostpages_pass(MigrationState *ms, bool unsent_pass, 
            }

        }



        if (unsent_pass) {

            /* Find the next sent page for the next iteration */

            run_start = find_next_zero_bit(unsentmap, pages, run_start);

        } else {

        /* Find the next dirty page for the next iteration */

        run_start = find_next_bit(bitmap, pages, run_start);

    }

}

}



/**

 * postcopy_chunk_hostpages: discard any partially sent host page
@@ -3045,13 +3004,10 @@ static int postcopy_chunk_hostpages(MigrationState *ms, RAMBlock *block) 
{

    postcopy_discard_send_init(ms, block->idstr);



    /* First pass: Discard all partially sent host pages */

    postcopy_chunk_hostpages_pass(ms, true, block);

    /*

     * Second pass: Ensure that all partially dirty host pages are made

     * fully dirty.

     * Ensure that all partially dirty host pages are made fully dirty.

     */

    postcopy_chunk_hostpages_pass(ms, false, block);

    postcopy_chunk_hostpages_pass(ms, block);



    postcopy_discard_send_finish(ms);

    return 0;
@@ -3089,19 +3045,6 @@ int ram_postcopy_send_discard_bitmap(MigrationState *ms) 
    rs->last_page = 0;



    RAMBLOCK_FOREACH_NOT_IGNORED(block) {

        unsigned long pages = block->used_length >> TARGET_PAGE_BITS;

        unsigned long *bitmap = block->bmap;

        unsigned long *unsentmap = block->unsentmap;



        if (!unsentmap) {

            /* We don't have a safe way to resize the sentmap, so

             * if the bitmap was resized it will be NULL at this

             * point.

             */

            error_report("migration ram resized during precopy phase");

            rcu_read_unlock();

            return -EINVAL;

        }

        /* Deal with TPS != HPS and huge pages */

        ret = postcopy_chunk_hostpages(ms, block);

        if (ret) {
@@ -3109,12 +3052,9 @@ int ram_postcopy_send_discard_bitmap(MigrationState *ms) 
            return ret;

        }



        /*

         * Update the unsentmap to be unsentmap = unsentmap | dirty

         */

        bitmap_or(unsentmap, unsentmap, bitmap, pages);

#ifdef DEBUG_POSTCOPY

        ram_debug_dump_bitmap(unsentmap, true, pages);

        ram_debug_dump_bitmap(block->bmap, true,

                              block->used_length >> TARGET_PAGE_BITS);

#endif

    }

    trace_ram_postcopy_send_discard_bitmap();
@@ -3282,10 +3222,6 @@ static void ram_list_init_bitmaps(void) 
            bitmap_set(block->bmap, 0, pages);

            block->clear_bmap_shift = shift;

            block->clear_bmap = bitmap_new(clear_bmap_size(pages, shift));

            if (migrate_postcopy_ram()) {

                block->unsentmap = bitmap_new(pages);

                bitmap_set(block->unsentmap, 0, pages);

            }

        }

    }

}

migration/rdma.c

+35 −16
Original line number Diff line number Diff line
@@ -3017,11 +3017,35 @@ static void qio_channel_rdma_set_aio_fd_handler(QIOChannel *ioc, 
    }

}



struct rdma_close_rcu {

    struct rcu_head rcu;

    RDMAContext *rdmain;

    RDMAContext *rdmaout;

};



/* callback from qio_channel_rdma_close via call_rcu */

static void qio_channel_rdma_close_rcu(struct rdma_close_rcu *rcu)

{

    if (rcu->rdmain) {

        qemu_rdma_cleanup(rcu->rdmain);

    }



    if (rcu->rdmaout) {

        qemu_rdma_cleanup(rcu->rdmaout);

    }



    g_free(rcu->rdmain);

    g_free(rcu->rdmaout);

    g_free(rcu);

}



static int qio_channel_rdma_close(QIOChannel *ioc,

                                  Error **errp)

{

    QIOChannelRDMA *rioc = QIO_CHANNEL_RDMA(ioc);

    RDMAContext *rdmain, *rdmaout;

    struct rdma_close_rcu *rcu = g_new(struct rdma_close_rcu, 1);



    trace_qemu_rdma_close();



    rdmain = rioc->rdmain;
@@ -3034,18 +3058,9 @@ static int qio_channel_rdma_close(QIOChannel *ioc, 
        atomic_rcu_set(&rioc->rdmaout, NULL);

    }



    synchronize_rcu();



    if (rdmain) {

        qemu_rdma_cleanup(rdmain);

    }



    if (rdmaout) {

        qemu_rdma_cleanup(rdmaout);

    }



    g_free(rdmain);

    g_free(rdmaout);

    rcu->rdmain = rdmain;

    rcu->rdmaout = rdmaout;

    call_rcu(rcu, qio_channel_rdma_close_rcu, rcu);



    return 0;

}
@@ -3253,11 +3268,15 @@ static void rdma_cm_poll_handler(void *opaque) 


    if (cm_event->event == RDMA_CM_EVENT_DISCONNECTED ||

        cm_event->event == RDMA_CM_EVENT_DEVICE_REMOVAL) {

        if (!rdma->error_state &&

            migration_incoming_get_current()->state !=

              MIGRATION_STATUS_COMPLETED) {

            error_report("receive cm event, cm event is %d", cm_event->event);

            rdma->error_state = -EPIPE;

            if (rdma->return_path) {

                rdma->return_path->error_state = -EPIPE;

            }

        }



        if (mis->migration_incoming_co) {

            qemu_coroutine_enter(mis->migration_incoming_co);