Commit 1626fee3 authored by Jason J. Herne's avatar Jason J. Herne Committed by Juan Quintela
Browse files

migration: Parameters for auto-converge cpu throttling 



Add migration parameters to allow the user to adjust the parameters
that control cpu throttling when auto-converge is in effect. The added
parameters are as follows:

x-cpu-throttle-initial : Initial percantage of time guest cpus are throttled
when migration auto-converge is activated.

x-cpu-throttle-increment: throttle percantage increase each time
auto-converge detects that migration is not making progress.

Signed-off-by: default avatarJason J. Herne <jjherne@linux.vnet.ibm.com>
Reviewed-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Reviewed-by: default avatarJuan Quintela <quintela@redhat.com>
parent 2adcc85d

hmp.c

+16 −0
Original line number Diff line number Diff line
@@ -272,6 +272,12 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict) 
        monitor_printf(mon, " %s: %" PRId64,

            MigrationParameter_lookup[MIGRATION_PARAMETER_DECOMPRESS_THREADS],

            params->decompress_threads);

        monitor_printf(mon, " %s: %" PRId64,

            MigrationParameter_lookup[MIGRATION_PARAMETER_X_CPU_THROTTLE_INITIAL],

            params->x_cpu_throttle_initial);

        monitor_printf(mon, " %s: %" PRId64,

            MigrationParameter_lookup[MIGRATION_PARAMETER_X_CPU_THROTTLE_INCREMENT],

            params->x_cpu_throttle_increment);

        monitor_printf(mon, "\n");

    }
@@ -1221,6 +1227,8 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict) 
    bool has_compress_level = false;

    bool has_compress_threads = false;

    bool has_decompress_threads = false;

    bool has_x_cpu_throttle_initial = false;

    bool has_x_cpu_throttle_increment = false;

    int i;



    for (i = 0; i < MIGRATION_PARAMETER_MAX; i++) {
@@ -1235,10 +1243,18 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict) 
            case MIGRATION_PARAMETER_DECOMPRESS_THREADS:

                has_decompress_threads = true;

                break;

            case MIGRATION_PARAMETER_X_CPU_THROTTLE_INITIAL:

                has_x_cpu_throttle_initial = true;

                break;

            case MIGRATION_PARAMETER_X_CPU_THROTTLE_INCREMENT:

                has_x_cpu_throttle_increment = true;

                break;

            }

            qmp_migrate_set_parameters(has_compress_level, value,

                                       has_compress_threads, value,

                                       has_decompress_threads, value,

                                       has_x_cpu_throttle_initial, value,

                                       has_x_cpu_throttle_increment, value,

                                       &err);

            break;

        }

migration/migration.c

+45 −1
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ 
#define DEFAULT_MIGRATE_DECOMPRESS_THREAD_COUNT 2

/*0: means nocompress, 1: best speed, ... 9: best compress ratio */

#define DEFAULT_MIGRATE_COMPRESS_LEVEL 1

/* Define default autoconverge cpu throttle migration parameters */

#define DEFAULT_MIGRATE_X_CPU_THROTTLE_INITIAL 20

#define DEFAULT_MIGRATE_X_CPU_THROTTLE_INCREMENT 10



/* Migration XBZRLE default cache size */

#define DEFAULT_MIGRATE_CACHE_SIZE (64 * 1024 * 1024)
@@ -71,6 +74,10 @@ MigrationState *migrate_get_current(void) 
                DEFAULT_MIGRATE_COMPRESS_THREAD_COUNT,

        .parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS] =

                DEFAULT_MIGRATE_DECOMPRESS_THREAD_COUNT,

        .parameters[MIGRATION_PARAMETER_X_CPU_THROTTLE_INITIAL] =

                DEFAULT_MIGRATE_X_CPU_THROTTLE_INITIAL,

        .parameters[MIGRATION_PARAMETER_X_CPU_THROTTLE_INCREMENT] =

                DEFAULT_MIGRATE_X_CPU_THROTTLE_INCREMENT,

    };



    return &current_migration;
@@ -372,6 +379,10 @@ MigrationParameters *qmp_query_migrate_parameters(Error **errp) 
            s->parameters[MIGRATION_PARAMETER_COMPRESS_THREADS];

    params->decompress_threads =

            s->parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS];

    params->x_cpu_throttle_initial =

            s->parameters[MIGRATION_PARAMETER_X_CPU_THROTTLE_INITIAL];

    params->x_cpu_throttle_increment =

            s->parameters[MIGRATION_PARAMETER_X_CPU_THROTTLE_INCREMENT];



    return params;

}
@@ -494,7 +505,11 @@ void qmp_migrate_set_parameters(bool has_compress_level, 
                                bool has_compress_threads,

                                int64_t compress_threads,

                                bool has_decompress_threads,

                                int64_t decompress_threads, Error **errp)

                                int64_t decompress_threads,

                                bool has_x_cpu_throttle_initial,

                                int64_t x_cpu_throttle_initial,

                                bool has_x_cpu_throttle_increment,

                                int64_t x_cpu_throttle_increment, Error **errp)

{

    MigrationState *s = migrate_get_current();
@@ -517,6 +532,18 @@ void qmp_migrate_set_parameters(bool has_compress_level, 
                   "is invalid, it should be in the range of 1 to 255");

        return;

    }

    if (has_x_cpu_throttle_initial &&

            (x_cpu_throttle_initial < 1 || x_cpu_throttle_initial > 99)) {

        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,

                   "x_cpu_throttle_initial",

                   "an integer in the range of 1 to 99");

    }

    if (has_x_cpu_throttle_increment &&

            (x_cpu_throttle_increment < 1 || x_cpu_throttle_increment > 99)) {

        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,

                   "x_cpu_throttle_increment",

                   "an integer in the range of 1 to 99");

    }



    if (has_compress_level) {

        s->parameters[MIGRATION_PARAMETER_COMPRESS_LEVEL] = compress_level;
@@ -528,6 +555,15 @@ void qmp_migrate_set_parameters(bool has_compress_level, 
        s->parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS] =

                                                    decompress_threads;

    }

    if (has_x_cpu_throttle_initial) {

        s->parameters[MIGRATION_PARAMETER_X_CPU_THROTTLE_INITIAL] =

                                                    x_cpu_throttle_initial;

    }



    if (has_x_cpu_throttle_increment) {

        s->parameters[MIGRATION_PARAMETER_X_CPU_THROTTLE_INCREMENT] =

                                                    x_cpu_throttle_increment;

    }

}



/* shared migration helpers */
@@ -643,6 +679,10 @@ static MigrationState *migrate_init(const MigrationParams *params) 
            s->parameters[MIGRATION_PARAMETER_COMPRESS_THREADS];

    int decompress_thread_count =

            s->parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS];

    int x_cpu_throttle_initial =

            s->parameters[MIGRATION_PARAMETER_X_CPU_THROTTLE_INITIAL];

    int x_cpu_throttle_increment =

            s->parameters[MIGRATION_PARAMETER_X_CPU_THROTTLE_INCREMENT];



    memcpy(enabled_capabilities, s->enabled_capabilities,

           sizeof(enabled_capabilities));
@@ -658,6 +698,10 @@ static MigrationState *migrate_init(const MigrationParams *params) 
               compress_thread_count;

    s->parameters[MIGRATION_PARAMETER_DECOMPRESS_THREADS] =

               decompress_thread_count;

    s->parameters[MIGRATION_PARAMETER_X_CPU_THROTTLE_INITIAL] =

                x_cpu_throttle_initial;

    s->parameters[MIGRATION_PARAMETER_X_CPU_THROTTLE_INCREMENT] =

                x_cpu_throttle_increment;

    s->bandwidth_limit = bandwidth_limit;

    migrate_set_state(s, MIGRATION_STATUS_NONE, MIGRATION_STATUS_SETUP);

qapi-schema.json

+30 −3
Original line number Diff line number Diff line
@@ -596,10 +596,18 @@ 
#          compression, so set the decompress-threads to the number about 1/4

#          of compress-threads is adequate.

#

# @x-cpu-throttle-initial: Initial percentage of time guest cpus are throttled

#                          when migration auto-converge is activated. The

#                          default value is 20. (Since 2.5)

#

# @x-cpu-throttle-increment: throttle percentage increase each time

#                            auto-converge detects that migration is not making

#                            progress. The default value is 10. (Since 2.5)

# Since: 2.4

##

{ 'enum': 'MigrationParameter',

  'data': ['compress-level', 'compress-threads', 'decompress-threads'] }

  'data': ['compress-level', 'compress-threads', 'decompress-threads',

           'x-cpu-throttle-initial', 'x-cpu-throttle-increment'] }



#

# @migrate-set-parameters
@@ -612,12 +620,21 @@ 
#

# @decompress-threads: decompression thread count

#

# @x-cpu-throttle-initial: Initial percentage of time guest cpus are throttled

#                          when migration auto-converge is activated. The

#                          default value is 20. (Since 2.5)

#

# @x-cpu-throttle-increment: throttle percentage increase each time

#                            auto-converge detects that migration is not making

#                            progress. The default value is 10. (Since 2.5)

# Since: 2.4

##

{ 'command': 'migrate-set-parameters',

  'data': { '*compress-level': 'int',

            '*compress-threads': 'int',

            '*decompress-threads': 'int'} }

            '*decompress-threads': 'int',

            '*x-cpu-throttle-initial': 'int',

            '*x-cpu-throttle-increment': 'int'} }



#

# @MigrationParameters
@@ -628,12 +645,22 @@ 
#

# @decompress-threads: decompression thread count

#

# @x-cpu-throttle-initial: Initial percentage of time guest cpus are throttled

#                          when migration auto-converge is activated. The

#                          default value is 20. (Since 2.5)

#

# @x-cpu-throttle-increment: throttle percentage increase each time

#                            auto-converge detects that migration is not making

#                            progress. The default value is 10. (Since 2.5)

#

# Since: 2.4

##

{ 'struct': 'MigrationParameters',

  'data': { 'compress-level': 'int',

            'compress-threads': 'int',

            'decompress-threads': 'int'} }

            'decompress-threads': 'int',

            'x-cpu-throttle-initial': 'int',

            'x-cpu-throttle-increment': 'int'} }

##

# @query-migrate-parameters

#