Commit ca6011c2 authored by Alexey Perevalov's avatar Alexey Perevalov Committed by Juan Quintela
Browse files

migration: add postcopy total blocktime into query-migrate 



Postcopy total blocktime is available on destination side only.
But query-migrate was possible only for source. This patch
adds ability to call query-migrate on destination.
To be able to see postcopy blocktime, need to request postcopy-blocktime
capability.

The query-migrate command will show following sample result:
{"return":
    "postcopy-vcpu-blocktime": [115, 100],
    "status": "completed",
    "postcopy-blocktime": 100
}}

postcopy_vcpu_blocktime contains list, where the first item is the first
vCPU in QEMU.

This patch has a drawback, it combines states of incoming and
outgoing migration. Ongoing migration state will overwrite incoming
state. Looks like better to separate query-migrate for incoming and
outgoing migration or add parameter to indicate type of migration.

Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: default avatarAlexey Perevalov <a.perevalov@samsung.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent 5f32dc8e

hmp.c

+15 −0
Original line number Diff line number Diff line
@@ -264,6 +264,21 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict) 
                       info->cpu_throttle_percentage);

    }



    if (info->has_postcopy_blocktime) {

        monitor_printf(mon, "postcopy blocktime: %" PRId64 "\n",

                       info->postcopy_blocktime);

    }



    if (info->has_postcopy_vcpu_blocktime) {

        Visitor *v;

        char *str;

        v = string_output_visitor_new(false, &str);

        visit_type_int64List(v, NULL, &info->postcopy_vcpu_blocktime, NULL);

        visit_complete(v, &str);

        monitor_printf(mon, "postcopy vcpu blocktime: %s\n", str);

        g_free(str);

        visit_free(v);

    }

    qapi_free_MigrationInfo(info);

    qapi_free_MigrationCapabilityStatusList(caps);

}

migration/migration.c

+38 −4
Original line number Diff line number Diff line
@@ -591,14 +591,15 @@ static void populate_disk_info(MigrationInfo *info) 
    }

}



MigrationInfo *qmp_query_migrate(Error **errp)

static void fill_source_migration_info(MigrationInfo *info)

{

    MigrationInfo *info = g_malloc0(sizeof(*info));

    MigrationState *s = migrate_get_current();



    switch (s->state) {

    case MIGRATION_STATUS_NONE:

        /* no migration has happened ever */

        /* do not overwrite destination migration status */

        return;

        break;

    case MIGRATION_STATUS_SETUP:

        info->has_status = true;
@@ -649,8 +650,6 @@ MigrationInfo *qmp_query_migrate(Error **errp) 
        break;

    }

    info->status = s->state;



    return info;

}



/**
@@ -714,6 +713,41 @@ static bool migrate_caps_check(bool *cap_list, 
    return true;

}



static void fill_destination_migration_info(MigrationInfo *info)

{

    MigrationIncomingState *mis = migration_incoming_get_current();



    switch (mis->state) {

    case MIGRATION_STATUS_NONE:

        return;

        break;

    case MIGRATION_STATUS_SETUP:

    case MIGRATION_STATUS_CANCELLING:

    case MIGRATION_STATUS_CANCELLED:

    case MIGRATION_STATUS_ACTIVE:

    case MIGRATION_STATUS_POSTCOPY_ACTIVE:

    case MIGRATION_STATUS_FAILED:

    case MIGRATION_STATUS_COLO:

        info->has_status = true;

        break;

    case MIGRATION_STATUS_COMPLETED:

        info->has_status = true;

        fill_destination_postcopy_migration_info(info);

        break;

    }

    info->status = mis->state;

}



MigrationInfo *qmp_query_migrate(Error **errp)

{

    MigrationInfo *info = g_malloc0(sizeof(*info));



    fill_destination_migration_info(info);

    fill_source_migration_info(info);



    return info;

}



void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params,

                                  Error **errp)

{

migration/migration.h

+4 −0
Original line number Diff line number Diff line
@@ -71,6 +71,10 @@ struct MigrationIncomingState { 


MigrationIncomingState *migration_incoming_get_current(void);

void migration_incoming_state_destroy(void);

/*

 * Functions to work with blocktime context

 */

void fill_destination_postcopy_migration_info(MigrationInfo *info);



#define TYPE_MIGRATION "migration"

migration/postcopy-ram.c

+56 −0
Original line number Diff line number Diff line
@@ -108,6 +108,55 @@ static struct PostcopyBlocktimeContext *blocktime_context_new(void) 
    return ctx;

}



static int64List *get_vcpu_blocktime_list(PostcopyBlocktimeContext *ctx)

{

    int64List *list = NULL, *entry = NULL;

    int i;



    for (i = smp_cpus - 1; i >= 0; i--) {

        entry = g_new0(int64List, 1);

        entry->value = ctx->vcpu_blocktime[i];

        entry->next = list;

        list = entry;

    }



    return list;

}



/*

 * This function just populates MigrationInfo from postcopy's

 * blocktime context. It will not populate MigrationInfo,

 * unless postcopy-blocktime capability was set.

 *

 * @info: pointer to MigrationInfo to populate

 */

void fill_destination_postcopy_migration_info(MigrationInfo *info)

{

    MigrationIncomingState *mis = migration_incoming_get_current();

    PostcopyBlocktimeContext *bc = mis->blocktime_ctx;



    if (!bc) {

        return;

    }



    info->has_postcopy_blocktime = true;

    info->postcopy_blocktime = bc->total_blocktime;

    info->has_postcopy_vcpu_blocktime = true;

    info->postcopy_vcpu_blocktime = get_vcpu_blocktime_list(bc);

}



static uint64_t get_postcopy_total_blocktime(void)

{

    MigrationIncomingState *mis = migration_incoming_get_current();

    PostcopyBlocktimeContext *bc = mis->blocktime_ctx;



    if (!bc) {

        return 0;

    }



    return bc->total_blocktime;

}



/**

 * receive_ufd_features: check userfault fd features, to request only supported

 * features in the future.
@@ -482,6 +531,9 @@ int postcopy_ram_incoming_cleanup(MigrationIncomingState *mis) 
        munmap(mis->postcopy_tmp_zero_page, mis->largest_page_size);

        mis->postcopy_tmp_zero_page = NULL;

    }

    trace_postcopy_ram_incoming_cleanup_blocktime(

            get_postcopy_total_blocktime());



    trace_postcopy_ram_incoming_cleanup_exit();

    return 0;

}
@@ -959,6 +1011,10 @@ void *postcopy_get_tmp_page(MigrationIncomingState *mis) 


#else

/* No target OS support, stubs just fail */

void fill_destination_postcopy_migration_info(MigrationInfo *info)

{

}



bool postcopy_ram_supported_by_host(MigrationIncomingState *mis)

{

    error_report("%s: No OS support", __func__);

migration/trace-events

+1 −0
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ postcopy_ram_incoming_cleanup_closeuf(void) "" 
postcopy_ram_incoming_cleanup_entry(void) ""

postcopy_ram_incoming_cleanup_exit(void) ""

postcopy_ram_incoming_cleanup_join(void) ""

postcopy_ram_incoming_cleanup_blocktime(uint64_t total) "total blocktime %" PRIu64

save_xbzrle_page_skipping(void) ""

save_xbzrle_page_overflow(void) ""

ram_save_iterate_big_wait(uint64_t milliconds, int iterations) "big wait: %" PRIu64 " milliseconds, %d iterations"