migration: cleanup ram_load
v2 cover migration: cleanup ram_load
Two cleanup for ram_load:
* return -EINVAL for version_id mismatch
* extract ram_load_precopy for better readability
v2: fix a comment
Wei Yang (2):
migration: return -EINVAL directly when version_id mismatch
migration: extract ram_load_precopy
migration/ram.c | 73 +++++++++++++++++++++++++++++++------------------ 1 file changed, 46 insertions(+), 27 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/2 migration: return -EINVAL directly when version_id mismatch
It is not reasonable to continue when version_id mismatch.
--- migration/ram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
migration/ram.c +1 -1
@@ -4217,7 +4217,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) seq_iter++;if (version_id !=4 ) { - ret = -EINVAL ; +return -EINVAL ; }if (!migrate_use_compression ()) {
Signature · 1 line
2.17.1
PATCH v2 2/2 migration: extract ram_load_precopy
In reply to Wei YangAfter cleanup, it would be clear to audience there are two cases ram_load:
* precopy
* postcopy
And it is not necessary to check postcopy_running on each iteration for precopy.
---
v2: fix a comment
--- migration/ram.c | 73 +++++++++++++++++++++++++++++++------------------ 1 file changed, 46 insertions(+), 27 deletions(-)
migration/ram.c +46 -27
@@ -4201,40 +4201,26 @@ static void colo_flush_ram_cache(void)trace_colo_flush_ram_cache_end (); } -static int ram_load (QEMUFile *f,void *opaque,int version_id) +/** +* ram_load_precopy: load pages in precopy case +* +* Returns 0 for success or -errno in case of error +* +* Called in precopy mode by ram_load(). +* rcu_read_lock is taken prior to this being called. +* +* @f: QEMUFile where to send the data +*/ +static int ram_load_precopy (QEMUFile *f) { -int flags =0 , ret =0 , invalid_flags =0 ; -static uint64_t seq_iter; -int len =0 ; -/* -* If system is running in postcopy mode, page inserts to host memory must -* be atomic -*/ -bool postcopy_running =postcopy_is_running (); +int flags =0 , ret =0 , invalid_flags =0 , len =0 ;/* ADVISE is earlier, it shows the source has the postcopy capability on */ bool postcopy_advised =postcopy_is_advised (); - - seq_iter++; - -if (version_id !=4 ) { -return -EINVAL ; - } -if (!migrate_use_compression ()) { invalid_flags |=RAM_SAVE_FLAG_COMPRESS_PAGE ; } -/* This RCU critical section can be very long running. -* When RCU reclaims in the code start to become numerous, -* it will be necessary to reduce the granularity of this -* critical section. -*/ -rcu_read_lock (); - -if (postcopy_running) { - ret =ram_load_postcopy (f); - } -while (!postcopy_running && !ret && !(flags &RAM_SAVE_FLAG_EOS )) { +while (!ret && !(flags &RAM_SAVE_FLAG_EOS )) {ram_addr_t addr, total_ram_bytes;void *host =NULL ;uint8_t ch;
@@ -4391,6 +4377,39 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) } } +return ret; +} + +static int ram_load (QEMUFile *f,void *opaque,int version_id) +{ +int ret =0 ; +static uint64_t seq_iter; +/* +* If system is running in postcopy mode, page inserts to host memory must +* be atomic +*/ +bool postcopy_running =postcopy_is_running (); + + seq_iter++; + +if (version_id !=4 ) { +return -EINVAL ; + } + +/* +* This RCU critical section can be very long running. +* When RCU reclaims in the code start to become numerous, +* it will be necessary to reduce the granularity of this +* critical section. +*/ +rcu_read_lock (); + +if (postcopy_running) { + ret =ram_load_postcopy (f); + }else { + ret =ram_load_precopy (f); + } + ret |=wait_for_decompress_done ();rcu_read_unlock ();trace_ram_load_complete (ret, seq_iter);
Signature · 1 line
2.17.1
Quoted 6 lines · * Wei Yang ([email protected]) wrote:
Two cleanup for
ram_load:* return
-EINVALforversion_idmismatch
* extractram_load_precopyfor better readabilityv2: fix a comment
Queued
Quoted 11 lines
Wei Yang (2):
migration: return-EINVALdirectly whenversion_idmismatch
migration: extractram_load_precopymigration/ram.c | 73 +++++++++++++++++++++++++++++++------------------ 1 file changed, 46 insertions(+), 27 deletions(-)Signature · 1 line
2.17.1
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK