migration/postcopy: cleanup related to postcopy
v2 cover migration/postcopy: cleanup related to postcopy
Refine a function name and handle on corner case related to PostcopyState.
v2:
* remove one unnecessary patch
* simplify corner case handling
Wei Yang (2):
migration/postcopy: rename postcopy_ram_enable_notify to
postcopy_ram_incoming_setup
migration/postcopy: check PostcopyState before setting to
POSTCOPY_INCOMING_RUNNING
migration/postcopy-ram.c | 4 ++-- migration/postcopy-ram.h | 2 +- migration/savevm.c | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 2/2 migration/postcopy: check PostcopyState before setting to POSTCOPY_INCOMING_RUNNING
Currently, we set PostcopyState blindly to RUNNING, even we found the previous state is not LISTENING. This will lead to a corner case.
First let's look at the code flow:
qemu_loadvm_state_main()
ret = loadvm_process_command()
loadvm_postcopy_handle_run()
return -1;
if (ret < 0) {
if (postcopy_state_get() == POSTCOPY_INCOMING_RUNNING)
...
}Quoted 1 line
From above snippet, the corner case is
loadvm_postcopy_handle_run()
always sets state to RUNNING. And then it checks the previous state. If the previous state is not LISTENING, it will return -1. But at this moment, PostcopyState is already been set to RUNNING.
Then ret is checked in qemu_loadvm_state_main(), when it is -1 PostcopyState is checked. Current logic would pause postcopy and retry if PostcopyState is RUNNING. This is not what we expect, because postcopy is not active yet.
This patch makes sure state is set to RUNNING only previous state is LISTENING by checking the state first.
Suggested by: Peter Xu <[email protected]>
--- migration/savevm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
migration/savevm.c +2 -1
@@ -1934,7 +1934,7 @@ static void loadvm_postcopy_handle_run_bh(void *opaque)/* After all discards we can start running and asking for pages */ static int loadvm_postcopy_handle_run (MigrationIncomingState *mis) { -PostcopyState ps =postcopy_state_set (POSTCOPY_INCOMING_RUNNING ); +PostcopyState ps =postcopy_state_get ();trace_loadvm_postcopy_handle_run ();if (ps !=POSTCOPY_INCOMING_LISTENING ) {
@@ -1942,6 +1942,7 @@ static int loadvm_postcopy_handle_run(MigrationIncomingState *mis)return -1 ; } +postcopy_state_set (POSTCOPY_INCOMING_RUNNING ); mis->bh =qemu_bh_new (loadvm_postcopy_handle_run_bh, mis);qemu_bh_schedule (mis->bh);
Signature · 1 line
2.17.1
PATCH v2 1/2 migration/postcopy: rename postcopy_ram_enable_notify to postcopy_ram_incoming_setup
In reply to Wei YangFunction postcopy_ram_incoming_setup and postcopy_ram_incoming_cleanup is a pair. Rename to make it clear for audience.
--- migration/postcopy-ram.c | 4 ++-- migration/postcopy-ram.h | 2 +- migration/savevm.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
migration/postcopy-ram.c +2 -2
@@ -1094,7 +1094,7 @@ retry:return NULL ; } -int postcopy_ram_enable_notify (MigrationIncomingState *mis) +int postcopy_ram_incoming_setup (MigrationIncomingState *mis) {/* Open the fd for the kernel to give us userfaults */ mis->userfault_fd =syscall (__NR_userfaultfd,O_CLOEXEC |O_NONBLOCK );
@@ -1321,7 +1321,7 @@ int postcopy_request_shared_page(struct PostCopyFD *pcfd, RAMBlock *rb,return -1 ; } -int postcopy_ram_enable_notify (MigrationIncomingState *mis) +int postcopy_ram_incoming_setup (MigrationIncomingState *mis) {assert (0 );return -1 ;
migration/postcopy-ram.h +1 -1
@@ -20,7 +20,7 @@ bool postcopy_ram_supported_by_host(MigrationIncomingState *mis);* Make all of RAM sensitive to accesses to areas that haven't yet been written * and wire up anything necessary to deal with it. */ -int postcopy_ram_enable_notify (MigrationIncomingState *mis); +int postcopy_ram_incoming_setup (MigrationIncomingState *mis);/* * Initialise postcopy-ram, setting the RAM to a state where we can go into
migration/savevm.c +1 -1
@@ -1865,7 +1865,7 @@ static int loadvm_postcopy_handle_listen(MigrationIncomingState *mis)* shouldn't be doing anything yet so don't actually expect requests */ if (migrate_postcopy_ram ()) { -if (postcopy_ram_enable_notify (mis)) { +if (postcopy_ram_incoming_setup (mis)) {postcopy_ram_incoming_cleanup (mis);return -1 ; }
Signature · 1 line
2.17.1
Quoted 11 lines · Wei Yang
Refine a function name and handle on corner case related to PostcopyState.
v2:
* remove one unnecessary patch
* simplify corner case handlingWei Yang (2):
migration/postcopy: renamepostcopy_ram_enable_notifyto
postcopy_ram_incoming_setup
migration/postcopy: check PostcopyState before setting to
POSTCOPY_INCOMING_RUNNING
Signature · 1 line
Peter Xu
Re: [PATCH v2 2/2] migration/postcopy: check PostcopyState before setting to POSTCOPY_INCOMING_RUNNING
In reply to Wei YangQuoted 24 lines · * Wei Yang ([email protected]) wrote:
Currently, we set PostcopyState blindly to RUNNING, even we found the previous state is not LISTENING. This will lead to a corner case.
First let's look at the code flow:
qemu_loadvm_state_main()ret = loadvm_process_command() loadvm_postcopy_handle_run() return -1; if (ret < 0) { if (postcopy_state_get() == POSTCOPY_INCOMING_RUNNING) ... }Quoted 1 line
From above snippet, the corner case is
loadvm_postcopy_handle_run()always sets state to RUNNING. And then it checks the previous state. If the previous state is not LISTENING, it will return -1. But at this moment, PostcopyState is already been set to RUNNING.
Then ret is checked in
qemu_loadvm_state_main(), when it is -1 PostcopyState is checked. Current logic would pause postcopy and retry if PostcopyState is RUNNING. This is not what we expect, because postcopy is not active yet.
Quoted 5 lines
This patch makes sure state is set to RUNNING only previous state is LISTENING by checking the state first.
Signed-off-by Wei Yang <[email protected]>Suggested by: Peter Xu <[email protected]>
Quoted 28 lines
--- migration/savevm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)migration/savevm.c +2
-1@@ -1934,7 +1934,7 @@ static void loadvm_postcopy_handle_run_bh(void *opaque)/* After all discards we can start running and asking for pages */ static int loadvm_postcopy_handle_run (MigrationIncomingState *mis) { -PostcopyState ps =postcopy_state_set (POSTCOPY_INCOMING_RUNNING ); +PostcopyState ps =postcopy_state_get ();trace_loadvm_postcopy_handle_run ();if (ps !=POSTCOPY_INCOMING_LISTENING ) {@@ -1942,6 +1942,7 @@ static int loadvm_postcopy_handle_run(MigrationIncomingState *mis)return -1 ; } +postcopy_state_set (POSTCOPY_INCOMING_RUNNING ); mis->bh =qemu_bh_new (loadvm_postcopy_handle_run_bh, mis);qemu_bh_schedule (mis->bh);Signature · 1 line
2.17.1
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK
Quoted 12 lines · * Wei Yang ([email protected]) wrote:
Refine a function name and handle on corner case related to PostcopyState.
v2:
* remove one unnecessary patch
* simplify corner case handlingWei Yang (2):
migration/postcopy: renamepostcopy_ram_enable_notifyto
postcopy_ram_incoming_setup
migration/postcopy: check PostcopyState before setting to
POSTCOPY_INCOMING_RUNNING
Quoted 4 lines
migration/postcopy-ram.c | 4 ++-- migration/postcopy-ram.h | 2 +- migration/savevm.c | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-)
Queued
Quoted 5 lines
Signature · 2 lines
-- 2.17.1
--
Dr. David Alan Gilbert / [email protected] / Manchester, UK