Re: [PATCH 14/21] migration: We don't need the field rate_limit_used anymore

[Cédric Le Goater]

On 5/8/23 15:09, Juan Quintela wrote:
> Since previous commit, we calculate how much data we have send with
> migration_transferred_bytes() so no need to maintain this counter and
> remember to always update it.
>
> Signed-off-by: Juan Quintela <quintela@redhat.com>



Reviewed-by: Cédric Le Goater <clg@kaod.org>

Thanks,

C.


> ---
>   migration/migration-stats.c |  6 ------
>   migration/migration-stats.h | 14 --------------
>   migration/multifd.c         |  1 -
>   migration/qemu-file.c       |  4 ----
>   4 files changed, 25 deletions(-)
>
> diff --git a/migration/migration-stats.c b/migration/migration-stats.c
> index eb1a2c1ad4..a42b5d953e 100644
> --- a/migration/migration-stats.c
> +++ b/migration/migration-stats.c
> @@ -59,15 +59,9 @@ void migration_rate_limit_set(uint64_t limit)
>   
>   void migration_rate_limit_reset(QEMUFile *f)
>   {
> -    stat64_set(&mig_stats.rate_limit_used, 0);
>       stat64_set(&mig_stats.rate_limit_start, migration_transferred_bytes(f));
>   }
>   
> -void migration_rate_limit_account(uint64_t len)
> -{
> -    stat64_add(&mig_stats.rate_limit_used, len);
> -}
> -
>   uint64_t migration_transferred_bytes(QEMUFile *f)
>   {
>       uint64_t multifd = stat64_get(&mig_stats.multifd_bytes);
> diff --git a/migration/migration-stats.h b/migration/migration-stats.h
> index 4029f1deab..ab4cc15a74 100644
> --- a/migration/migration-stats.h
> +++ b/migration/migration-stats.h
> @@ -77,10 +77,6 @@ typedef struct {
>        * Maximum amount of data we can send in a cycle.
>        */
>       Stat64 rate_limit_max;
> -    /*
> -     * Amount of data we have sent in the current cycle.
> -     */
> -    Stat64 rate_limit_used;
>       /*
>        * How long has the setup stage took.
>        */
> @@ -108,16 +104,6 @@ extern MigrationAtomicStats mig_stats;
>   
>   void calculate_time_since(Stat64 *val, int64_t since);
>   
> -/**
> - * migration_rate_limit_account: Increase the number of bytes transferred.
> - *
> - * Report on a number of bytes the have been transferred that need to
> - * be applied to the rate limiting calcuations.
> - *
> - * @len: amount of bytes transferred
> - */
> -void migration_rate_limit_account(uint64_t len);
> -
>   /**
>    * migration_rate_limit_get: Get the maximum amount that can be transferred.
>    *
> diff --git a/migration/multifd.c b/migration/multifd.c
> index 2efb313be4..9d2ade7abc 100644
> --- a/migration/multifd.c
> +++ b/migration/multifd.c
> @@ -432,7 +432,6 @@ static int multifd_send_pages(QEMUFile *f)
>       multifd_send_state->pages = p->pages;
>       p->pages = pages;
>       transferred = ((uint64_t) pages->num) * p->page_size + p->packet_len;
> -    migration_rate_limit_account(transferred);
>       qemu_mutex_unlock(&p->mutex);
>       stat64_add(&mig_stats.transferred, transferred);
>       stat64_add(&mig_stats.multifd_bytes, transferred);
> diff --git a/migration/qemu-file.c b/migration/qemu-file.c
> index 3f993e24af..0086d67d83 100644
> --- a/migration/qemu-file.c
> +++ b/migration/qemu-file.c
> @@ -292,7 +292,6 @@ void qemu_fflush(QEMUFile *f)
>               qemu_file_set_error_obj(f, -EIO, local_error);
>           } else {
>               uint64_t size = iov_size(f->iov, f->iovcnt);
> -            migration_rate_limit_account(size);
>               f->total_transferred += size;
>           }
>   
> @@ -344,9 +343,6 @@ size_t ram_control_save_page(QEMUFile *f, ram_addr_t block_offset,
>       if (f->hooks && f->hooks->save_page) {
>           int ret = f->hooks->save_page(f, block_offset,
>                                         offset, size, bytes_sent);
> -        if (ret != RAM_SAVE_CONTROL_NOT_SUPP) {
> -            migration_rate_limit_account(size);
> -        }
>   
>           if (ret != RAM_SAVE_CONTROL_DELAYED &&
>               ret != RAM_SAVE_CONTROL_NOT_SUPP) {