| Message ID | 20220531104318.7494-14-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Migration: Transmit and detect zero pages in the multifd threads | expand |
* Juan Quintela (quintela@redhat.com) wrote: > So we use multifd to transmit zero pages. > > Signed-off-by: Juan Quintela <quintela@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > > --- > > - Check zero_page property before using new code (Dave) > --- > migration/ram.c | 33 ++++++++++++++++++++++++++++++++- > 1 file changed, 32 insertions(+), 1 deletion(-) > > diff --git a/migration/ram.c b/migration/ram.c > index 7ceef7976b..f9959262fa 100644 > --- a/migration/ram.c > +++ b/migration/ram.c > @@ -2181,6 +2181,32 @@ static int ram_save_target_page_legacy(RAMState *rs, PageSearchStatus *pss) > return ram_save_page(rs, pss); > } > > +/** > + * ram_save_target_page_multifd: save one target page > + * > + * Returns the number of pages written > + * > + * @rs: current RAM state > + * @pss: data about the page we want to send > + */ > +static int ram_save_target_page_multifd(RAMState *rs, PageSearchStatus *pss) > +{ > + RAMBlock *block = pss->block; > + ram_addr_t offset = ((ram_addr_t)pss->page) << TARGET_PAGE_BITS; > + int res; > + > + if (!migration_in_postcopy()) { > + return ram_save_multifd_page(rs, block, offset); > + } > + > + res = save_zero_page(rs, block, offset); > + if (res > 0) { > + return res; > + } > + > + return ram_save_page(rs, pss); > +} > + > /** > * ram_save_host_page: save a whole host page > * > @@ -2945,7 +2971,12 @@ static int ram_save_setup(QEMUFile *f, void *opaque) > ram_control_before_iterate(f, RAM_CONTROL_SETUP); > ram_control_after_iterate(f, RAM_CONTROL_SETUP); > > - (*rsp)->ram_save_target_page = ram_save_target_page_legacy; > + if (migrate_use_multifd() && migrate_use_multifd_zero_page()) { > + (*rsp)->ram_save_target_page = ram_save_target_page_multifd; > + } else { > + (*rsp)->ram_save_target_page = ram_save_target_page_legacy; > + } > + > ret = multifd_send_sync_main(f); > if (ret < 0) { > return ret; > -- > 2.35.3 >
diff --git a/migration/ram.c b/migration/ram.c index 7ceef7976b..f9959262fa 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2181,6 +2181,32 @@ static int ram_save_target_page_legacy(RAMState *rs, PageSearchStatus *pss) return ram_save_page(rs, pss); } +/** + * ram_save_target_page_multifd: save one target page + * + * Returns the number of pages written + * + * @rs: current RAM state + * @pss: data about the page we want to send + */ +static int ram_save_target_page_multifd(RAMState *rs, PageSearchStatus *pss) +{ + RAMBlock *block = pss->block; + ram_addr_t offset = ((ram_addr_t)pss->page) << TARGET_PAGE_BITS; + int res; + + if (!migration_in_postcopy()) { + return ram_save_multifd_page(rs, block, offset); + } + + res = save_zero_page(rs, block, offset); + if (res > 0) { + return res; + } + + return ram_save_page(rs, pss); +} + /** * ram_save_host_page: save a whole host page * @@ -2945,7 +2971,12 @@ static int ram_save_setup(QEMUFile *f, void *opaque) ram_control_before_iterate(f, RAM_CONTROL_SETUP); ram_control_after_iterate(f, RAM_CONTROL_SETUP); - (*rsp)->ram_save_target_page = ram_save_target_page_legacy; + if (migrate_use_multifd() && migrate_use_multifd_zero_page()) { + (*rsp)->ram_save_target_page = ram_save_target_page_multifd; + } else { + (*rsp)->ram_save_target_page = ram_save_target_page_legacy; + } + ret = multifd_send_sync_main(f); if (ret < 0) { return ret;
So we use multifd to transmit zero pages. Signed-off-by: Juan Quintela <quintela@redhat.com> --- - Check zero_page property before using new code (Dave) --- migration/ram.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-)