Re: [PATCH v5 7/8] multifd: Add multifd-zstd-level parameter

[Dr. David Alan Gilbert]

* Juan Quintela (address@hidden) wrote:
> Signed-off-by: Juan Quintela <address@hidden>
> ---
>  migration/migration.c | 15 +++++++++++++++
>  monitor/hmp-cmds.c    |  4 ++++
>  qapi/migration.json   | 29 ++++++++++++++++++++++++++---
>  3 files changed, 45 insertions(+), 3 deletions(-)
> 
> diff --git a/migration/migration.c b/migration/migration.c
> index 3b081e8147..b690500545 100644
> --- a/migration/migration.c
> +++ b/migration/migration.c
> @@ -91,6 +91,8 @@
>  #define DEFAULT_MIGRATE_MULTIFD_METHOD MULTIFD_METHOD_NONE
>  /*0: means nocompress, 1: best speed, ... 9: best compress ratio */
>  #define DEFAULT_MIGRATE_MULTIFD_ZLIB_LEVEL 1
> +/* 0: means nocompress, 1: best speed, ... 20: best compress ratio */
> +#define DEFAULT_MIGRATE_MULTIFD_ZSTD_LEVEL 1
>  
>  /* Background transfer rate for postcopy, 0 means unlimited, note
>   * that page requests can still exceed this limit.
> @@ -805,6 +807,8 @@ MigrationParameters *qmp_query_migrate_parameters(Error 
> **errp)
>      params->multifd_method = s->parameters.multifd_method;
>      params->has_multifd_zlib_level = true;
>      params->multifd_zlib_level = s->parameters.multifd_zlib_level;
> +    params->has_multifd_zstd_level = true;
> +    params->multifd_zstd_level = s->parameters.multifd_zstd_level;

Do we really want different 'multifd_...._level's or just one
'multifd_compress_level' - or even just reuse the existing
'compress-level' parameter.

The only tricky thing about combining them is how to handle
the difference in allowed ranges;  When would the right time be
to check it?

Markus/Eric: Any idea?

Dave

>      params->has_xbzrle_cache_size = true;
>      params->xbzrle_cache_size = s->parameters.xbzrle_cache_size;
>      params->has_max_postcopy_bandwidth = true;
> @@ -1219,6 +1223,13 @@ static bool migrate_params_check(MigrationParameters 
> *params, Error **errp)
>          return false;
>      }
>  
> +    if (params->has_multifd_zstd_level &&
> +        (params->multifd_zstd_level > 20)) {
> +        error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "multifd_zstd_level",
> +                   "is invalid, it should be in the range of 0 to 20");
> +        return false;
> +    }
> +
>      if (params->has_xbzrle_cache_size &&
>          (params->xbzrle_cache_size < qemu_target_page_size() ||
>           !is_power_of_2(params->xbzrle_cache_size))) {
> @@ -3559,6 +3570,9 @@ static Property migration_properties[] = {
>      DEFINE_PROP_UINT8("multifd-zlib-level", MigrationState,
>                        parameters.multifd_zlib_level,
>                        DEFAULT_MIGRATE_MULTIFD_ZLIB_LEVEL),
> +    DEFINE_PROP_UINT8("multifd-zstd-level", MigrationState,
> +                      parameters.multifd_zstd_level,
> +                      DEFAULT_MIGRATE_MULTIFD_ZSTD_LEVEL),
>      DEFINE_PROP_SIZE("xbzrle-cache-size", MigrationState,
>                        parameters.xbzrle_cache_size,
>                        DEFAULT_MIGRATE_XBZRLE_CACHE_SIZE),
> @@ -3651,6 +3665,7 @@ static void migration_instance_init(Object *obj)
>      params->has_multifd_channels = true;
>      params->has_multifd_method = true;
>      params->has_multifd_zlib_level = true;
> +    params->has_multifd_zstd_level = true;
>      params->has_xbzrle_cache_size = true;
>      params->has_max_postcopy_bandwidth = true;
>      params->has_max_cpu_throttle = true;
> diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
> index 7f11866446..87db07694b 100644
> --- a/monitor/hmp-cmds.c
> +++ b/monitor/hmp-cmds.c
> @@ -1840,6 +1840,10 @@ void hmp_migrate_set_parameter(Monitor *mon, const 
> QDict *qdict)
>          p->has_multifd_zlib_level = true;
>          visit_type_int(v, param, &p->multifd_zlib_level, &err);
>          break;
> +    case MIGRATION_PARAMETER_MULTIFD_ZSTD_LEVEL:
> +        p->has_multifd_zstd_level = true;
> +        visit_type_int(v, param, &p->multifd_zstd_level, &err);
> +        break;
>      case MIGRATION_PARAMETER_XBZRLE_CACHE_SIZE:
>          p->has_xbzrle_cache_size = true;
>          visit_type_size(v, param, &cache_size, &err);
> diff --git a/qapi/migration.json b/qapi/migration.json
> index 032ee7d3e6..bb5cb6b4f4 100644
> --- a/qapi/migration.json
> +++ b/qapi/migration.json
> @@ -610,6 +610,13 @@
>  #          will consume more CPU.
>  #          Defaults to 1. (Since 5.0)
>  #
> +# @multifd-zstd-level: Set the compression level to be used in live
> +#          migration, the compression level is an integer between 0
> +#          and 20, where 0 means no compression, 1 means the best
> +#          compression speed, and 20 means best compression ratio which
> +#          will consume more CPU.
> +#          Defaults to 1. (Since 5.0)
> +#
>  # Since: 2.4
>  ##
>  { 'enum': 'MigrationParameter',
> @@ -623,7 +630,7 @@
>             'multifd-channels',
>             'xbzrle-cache-size', 'max-postcopy-bandwidth',
>             'max-cpu-throttle', 'multifd-method',
> -           'multifd-zlib-level' ] }
> +           'multifd-zlib-level' ,'multifd-zstd-level' ] }
>  
>  ##
>  # @MigrateSetParameters:
> @@ -723,6 +730,13 @@
>  #          will consume more CPU.
>  #          Defaults to 1. (Since 5.0)
>  #
> +# @multifd-zstd-level: Set the compression level to be used in live
> +#          migration, the compression level is an integer between 0
> +#          and 20, where 0 means no compression, 1 means the best
> +#          compression speed, and 20 means best compression ratio which
> +#          will consume more CPU.
> +#          Defaults to 1. (Since 5.0)
> +#
>  # Since: 2.4
>  ##
>  # TODO either fuse back into MigrationParameters, or make
> @@ -750,7 +764,8 @@
>              '*max-postcopy-bandwidth': 'size',
>              '*max-cpu-throttle': 'int',
>              '*multifd-method': 'MultiFDMethod',
> -            '*multifd-zlib-level': 'int' } }
> +            '*multifd-zlib-level': 'int',
> +            '*multifd-zstd-level': 'int' } }
>  
>  ##
>  # @migrate-set-parameters:
> @@ -870,6 +885,13 @@
>  #          will consume more CPU.
>  #          Defaults to 1. (Since 5.0)
>  #
> +# @multifd-zstd-level: Set the compression level to be used in live
> +#          migration, the compression level is an integer between 0
> +#          and 20, where 0 means no compression, 1 means the best
> +#          compression speed, and 20 means best compression ratio which
> +#          will consume more CPU.
> +#          Defaults to 1. (Since 5.0)
> +#
>  # Since: 2.4
>  ##
>  { 'struct': 'MigrationParameters',
> @@ -895,7 +917,8 @@
>           '*max-postcopy-bandwidth': 'size',
>              '*max-cpu-throttle': 'uint8',
>              '*multifd-method': 'MultiFDMethod',
> -            '*multifd-zlib-level': 'uint8' } }
> +            '*multifd-zlib-level': 'uint8',
> +            '*multifd-zstd-level': 'uint8' } }
>  
>  ##
>  # @query-migrate-parameters:
> -- 
> 2.24.1
> 
--
Dr. David Alan Gilbert / address@hidden / Manchester, UK