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

migration: Create x-multifd-page-count parameter 



Indicates how many pages we are going to send in each batch to a multifd
thread.

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

--

Be consistent with defaults and documentation
Use new DEFINE_PROP_*
Rename x-multifd-group to x-multifd-page-count
parent 4075fb1c

hmp.c

+7 −0
Original line number Diff line number Diff line
@@ -339,6 +339,9 @@ void hmp_info_migrate_parameters(Monitor *mon, const QDict *qdict) 
        monitor_printf(mon, "%s: %" PRId64 "\n",

            MigrationParameter_str(MIGRATION_PARAMETER_X_MULTIFD_CHANNELS),

            params->x_multifd_channels);

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

            MigrationParameter_str(MIGRATION_PARAMETER_X_MULTIFD_PAGE_COUNT),

            params->x_multifd_page_count);

    }



    qapi_free_MigrationParameters(params);
@@ -1628,6 +1631,10 @@ void hmp_migrate_set_parameter(Monitor *mon, const QDict *qdict) 
        p->has_x_multifd_channels = true;

        visit_type_int(v, param, &p->x_multifd_channels, &err);

        break;

    case MIGRATION_PARAMETER_X_MULTIFD_PAGE_COUNT:

        p->has_x_multifd_page_count = true;

        visit_type_int(v, param, &p->x_multifd_page_count, &err);

        break;

    default:

        assert(0);

    }

migration/migration.c

+27 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ 
 */

#define DEFAULT_MIGRATE_X_CHECKPOINT_DELAY 200

#define DEFAULT_MIGRATE_MULTIFD_CHANNELS 2

#define DEFAULT_MIGRATE_MULTIFD_PAGE_COUNT 16



static NotifierList migration_state_notifiers =

    NOTIFIER_LIST_INITIALIZER(migration_state_notifiers);
@@ -484,6 +485,8 @@ MigrationParameters *qmp_query_migrate_parameters(Error **errp) 
    params->block_incremental = s->parameters.block_incremental;

    params->has_x_multifd_channels = true;

    params->x_multifd_channels = s->parameters.x_multifd_channels;

    params->has_x_multifd_page_count = true;

    params->x_multifd_page_count = s->parameters.x_multifd_page_count;



    return params;

}
@@ -772,6 +775,14 @@ static bool migrate_params_check(MigrationParameters *params, Error **errp) 
                   "is invalid, it should be in the range of 1 to 255");

        return false;

    }

    if (params->has_x_multifd_page_count &&

            (params->x_multifd_page_count < 1 ||

             params->x_multifd_page_count > 10000)) {

        error_setg(errp, QERR_INVALID_PARAMETER_VALUE,

                   "multifd_page_count",

                   "is invalid, it should be in the range of 1 to 10000");

        return false;

    }



    return true;

}
@@ -893,6 +904,9 @@ static void migrate_params_apply(MigrateSetParameters *params) 
    if (params->has_x_multifd_channels) {

        s->parameters.x_multifd_channels = params->x_multifd_channels;

    }

    if (params->has_x_multifd_page_count) {

        s->parameters.x_multifd_page_count = params->x_multifd_page_count;

    }

}



void qmp_migrate_set_parameters(MigrateSetParameters *params, Error **errp)
@@ -1480,6 +1494,15 @@ int migrate_multifd_channels(void) 
    return s->parameters.x_multifd_channels;

}



int migrate_multifd_page_count(void)

{

    MigrationState *s;



    s = migrate_get_current();



    return s->parameters.x_multifd_page_count;

}



int migrate_use_xbzrle(void)

{

    MigrationState *s;
@@ -2248,6 +2271,9 @@ static Property migration_properties[] = { 
    DEFINE_PROP_INT64("x-multifd-channels", MigrationState,

                      parameters.x_multifd_channels,

                      DEFAULT_MIGRATE_MULTIFD_CHANNELS),

    DEFINE_PROP_INT64("x-multifd-page-count", MigrationState,

                      parameters.x_multifd_page_count,

                      DEFAULT_MIGRATE_MULTIFD_PAGE_COUNT),



    /* Migration capabilities */

    DEFINE_PROP_MIG_CAP("x-xbzrle", MIGRATION_CAPABILITY_XBZRLE),
@@ -2306,6 +2332,7 @@ static void migration_instance_init(Object *obj) 
    params->has_x_checkpoint_delay = true;

    params->has_block_incremental = true;

    params->has_x_multifd_channels = true;

    params->has_x_multifd_page_count = true;

}



/*

migration/migration.h

+1 −0
Original line number Diff line number Diff line
@@ -176,6 +176,7 @@ bool migrate_zero_blocks(void); 
bool migrate_auto_converge(void);

bool migrate_use_multifd(void);

int migrate_multifd_channels(void);

int migrate_multifd_page_count(void);



int migrate_use_xbzrle(void);

int64_t migrate_xbzrle_cache_size(void);

qapi/migration.json

+14 −3
Original line number Diff line number Diff line
@@ -471,6 +471,9 @@ 
#                     number of sockets used for migration.  The

#                     default value is 2 (since 2.11)

#

# @x-multifd-page-count: Number of pages sent together to a thread

#                        The default value is 16 (since 2.11)

#

# Since: 2.4

##

{ 'enum': 'MigrationParameter',
@@ -478,7 +481,7 @@ 
           'cpu-throttle-initial', 'cpu-throttle-increment',

           'tls-creds', 'tls-hostname', 'max-bandwidth',

           'downtime-limit', 'x-checkpoint-delay', 'block-incremental',

           'x-multifd-channels'] }

           'x-multifd-channels', 'x-multifd-page-count' ] }



##

# @MigrateSetParameters:
@@ -539,6 +542,9 @@ 
#                     number of sockets used for migration.  The

#                     default value is 2 (since 2.11)

#

# @x-multifd-page-count: Number of pages sent together to a thread

#                        The default value is 16 (since 2.11)

#

# Since: 2.4

##

# TODO either fuse back into MigrationParameters, or make
@@ -555,7 +561,8 @@ 
            '*downtime-limit': 'int',

            '*x-checkpoint-delay': 'int',

            '*block-incremental': 'bool',

            '*x-multifd-channels': 'int' } }

            '*x-multifd-channels': 'int',

            '*x-multifd-page-count': 'int' } }



##

# @migrate-set-parameters:
@@ -631,6 +638,9 @@ 
#                     number of sockets used for migration.

#                     The default value is 2 (since 2.11)

#

# @x-multifd-page-count: Number of pages sent together to a thread

#                        The default value is 16 (since 2.11)

#

# Since: 2.4

##

{ 'struct': 'MigrationParameters',
@@ -645,7 +655,8 @@ 
            '*downtime-limit': 'int',

            '*x-checkpoint-delay': 'int',

            '*block-incremental': 'bool' ,

            '*x-multifd-channels': 'int' } }

            '*x-multifd-channels': 'int',

            '*x-multifd-page-count': 'int' } }



##

# @query-migrate-parameters: