Message ID | 1434450415-11339-21-git-send-email-dgilbert@redhat.com |
---|---|
State | New |
Headers | show |
"Dr. David Alan Gilbert (git)" <dgilbert@redhat.com> wrote: > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > Modify save_live_pending to return separate postcopiable and > non-postcopiable counts. > > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> I think that if you make a small change of meaning, everything gots easier: > -static uint64_t block_save_pending(QEMUFile *f, void *opaque, uint64_t max_size) > +static void block_save_pending(QEMUFile *f, void *opaque, uint64_t max_size, > + uint64_t *non_postcopiable_pending, > + uint64_t *postcopiable_pending) > { > /* Estimate pending number of bytes to send */ > uint64_t pending; > @@ -773,7 +775,8 @@ static uint64_t block_save_pending(QEMUFile *f, void *opaque, uint64_t max_size) > qemu_mutex_unlock_iothread(); > > DPRINTF("Enter save live pending %" PRIu64 "\n", pending); > - return pending; > + *non_postcopiable_pending = pending; > + *postcopiable_pending = 0; Change that two lines to: *non_postcopiable_pending += pending; *postcopiable_pending += 0; /* ok, equivalent of doing nothing */ This way, chaining gots easier? > diff --git a/migration/savevm.c b/migration/savevm.c > index 2c4cbe1..ebd3d31 100644 > --- a/migration/savevm.c > +++ b/migration/savevm.c > @@ -1012,10 +1012,20 @@ void qemu_savevm_state_complete_precopy(QEMUFile *f) > qemu_fflush(f); > } > > -uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size) > +/* Give an estimate of the amount left to be transferred, > + * the result is split into the amount for units that can and > + * for units that can't do postcopy. > + */ > +void qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size, > + uint64_t *res_non_postcopiable, > + uint64_t *res_postcopiable) > { > SaveStateEntry *se; > - uint64_t ret = 0; > + uint64_t tmp_non_postcopiable, tmp_postcopiable; > + > + *res_non_postcopiable = 0; > + *res_postcopiable = 0; > + > > QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { > if (!se->ops || !se->ops->save_live_pending) { > @@ -1026,9 +1036,12 @@ uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size) > continue; > } > } > - ret += se->ops->save_live_pending(f, se->opaque, max_size); > + se->ops->save_live_pending(f, se->opaque, max_size, > + &tmp_non_postcopiable, &tmp_postcopiable); > + > + *res_postcopiable += tmp_postcopiable; > + *res_non_postcopiable += tmp_non_postcopiable; > } > - return ret; With the change, we don't care in the other functions, and this one gets simpler IMHO.
On (Tue) 16 Jun 2015 [11:26:33], Dr. David Alan Gilbert (git) wrote: > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > Modify save_live_pending to return separate postcopiable and > non-postcopiable counts. > > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Reviewed-by: Amit Shah <amit.shah@redhat.com> Amit
* Juan Quintela (quintela@redhat.com) wrote: > "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com> wrote: > > From: "Dr. David Alan Gilbert" <dgilbert@redhat.com> > > > > Modify save_live_pending to return separate postcopiable and > > non-postcopiable counts. > > > > Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > > Reviewed-by: Juan Quintela <quintela@redhat.com> Thanks, > I think that if you make a small change of meaning, everything gots easier: > > > -static uint64_t block_save_pending(QEMUFile *f, void *opaque, uint64_t max_size) > > +static void block_save_pending(QEMUFile *f, void *opaque, uint64_t max_size, > > + uint64_t *non_postcopiable_pending, > > + uint64_t *postcopiable_pending) > > { > > /* Estimate pending number of bytes to send */ > > uint64_t pending; > > @@ -773,7 +775,8 @@ static uint64_t block_save_pending(QEMUFile *f, void *opaque, uint64_t max_size) > > qemu_mutex_unlock_iothread(); > > > > DPRINTF("Enter save live pending %" PRIu64 "\n", pending); > > - return pending; > > + *non_postcopiable_pending = pending; > > + *postcopiable_pending = 0; > > Change that two lines to: > > *non_postcopiable_pending += pending; > *postcopiable_pending += 0; /* ok, equivalent of doing nothing */ > > This way, chaining gots easier? OK, done; I did it as: + /* We can do postcopy, and all the data is postcopiable */ + *postcopiable_pending += remaining_size; rather than having the odd += 0; > > diff --git a/migration/savevm.c b/migration/savevm.c > > index 2c4cbe1..ebd3d31 100644 > > --- a/migration/savevm.c > > +++ b/migration/savevm.c > > @@ -1012,10 +1012,20 @@ void qemu_savevm_state_complete_precopy(QEMUFile *f) > > qemu_fflush(f); > > } > > > > -uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size) > > +/* Give an estimate of the amount left to be transferred, > > + * the result is split into the amount for units that can and > > + * for units that can't do postcopy. > > + */ > > +void qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size, > > + uint64_t *res_non_postcopiable, > > + uint64_t *res_postcopiable) > > { > > SaveStateEntry *se; > > - uint64_t ret = 0; > > + uint64_t tmp_non_postcopiable, tmp_postcopiable; > > + > > + *res_non_postcopiable = 0; > > + *res_postcopiable = 0; > > + > > > > QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { > > if (!se->ops || !se->ops->save_live_pending) { > > @@ -1026,9 +1036,12 @@ uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size) > > continue; > > } > > } > > - ret += se->ops->save_live_pending(f, se->opaque, max_size); > > + se->ops->save_live_pending(f, se->opaque, max_size, > > + &tmp_non_postcopiable, &tmp_postcopiable); > > + > > + *res_postcopiable += tmp_postcopiable; > > + *res_non_postcopiable += tmp_non_postcopiable; > > } > > - return ret; > > With the change, we don't care in the other functions, and this one gets > simpler IMHO. Yep, Dave -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index 074747c..7257196 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -54,8 +54,9 @@ typedef struct SaveVMHandlers { /* This runs outside the iothread lock! */ int (*save_live_setup)(QEMUFile *f, void *opaque); - uint64_t (*save_live_pending)(QEMUFile *f, void *opaque, uint64_t max_size); - + void (*save_live_pending)(QEMUFile *f, void *opaque, uint64_t max_size, + uint64_t *non_postcopiable_pending, + uint64_t *postcopiable_pending); LoadStateHandler *load_state; } SaveVMHandlers; diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index 5bf8f80..ff6bb2c 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -110,7 +110,9 @@ void qemu_savevm_state_header(QEMUFile *f); int qemu_savevm_state_iterate(QEMUFile *f); void qemu_savevm_state_complete_precopy(QEMUFile *f); void qemu_savevm_state_cancel(void); -uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size); +void qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size, + uint64_t *res_non_postcopiable, + uint64_t *res_postcopiable); void qemu_savevm_command_send(QEMUFile *f, enum qemu_vm_cmd command, uint16_t len, uint8_t *data); void qemu_savevm_send_ping(QEMUFile *f, uint32_t value); diff --git a/migration/block.c b/migration/block.c index 3005668..4483ce3 100644 --- a/migration/block.c +++ b/migration/block.c @@ -754,7 +754,9 @@ static int block_save_complete(QEMUFile *f, void *opaque) return 0; } -static uint64_t block_save_pending(QEMUFile *f, void *opaque, uint64_t max_size) +static void block_save_pending(QEMUFile *f, void *opaque, uint64_t max_size, + uint64_t *non_postcopiable_pending, + uint64_t *postcopiable_pending) { /* Estimate pending number of bytes to send */ uint64_t pending; @@ -773,7 +775,8 @@ static uint64_t block_save_pending(QEMUFile *f, void *opaque, uint64_t max_size) qemu_mutex_unlock_iothread(); DPRINTF("Enter save live pending %" PRIu64 "\n", pending); - return pending; + *non_postcopiable_pending = pending; + *postcopiable_pending = 0; } static int block_load(QEMUFile *f, void *opaque, int version_id) diff --git a/migration/migration.c b/migration/migration.c index 34cd9a6..e77b8b4 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1024,8 +1024,13 @@ static void *migration_thread(void *opaque) uint64_t pending_size; if (!qemu_file_rate_limit(s->file)) { - pending_size = qemu_savevm_state_pending(s->file, max_size); - trace_migrate_pending(pending_size, max_size); + uint64_t pend_post, pend_nonpost; + + qemu_savevm_state_pending(s->file, max_size, &pend_nonpost, + &pend_post); + pending_size = pend_nonpost + pend_post; + trace_migrate_pending(pending_size, max_size, + pend_post, pend_nonpost); if (pending_size && pending_size >= max_size) { qemu_savevm_state_iterate(s->file); } else { diff --git a/migration/ram.c b/migration/ram.c index 492ed8a..fb24954 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1273,7 +1273,9 @@ static int ram_save_complete(QEMUFile *f, void *opaque) return 0; } -static uint64_t ram_save_pending(QEMUFile *f, void *opaque, uint64_t max_size) +static void ram_save_pending(QEMUFile *f, void *opaque, uint64_t max_size, + uint64_t *non_postcopiable_pending, + uint64_t *postcopiable_pending) { uint64_t remaining_size; @@ -1287,7 +1289,9 @@ static uint64_t ram_save_pending(QEMUFile *f, void *opaque, uint64_t max_size) qemu_mutex_unlock_iothread(); remaining_size = ram_save_remaining() * TARGET_PAGE_SIZE; } - return remaining_size; + + *non_postcopiable_pending = 0; + *postcopiable_pending = remaining_size; } static int load_xbzrle(QEMUFile *f, ram_addr_t addr, void *host) diff --git a/migration/savevm.c b/migration/savevm.c index 2c4cbe1..ebd3d31 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1012,10 +1012,20 @@ void qemu_savevm_state_complete_precopy(QEMUFile *f) qemu_fflush(f); } -uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size) +/* Give an estimate of the amount left to be transferred, + * the result is split into the amount for units that can and + * for units that can't do postcopy. + */ +void qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size, + uint64_t *res_non_postcopiable, + uint64_t *res_postcopiable) { SaveStateEntry *se; - uint64_t ret = 0; + uint64_t tmp_non_postcopiable, tmp_postcopiable; + + *res_non_postcopiable = 0; + *res_postcopiable = 0; + QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { if (!se->ops || !se->ops->save_live_pending) { @@ -1026,9 +1036,12 @@ uint64_t qemu_savevm_state_pending(QEMUFile *f, uint64_t max_size) continue; } } - ret += se->ops->save_live_pending(f, se->opaque, max_size); + se->ops->save_live_pending(f, se->opaque, max_size, + &tmp_non_postcopiable, &tmp_postcopiable); + + *res_postcopiable += tmp_postcopiable; + *res_non_postcopiable += tmp_non_postcopiable; } - return ret; } void qemu_savevm_state_cancel(void) diff --git a/trace-events b/trace-events index 299805b..339eb71 100644 --- a/trace-events +++ b/trace-events @@ -1419,7 +1419,7 @@ migrate_fd_cleanup(void) "" migrate_fd_cleanup_src_rp(void) "" migrate_fd_error(void) "" migrate_fd_cancel(void) "" -migrate_pending(uint64_t size, uint64_t max) "pending size %" PRIu64 " max %" PRIu64 +migrate_pending(uint64_t size, uint64_t max, uint64_t post, uint64_t nonpost) "pending size %" PRIu64 " max %" PRIu64 " (post=%" PRIu64 " nonpost=%" PRIu64 ")" migrate_send_rp_message(int msg_type, uint16_t len) "%d: len %d" open_return_path_on_source(void) "" open_return_path_on_source_continue(void) ""