migration: Do not re-read the clock on pre_save in case of paused guest
PATCH v2 1/1 migration: Do not re-read the clock on pre_save in case of paused guest
Re-read the timebase before migrate was ported from x86 commit:
6053a86fe7bd: kvmclock: reduce kvmclock difference on migration
The clock move makes the guest knows about the paused time between the stop and migrate commands. This is an issue in an already-paused VM because some side effects, like process stalls, could happen after migration.
So, this patch checks the runstate of guest in the pre_save handler and do not re-reads the timebase in case of paused state (cold migration).
--- hw/ppc/ppc.c | 13 +++++++++---- target/ppc/cpu-qom.h | 1 + 2 files changed, 10 insertions(+), 4 deletions(-)
hw/ppc/ppc.c +9 -4
@@ -1008,6 +1008,8 @@ static void timebase_save(PPCTimebase *tb)* there is no need to update it from KVM here */ tb->guest_timebase = ticks + first_ppc_cpu->env.tb_env->tb_offset; + + tb->runstate_paused =runstate_check (RUN_STATE_PAUSED ); }static void timebase_load (PPCTimebase *tb)
@@ -1051,9 +1053,9 @@ void cpu_ppc_clock_vm_state_change(void *opaque, int running, }/* -* When migrating, read the clock just before migration, -* so that the guest clock counts during the events -* between: +* When migrating a running guest, read the clock just +* before migration, so that the guest clock counts +* during the events between: * * * vm_stop() * *
@@ -1068,7 +1070,10 @@ static int timebase_pre_save(void *opaque) {PPCTimebase *tb = opaque; -timebase_save (tb); +/* guest_timebase won't be overridden in case of paused guest */ +if (!tb->runstate_paused) { +timebase_save (tb); + }return 0 ; }
target/ppc/cpu-qom.h +1 -0
@@ -201,6 +201,7 @@ typedef struct PowerPCCPUClass {typedef struct PPCTimebase {uint64_t guest_timebase;int64_t time_of_the_day_ns; +bool runstate_paused; }PPCTimebase ;extern const struct VMStateDescription vmstate_ppc_timebase;
Signature · 1 line
2.20.1
Quoted 8 lines · Maxiwell S. Garcia
Re-read the timebase before migrate was ported from x86 commit:
6053a86fe7bd: kvmclock: reduce kvmclock difference on migrationThe clock move makes the guest knows about the paused time between the stop and migrate commands. This is an issue in an already-paused VM because some side effects, like process stalls, could happen after migration.
Quoted 4 lines
So, this patch checks the runstate of guest in the
pre_savehandler and do not re-reads the timebase in case of paused state (cold migration).Signed-off-by Maxiwell S. Garcia <[email protected]>
I've applied this to ppc-for-4.2. I think it probably is a correct fix, but this could have subtle impacts on things that are mostly working at the moment, so I don't want to risk it during hard freeze.
Quoted 55 lines
--- hw/ppc/ppc.c | 13 +++++++++---- target/ppc/cpu-qom.h | 1 + 2 files changed, 10 insertions(+), 4 deletions(-)hw/ppc/ppc.c +9
-4@@ -1008,6 +1008,8 @@ static void timebase_save(PPCTimebase *tb)* there is no need to update it from KVM here */ tb->guest_timebase = ticks + first_ppc_cpu->env.tb_env->tb_offset; + + tb->runstate_paused =runstate_check (RUN_STATE_PAUSED ); }static void timebase_load (PPCTimebase *tb)@@ -1051,9 +1053,9 @@ void cpu_ppc_clock_vm_state_change(void *opaque, int running, }/* -* When migrating, read the clock just before migration, -* so that the guest clock counts during the events -* between: +* When migrating a running guest, read the clock just +* before migration, so that the guest clock counts +* during the events between: * * * vm_stop() * * @@ -1068,7 +1070,10 @@ static int timebase_pre_save(void *opaque) {PPCTimebase *tb = opaque; -timebase_save (tb); +/* guest_timebase won't be overridden in case of paused guest */ +if (!tb->runstate_paused) { +timebase_save (tb); + }return 0 ; }target/ppc/cpu-qom.h +1
-0@@ -201,6 +201,7 @@ typedef struct PowerPCCPUClass {typedef struct PPCTimebase {uint64_t guest_timebase;int64_t time_of_the_day_ns; +bool runstate_paused; }PPCTimebase ;extern const struct VMStateDescription vmstate_ppc_timebase;
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson