Message ID | 20230515195709.63843-10-quintela@redhat.com |
---|---|
State | Handled Elsewhere |
Headers | show |
Series | Migration: More migration atomic counters | expand |
On Mon, 2023-05-15 at 21:57 +0200, 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> > --- > migration/migration-stats.h | 14 -------------- > migration/migration-stats.c | 6 ------ > migration/multifd.c | 1 - > migration/qemu-file.c | 4 ---- > 4 files changed, 25 deletions(-) > > diff --git a/migration/migration-stats.h b/migration/migration-stats.h > index f1465c2ebe..9568b5b473 100644 > --- a/migration/migration-stats.h > +++ b/migration/migration-stats.h > @@ -89,10 +89,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. > */ > @@ -119,16 +115,6 @@ extern MigrationAtomicStats mig_stats; > */ > void migration_time_since(MigrationAtomicStats *stats, int64_t since); > > -/** > - * migration_rate_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_account(uint64_t len); > - > /** > * migration_rate_get: Get the maximum amount that can be transferred. > * > diff --git a/migration/migration-stats.c b/migration/migration-stats.c > index da2bb69a15..abf2d38b18 100644 > --- a/migration/migration-stats.c > +++ b/migration/migration-stats.c > @@ -62,15 +62,9 @@ void migration_rate_set(uint64_t limit) > > void migration_rate_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_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/multifd.c b/migration/multifd.c > index 5052091ce2..aabf9b6d98 100644 > --- a/migration/multifd.c > +++ b/migration/multifd.c > @@ -431,7 +431,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_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 9c67b52fe0..acc282654a 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_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_account(size); > - } > > if (ret != RAM_SAVE_CONTROL_DELAYED && > ret != RAM_SAVE_CONTROL_NOT_SUPP) { I reviewed this one together with 8/16. It makes sense for me to squash them together, but anyway: Reviewed-by: Leonardo Bras <leobras@redhat.com>
Leonardo Brás <leobras@redhat.com> wrote: > On Mon, 2023-05-15 at 21:57 +0200, 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> > I reviewed this one together with 8/16. > It makes sense for me to squash them together, but anyway: Already in tree. See explanation for the split on previous patch. The other reason for the split is that this part of the patch is trivial to review O:-) Later, Juan. > > Reviewed-by: Leonardo Bras <leobras@redhat.com>
On Fri, May 26, 2023 at 5:18 AM Juan Quintela <quintela@redhat.com> wrote: > > Leonardo Brás <leobras@redhat.com> wrote: > > On Mon, 2023-05-15 at 21:57 +0200, 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> > > > I reviewed this one together with 8/16. > > It makes sense for me to squash them together, but anyway: > > Already in tree. > > See explanation for the split on previous patch. > > The other reason for the split is that this part of the patch is trivial > to review O:-) :-) > > Later, Juan. > > > > > Reviewed-by: Leonardo Bras <leobras@redhat.com> >
diff --git a/migration/migration-stats.h b/migration/migration-stats.h index f1465c2ebe..9568b5b473 100644 --- a/migration/migration-stats.h +++ b/migration/migration-stats.h @@ -89,10 +89,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. */ @@ -119,16 +115,6 @@ extern MigrationAtomicStats mig_stats; */ void migration_time_since(MigrationAtomicStats *stats, int64_t since); -/** - * migration_rate_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_account(uint64_t len); - /** * migration_rate_get: Get the maximum amount that can be transferred. * diff --git a/migration/migration-stats.c b/migration/migration-stats.c index da2bb69a15..abf2d38b18 100644 --- a/migration/migration-stats.c +++ b/migration/migration-stats.c @@ -62,15 +62,9 @@ void migration_rate_set(uint64_t limit) void migration_rate_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_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/multifd.c b/migration/multifd.c index 5052091ce2..aabf9b6d98 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -431,7 +431,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_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 9c67b52fe0..acc282654a 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_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_account(size); - } if (ret != RAM_SAVE_CONTROL_DELAYED && ret != RAM_SAVE_CONTROL_NOT_SUPP) {