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

Merge remote-tracking branch 'remotes/amit-migration/tags/migration-for-2.7-4' into staging 



Migration:

- Fixes for TLS series
- Postcopy: Add stats, fix, test case

# gpg: Signature made Thu 16 Jun 2016 05:40:09 BST
# gpg:                using RSA key 0xEB0B4DFC657EF670
# gpg: Good signature from "Amit Shah <amit@amitshah.net>"
# gpg:                 aka "Amit Shah <amit@kernel.org>"
# gpg:                 aka "Amit Shah <amitshah@gmx.net>"
# Primary key fingerprint: 48CA 3722 5FE7 F4A8 B337  2735 1E9A 3B5F 8540 83B6
#      Subkey fingerprint: CC63 D332 AB8F 4617 4529  6534 EB0B 4DFC 657E F670

* remotes/amit-migration/tags/migration-for-2.7-4:
  migration: rename functions to starting migrations
  migration: fix typos in qapi-schema from latest migration additions
  Postcopy: Check for support when setting the capability
  tests: fix libqtest socket timeouts
  test: Postcopy
  Postcopy: Add stats on page requests
  Migration: Split out ram part of qmp_query_migrate
  Postcopy: Avoid 0 length discards

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 5deaac15 22724f49

hmp.c

+4 −0
Original line number Diff line number Diff line
@@ -217,6 +217,10 @@ void hmp_info_migrate(Monitor *mon, const QDict *qdict) 
            monitor_printf(mon, "dirty pages rate: %" PRIu64 " pages\n",

                           info->ram->dirty_pages_rate);

        }

        if (info->ram->postcopy_requests) {

            monitor_printf(mon, "postcopy request count: %" PRIu64 "\n",

                           info->ram->postcopy_requests);

        }

    }



    if (info->has_disk) {

include/migration/migration.h

+15 −13
Original line number Diff line number Diff line
@@ -160,6 +160,8 @@ struct MigrationState 
    int64_t xbzrle_cache_size;

    int64_t setup_time;

    int64_t dirty_sync_count;

    /* Count of requests incoming from destination */

    int64_t postcopy_requests;



    /* Flag set once the migration has been asked to enter postcopy */

    bool start_postcopy;
@@ -181,22 +183,22 @@ struct MigrationState 


void migrate_set_state(int *state, int old_state, int new_state);



void process_incoming_migration(QEMUFile *f);

void migration_fd_process_incoming(QEMUFile *f);



void qemu_start_incoming_migration(const char *uri, Error **errp);



void migration_set_incoming_channel(MigrationState *s,

void migration_channel_process_incoming(MigrationState *s,

                                        QIOChannel *ioc);



void migration_tls_set_incoming_channel(MigrationState *s,

void migration_tls_channel_process_incoming(MigrationState *s,

                                            QIOChannel *ioc,

                                            Error **errp);



void migration_set_outgoing_channel(MigrationState *s,

void migration_channel_connect(MigrationState *s,

                               QIOChannel *ioc,

                               const char *hostname);



void migration_tls_set_outgoing_channel(MigrationState *s,

void migration_tls_channel_connect(MigrationState *s,

                                   QIOChannel *ioc,

                                   const char *hostname,

                                   Error **errp);

migration/exec.c

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ void exec_start_outgoing_migration(MigrationState *s, const char *command, Error 
        return;

    }



    migration_set_outgoing_channel(s, ioc, NULL);

    migration_channel_connect(s, ioc, NULL);

    object_unref(OBJECT(ioc));

}
@@ -46,7 +46,7 @@ static gboolean exec_accept_incoming_migration(QIOChannel *ioc, 
                                               GIOCondition condition,

                                               gpointer opaque)

{

    migration_set_incoming_channel(migrate_get_current(), ioc);

    migration_channel_process_incoming(migrate_get_current(), ioc);

    object_unref(OBJECT(ioc));

    return FALSE; /* unregister */

}

migration/fd.c

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ void fd_start_outgoing_migration(MigrationState *s, const char *fdname, Error ** 
        return;

    }



    migration_set_outgoing_channel(s, ioc, NULL);

    migration_channel_connect(s, ioc, NULL);

    object_unref(OBJECT(ioc));

}
@@ -46,7 +46,7 @@ static gboolean fd_accept_incoming_migration(QIOChannel *ioc, 
                                             GIOCondition condition,

                                             gpointer opaque)

{

    migration_set_incoming_channel(migrate_get_current(), ioc);

    migration_channel_process_incoming(migrate_get_current(), ioc);

    object_unref(OBJECT(ioc));

    return FALSE; /* unregister */

}

migration/migration.c

+47 −44
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ static void process_incoming_migration_co(void *opaque) 
    qemu_bh_schedule(mis->bh);

}



void process_incoming_migration(QEMUFile *f)

void migration_fd_process_incoming(QEMUFile *f)

{

    Coroutine *co = qemu_coroutine_create(process_incoming_migration_co);
@@ -426,7 +426,7 @@ void process_incoming_migration(QEMUFile *f) 
}





void migration_set_incoming_channel(MigrationState *s,

void migration_channel_process_incoming(MigrationState *s,

                                        QIOChannel *ioc)

{

    trace_migration_set_incoming_channel(
@@ -436,18 +436,18 @@ void migration_set_incoming_channel(MigrationState *s, 
        !object_dynamic_cast(OBJECT(ioc),

                             TYPE_QIO_CHANNEL_TLS)) {

        Error *local_err = NULL;

        migration_tls_set_incoming_channel(s, ioc, &local_err);

        migration_tls_channel_process_incoming(s, ioc, &local_err);

        if (local_err) {

            error_report_err(local_err);

        }

    } else {

        QEMUFile *f = qemu_fopen_channel_input(ioc);

        process_incoming_migration(f);

        migration_fd_process_incoming(f);

    }

}





void migration_set_outgoing_channel(MigrationState *s,

void migration_channel_connect(MigrationState *s,

                               QIOChannel *ioc,

                               const char *hostname)

{
@@ -458,7 +458,7 @@ void migration_set_outgoing_channel(MigrationState *s, 
        !object_dynamic_cast(OBJECT(ioc),

                             TYPE_QIO_CHANNEL_TLS)) {

        Error *local_err = NULL;

        migration_tls_set_outgoing_channel(s, ioc, hostname, &local_err);

        migration_tls_channel_connect(s, ioc, hostname, &local_err);

        if (local_err) {

            migrate_fd_error(s, local_err);

            error_free(local_err);
@@ -602,6 +602,26 @@ static void get_xbzrle_cache_stats(MigrationInfo *info) 
    }

}



static void populate_ram_info(MigrationInfo *info, MigrationState *s)

{

    info->has_ram = true;

    info->ram = g_malloc0(sizeof(*info->ram));

    info->ram->transferred = ram_bytes_transferred();

    info->ram->total = ram_bytes_total();

    info->ram->duplicate = dup_mig_pages_transferred();

    info->ram->skipped = skipped_mig_pages_transferred();

    info->ram->normal = norm_mig_pages_transferred();

    info->ram->normal_bytes = norm_mig_bytes_transferred();

    info->ram->mbps = s->mbps;

    info->ram->dirty_sync_count = s->dirty_sync_count;

    info->ram->postcopy_requests = s->postcopy_requests;



    if (s->state != MIGRATION_STATUS_COMPLETED) {

        info->ram->remaining = ram_bytes_remaining();

        info->ram->dirty_pages_rate = s->dirty_pages_rate;

    }

}



MigrationInfo *qmp_query_migrate(Error **errp)

{

    MigrationInfo *info = g_malloc0(sizeof(*info));
@@ -626,18 +646,7 @@ MigrationInfo *qmp_query_migrate(Error **errp) 
        info->has_setup_time = true;

        info->setup_time = s->setup_time;



        info->has_ram = true;

        info->ram = g_malloc0(sizeof(*info->ram));

        info->ram->transferred = ram_bytes_transferred();

        info->ram->remaining = ram_bytes_remaining();

        info->ram->total = ram_bytes_total();

        info->ram->duplicate = dup_mig_pages_transferred();

        info->ram->skipped = skipped_mig_pages_transferred();

        info->ram->normal = norm_mig_pages_transferred();

        info->ram->normal_bytes = norm_mig_bytes_transferred();

        info->ram->dirty_pages_rate = s->dirty_pages_rate;

        info->ram->mbps = s->mbps;

        info->ram->dirty_sync_count = s->dirty_sync_count;

        populate_ram_info(info, s);



        if (blk_mig_active()) {

            info->has_disk = true;
@@ -665,18 +674,7 @@ MigrationInfo *qmp_query_migrate(Error **errp) 
        info->has_setup_time = true;

        info->setup_time = s->setup_time;



        info->has_ram = true;

        info->ram = g_malloc0(sizeof(*info->ram));

        info->ram->transferred = ram_bytes_transferred();

        info->ram->remaining = ram_bytes_remaining();

        info->ram->total = ram_bytes_total();

        info->ram->duplicate = dup_mig_pages_transferred();

        info->ram->skipped = skipped_mig_pages_transferred();

        info->ram->normal = norm_mig_pages_transferred();

        info->ram->normal_bytes = norm_mig_bytes_transferred();

        info->ram->dirty_pages_rate = s->dirty_pages_rate;

        info->ram->mbps = s->mbps;

        info->ram->dirty_sync_count = s->dirty_sync_count;

        populate_ram_info(info, s);



        if (blk_mig_active()) {

            info->has_disk = true;
@@ -699,17 +697,7 @@ MigrationInfo *qmp_query_migrate(Error **errp) 
        info->has_setup_time = true;

        info->setup_time = s->setup_time;



        info->has_ram = true;

        info->ram = g_malloc0(sizeof(*info->ram));

        info->ram->transferred = ram_bytes_transferred();

        info->ram->remaining = 0;

        info->ram->total = ram_bytes_total();

        info->ram->duplicate = dup_mig_pages_transferred();

        info->ram->skipped = skipped_mig_pages_transferred();

        info->ram->normal = norm_mig_pages_transferred();

        info->ram->normal_bytes = norm_mig_bytes_transferred();

        info->ram->mbps = s->mbps;

        info->ram->dirty_sync_count = s->dirty_sync_count;

        populate_ram_info(info, s);

        break;

    case MIGRATION_STATUS_FAILED:

        info->has_status = true;
@@ -732,6 +720,7 @@ void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params, 
{

    MigrationState *s = migrate_get_current();

    MigrationCapabilityStatusList *cap;

    bool old_postcopy_cap = migrate_postcopy_ram();



    if (migration_is_setup_or_active(s->state)) {

        error_setg(errp, QERR_MIGRATION_ACTIVE);
@@ -754,6 +743,19 @@ void qmp_migrate_set_capabilities(MigrationCapabilityStatusList *params, 
            s->enabled_capabilities[MIGRATION_CAPABILITY_POSTCOPY_RAM] =

                false;

        }

        /* This check is reasonably expensive, so only when it's being

         * set the first time, also it's only the destination that needs

         * special support.

         */

        if (!old_postcopy_cap && runstate_check(RUN_STATE_INMIGRATE) &&

            !postcopy_ram_supported_by_host()) {

            /* postcopy_ram_supported_by_host will have emitted a more

             * detailed message

             */

            error_report("Postcopy is not supported");

            s->enabled_capabilities[MIGRATION_CAPABILITY_POSTCOPY_RAM] =

                false;

        }

    }

}
@@ -1004,6 +1006,7 @@ MigrationState *migrate_init(const MigrationParams *params) 
    s->dirty_sync_count = 0;

    s->start_postcopy = false;

    s->postcopy_after_devices = false;

    s->postcopy_requests = 0;

    s->migration_thread_running = false;

    s->last_req_rb = NULL;

    error_free(s->error);