COLO: integrate colo frame with block replication and COLO proxy
v7 cover COLO: integrate colo frame with block replication and COLO proxy
Hi~ All~
COLO Frame, block replication and COLO proxy(colo-compare,filter-mirror, filter-redirector,filter-rewriter) have been exist in qemu
for long time, it's time to integrate these three parts to make COLO really works.
In this series, we have some optimizations for COLO frame, including separating the process of saving ram and device state, using an COLO_EXIT event to notify users that VM exits COLO, for these parts, most of them have been reviewed long time ago in old version, but since this series have just rebased on upstream which had merged a new series of migration, parts of pathes in this series deserve review again.
We use notifier/callback method for COLO compare to notify COLO frame about net packets inconsistent event, and add a handle_event method for NetFilterClass to help COLO frame to notify filters and colo-compare about checkpoint/failover event, it is flexible.
For the neweset version, please refer to:
https://github.com/zhangckid/qemu/tree/qemu-colo-18may1-rebase
Please review, thanks.
V7:
- Addressed Markus's comments in 11/17.
- Rebased on upstream.
V6:
- Addressed Eric Blake's comments, use the enum to feedback in patch 11/17.
- Fixed QAPI command separator problem in patch 11/17.
Zhang Chen (12):
filter-rewriter: fix memory leak for connection in
connection_track_table
colo-compare: implement the process of checkpoint
colo-compare: use notifier to notify packets comparing result
COLO: integrate colo compare with colo frame
COLO: Add block replication into colo process
COLO: Remove colo_state migration struct
COLO: Load dirty pages into SVM's RAM cache firstly ram/COLO: Record the dirty pages that SVM received
COLO: Flush memory data from ram cache
qapi: Add new command to query colo status
filter: Add handle_event method for NetFilterClass
filter-rewriter: handle checkpoint and failover event
zhanghailiang (5):
qmp event: Add COLO_EXIT event to notify users while exited COLO
savevm: split the process of different stages for loadvm/savevm
COLO: flush host dirty ram from cache
COLO: notify net filters about checkpoint/failover event
COLO: quick failover process by kick COLO thread
include/exec/ram_addr.h | 1 + include/migration/colo.h | 11 ++- include/net/filter.h | 5 ++ migration/Makefile.objs | 2 +- migration/colo-comm.c | 76 ---------------- migration/colo.c | 219 ++++++++++++++++++++++++++++++++++++++++++++--- migration/migration.c | 38 +++++++- migration/ram.c | 183 ++++++++++++++++++++++++++++++++++++++- migration/ram.h | 4 + migration/savevm.c | 55 ++++++++++-- migration/savevm.h | 5 ++ migration/trace-events | 3 + net/colo-compare.c | 108 +++++++++++++++++++++-- net/colo-compare.h | 24 ++++++ net/colo.h | 4 + net/filter-rewriter.c | 109 +++++++++++++++++++++-- net/filter.c | 17 ++++ net/net.c | 28 ++++++ qapi/migration.json | 70 +++++++++++++++ vl.c | 2 - 20 files changed, 846 insertions(+), 118 deletions(-) delete mode 100644 migration/colo-comm.c create mode 100644 net/colo-compare.h
Signature · 1 line
2.7.4
PATCH v7 1/17 filter-rewriter: fix memory leak for connection in connection_track_table
After a net connection is closed, we didn't clear its releated resources in connection_track_table, which will lead to memory leak.
Let't track the state of net connection, if it is closed, its related resources will be cleared up.
--- net/colo.h | 4 +++ net/filter-rewriter.c | 69 +++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 66 insertions(+), 7 deletions(-)
net/colo.h +4 -0
@@ -18,6 +18,7 @@#include "slirp/slirp.h" #include "qemu/jhash.h" #include "qemu/timer.h" +#include "slirp/tcp.h" #define HASHTABLE_MAX_SIZE 16384
@@ -86,6 +87,9 @@ typedef struct Connection {* run once in independent tcp connection */ int syn_flag; + +int tcp_state;/* TCP FSM state */ +tcp_seq fin_ack_seq;/* the seq of 'fin=1,ack=1' */ } Connection;uint32_t connection_key_hash (const void *opaque);
net/filter-rewriter.c +62 -7
108 lines not on this page · raw message
Signature · 1 line
2.7.4
PATCH v7 2/17 colo-compare: implement the process of checkpoint
In reply to Zhang ChenWhile do checkpoint, we need to flush all the unhandled packets, By using the filter notifier mechanism, we can easily to notify every compare object to do this process, which runs inside of compare threads as a coroutine.
--- include/migration/colo.h | 6 ++++ net/colo-compare.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++ net/colo-compare.h | 22 ++++++++++++++ 3 files changed, 104 insertions(+) create mode 100644 net/colo-compare.h
include/migration/colo.h +6 -0
@@ -16,6 +16,12 @@#include "qemu-common.h" #include "qapi/qapi-types-migration.h" +enum colo_event { +COLO_EVENT_NONE , +COLO_EVENT_CHECKPOINT , +COLO_EVENT_FAILOVER , +}; +void colo_info_init (void );void migrate_start_colo_process (MigrationState *s);
net/colo-compare.c +76 -0
143 lines not on this page · raw message
net/colo-compare.h new file +22 -0
@@ -0,0 +1,22 @@ +/* +* COarse-grain LOck-stepping Virtual Machines for Non-stop Service (COLO) +* (a.k.a. Fault Tolerance or Continuous Replication) +* +* Copyright (c) 2017 HUAWEI TECHNOLOGIES CO., LTD. +* Copyright (c) 2017 FUJITSU LIMITED +* Copyright (c) 2017 Intel Corporation +* +* Authors: +* zhanghailiang <[email protected]> +* Zhang Chen <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2 or +* later. See the COPYING file in the top-level directory. +*/ + +#ifndef QEMU_COLO_COMPARE_H +#define QEMU_COLO_COMPARE_H + +void colo_notify_compares_event (void *opaque,int event,Error **errp); + +#endif /* QEMU_COLO_COMPARE_H */
Signature · 1 line
2.7.4
PATCH v7 3/17 colo-compare: use notifier to notify packets comparing result
In reply to Zhang ChenIt's a good idea to use notifier to notify COLO frame of inconsistent packets comparing.
--- net/colo-compare.c | 32 +++++++++++++++++++++++++------- net/colo-compare.h | 2 ++ 2 files changed, 27 insertions(+), 7 deletions(-)
net/colo-compare.c +25 -7
@@ -29,6 +29,7 @@#include "sysemu/iothread.h" #include "net/colo-compare.h" #include "migration/colo.h" +#include "migration/migration.h" #define TYPE_COLO_COMPARE "colo-compare"#define COLO_COMPARE (obj) \
@@ -37,6 +38,9 @@ static QTAILQ_HEAD(, CompareState) net_compares =QTAILQ_HEAD_INITIALIZER (net_compares); +static NotifierList colo_compare_notifiers = +NOTIFIER_LIST_INITIALIZER (colo_compare_notifiers); +#define COMPARE_READ_LEN_MAX NET_BUFSIZE#define MAX_QUEUE_SIZE 1024
@@ -561,8 +565,24 @@ static int colo_old_packet_check_one(Packet *pkt, int64_t *check_time) } } +static void colo_compare_inconsistent_notify (void ) +{ +notifier_list_notify (&colo_compare_notifiers, +migrate_get_current ()); +} + +void colo_compare_register_notifier (Notifier *notify) +{ +notifier_list_add (&colo_compare_notifiers, notify); +} + +void colo_compare_unregister_notifier (Notifier *notify) +{ +notifier_remove (notify); +} +static int colo_old_packet_check_one_conn (Connection *conn, -void *user_data) +void *user_data) {GList *result =NULL ;int64_t check_time =REGULAR_PACKET_CHECK_MS ;
@@ -573,10 +593,7 @@ static int colo_old_packet_check_one_conn(Connection *conn,if (result) {/* Do checkpoint will flush old packet */ -/* -* TODO: Notify colo frame to do checkpoint. -* colo_compare_inconsistent_notify(); -*/ +colo_compare_inconsistent_notify ();return 0 ; }
@@ -620,11 +637,12 @@ static void colo_compare_packet(CompareState *s, Connection *conn,/* * If one packet arrive late, the secondary_list or * primary_list will be empty, so we can't compare it -* until next comparison. +* until next comparison. If the packets in the list are +* timeout, it will trigger a checkpoint request. */ trace_colo_compare_main ("packet different" );g_queue_push_head (&conn->primary_list, pkt); -/* TODO: colo_notify_checkpoint();*/ +colo_compare_inconsistent_notify ();break ; } }
net/colo-compare.h +2 -0
@@ -18,5 +18,7 @@#define QEMU_COLO_COMPARE_H void colo_notify_compares_event (void *opaque,int event,Error **errp); +void colo_compare_register_notifier (Notifier *notify); +void colo_compare_unregister_notifier (Notifier *notify);#endif /* QEMU_COLO_COMPARE_H */
Signature · 1 line
2.7.4
PATCH v7 4/17 COLO: integrate colo compare with colo frame
In reply to Zhang ChenFor COLO FT, both the PVM and SVM run at the same time, only sync the state while it needs.
So here, let SVM runs while not doing checkpoint, change DEFAULT_MIGRATE_X_CHECKPOINT_DELAY to 200*100.
Besides, we forgot to release colo_checkpoint_semd and colo_delay_timer, fix them here.
--- migration/colo.c | 42 ++++++++++++++++++++++++++++++++++++++++-- migration/migration.c | 4 ++-- 2 files changed, 42 insertions(+), 4 deletions(-)
migration/colo.c +40 -2
@@ -25,8 +25,11 @@#include "qemu/error-report.h" #include "migration/failover.h" #include "replication.h" +#include "net/colo-compare.h" +#include "net/colo.h" static bool vmstate_loading; +static Notifier packets_compare_notifier;#define COLO_BUFFER_BASE_SIZE (4 * 1024 * 1024)
@@ -343,6 +346,11 @@ static int colo_do_checkpoint_transaction(MigrationState *s, goto out; } +colo_notify_compares_event (NULL ,COLO_EVENT_CHECKPOINT , &local_err); +if (local_err) { + goto out; + } +/* Disable block migration */ migrate_set_block_enabled (false, &local_err);qemu_savevm_state_header (fb);
@@ -400,6 +408,11 @@ out:return ret; } +static void colo_compare_notify_checkpoint (Notifier *notifier,void *data) +{ +colo_checkpoint_notify (data); +} +static void colo_process_checkpoint (MigrationState *s) {QIOChannelBuffer *bioc;
@@ -416,6 +429,9 @@ static void colo_process_checkpoint(MigrationState *s) goto out; } + packets_compare_notifier.notify = colo_compare_notify_checkpoint; +colo_compare_register_notifier (&packets_compare_notifier); +/* * Wait for Secondary finish loading VM states and enter COLO * restore.
@@ -461,11 +477,21 @@ out:qemu_fclose (fb); } -timer_del (s->colo_delay_timer); -/* Hope this not to be too long to wait here */ qemu_sem_wait (&s->colo_exit_sem);qemu_sem_destroy (&s->colo_exit_sem); + +/* +* It is safe to unregister notifier after failover finished. +* Besides, colo_delay_timer and colo_checkpoint_sem can't be +* released befor unregister notifier, or there will be use-after-free +* error. +*/ +colo_compare_unregister_notifier (&packets_compare_notifier); +timer_del (s->colo_delay_timer); +timer_free (s->colo_delay_timer); +qemu_sem_destroy (&s->colo_checkpoint_sem); +/* * Must be called after failover BH is completed, * Or the failover BH may shutdown the wrong fd that
@@ -558,6 +584,11 @@ void *colo_process_incoming_thread(void *opaque) fb =qemu_fopen_channel_input (QIO_CHANNEL (bioc));object_unref (OBJECT (bioc)); +qemu_mutex_lock_iothread (); +vm_start (); +trace_colo_vm_state_change ("stop" ,"run" ); +qemu_mutex_unlock_iothread (); +colo_send_message (mis->to_src_file,COLO_MESSAGE_CHECKPOINT_READY , &local_err);if (local_err) {
@@ -577,6 +608,11 @@ void *colo_process_incoming_thread(void *opaque) goto out; } +qemu_mutex_lock_iothread (); +vm_stop_force_state (RUN_STATE_COLO ); +trace_colo_vm_state_change ("run" ,"stop" ); +qemu_mutex_unlock_iothread (); +/* FIXME: This is unnecessary for periodic checkpoint mode */ colo_send_message (mis->to_src_file,COLO_MESSAGE_CHECKPOINT_REPLY , &local_err);
@@ -630,6 +666,8 @@ void *colo_process_incoming_thread(void *opaque) } vmstate_loading = false; +vm_start (); +trace_colo_vm_state_change ("stop" ,"run" );qemu_mutex_unlock_iothread ();if (failover_get_state () ==FAILOVER_STATUS_RELAUNCH ) {
migration/migration.c +2 -2
@@ -76,9 +76,9 @@#define DEFAULT_MIGRATE_XBZRLE_CACHE_SIZE (64 * 1024 * 1024)/* The delay time (in ms) between two COLO checkpoints -* Note: Please change this default value to 10000 when we support hybrid mode. +* Note: Please change this default value to 20000 when we support hybrid mode. */ -#define DEFAULT_MIGRATE_X_CHECKPOINT_DELAY 200 +#define DEFAULT_MIGRATE_X_CHECKPOINT_DELAY (200 * 100)#define DEFAULT_MIGRATE_MULTIFD_CHANNELS 2#define DEFAULT_MIGRATE_MULTIFD_PAGE_COUNT 16
Signature · 1 line
2.7.4
PATCH v7 5/17 COLO: Add block replication into colo process
In reply to Zhang ChenMake sure master start block replication after slave's block replication started.
Besides, we need to activate VM's blocks before goes into COLO state.
--- migration/colo.c | 43 +++++++++++++++++++++++++++++++++++++++++++ migration/migration.c | 9 +++++++++ 2 files changed, 52 insertions(+)
migration/colo.c +43 -0
@@ -27,6 +27,7 @@#include "replication.h" #include "net/colo-compare.h" #include "net/colo.h" +#include "block/block.h" static bool vmstate_loading;static Notifier packets_compare_notifier;
@@ -56,6 +57,7 @@ static void secondary_vm_do_failover(void) {int old_state;MigrationIncomingState *mis =migration_incoming_get_current (); +Error *local_err =NULL ;/* Can not do failover during the process of VM's loading VMstate, Or * it will break the secondary VM.
@@ -73,6 +75,11 @@ static void secondary_vm_do_failover(void)migrate_set_state (&mis->state,MIGRATION_STATUS_COLO ,MIGRATION_STATUS_COMPLETED ); +replication_stop_all (true, &local_err); +if (local_err) { +error_report_err (local_err); + } +if (!autostart) {error_report ("\"-S\" qemu option will be ignored in secondary side" );/* recover runstate to normal migration finish state */
@@ -110,6 +117,7 @@ static void primary_vm_do_failover(void) {MigrationState *s =migrate_get_current ();int old_state; +Error *local_err =NULL ;migrate_set_state (&s->state,MIGRATION_STATUS_COLO ,MIGRATION_STATUS_COMPLETED );
@@ -133,6 +141,13 @@ static void primary_vm_do_failover(void) FailoverStatus_str(old_state));return ; } + +replication_stop_all (true, &local_err); +if (local_err) { +error_report_err (local_err); + local_err =NULL ; + } +/* Notify COLO thread that failover work is finished */ qemu_sem_post (&s->colo_exit_sem); }
@@ -356,6 +371,11 @@ static int colo_do_checkpoint_transaction(MigrationState *s,qemu_savevm_state_header (fb);qemu_savevm_state_setup (fb);qemu_mutex_lock_iothread (); +replication_do_checkpoint_all (&local_err); +if (local_err) { +qemu_mutex_unlock_iothread (); + goto out; + }qemu_savevm_state_complete_precopy (fb, false, false);qemu_mutex_unlock_iothread ();
@@ -446,6 +466,12 @@ static void colo_process_checkpoint(MigrationState *s)object_unref (OBJECT (bioc));qemu_mutex_lock_iothread (); +replication_start_all (REPLICATION_MODE_PRIMARY , &local_err); +if (local_err) { +qemu_mutex_unlock_iothread (); + goto out; + } +vm_start ();qemu_mutex_unlock_iothread ();trace_colo_vm_state_change ("stop" ,"run" );
@@ -585,6 +611,11 @@ void *colo_process_incoming_thread(void *opaque)object_unref (OBJECT (bioc));qemu_mutex_lock_iothread (); +replication_start_all (REPLICATION_MODE_SECONDARY , &local_err); +if (local_err) { +qemu_mutex_unlock_iothread (); + goto out; + }vm_start ();trace_colo_vm_state_change ("stop" ,"run" );qemu_mutex_unlock_iothread ();
@@ -665,6 +696,18 @@ void *colo_process_incoming_thread(void *opaque) goto out; } +replication_get_error_all (&local_err); +if (local_err) { +qemu_mutex_unlock_iothread (); + goto out; + } +/* discard colo disk buffer */ +replication_do_checkpoint_all (&local_err); +if (local_err) { +qemu_mutex_unlock_iothread (); + goto out; + } + vmstate_loading = false;vm_start ();trace_colo_vm_state_change ("stop" ,"run" );
migration/migration.c +9 -0
@@ -357,6 +357,7 @@ static void process_incoming_migration_co(void *opaque)MigrationIncomingState *mis =migration_incoming_get_current ();PostcopyState ps;int ret; +Error *local_err =NULL ;assert (mis->from_src_file); mis->largest_page_size =qemu_ram_pagesize_largest ();
@@ -388,6 +389,14 @@ static void process_incoming_migration_co(void *opaque)/* we get COLO info, and know if we are in COLO mode */ if (!ret &&migration_incoming_enable_colo ()) { +/* Make sure all file formats flush their mutable metadata */ +bdrv_invalidate_cache_all (&local_err); +if (local_err) { +migrate_set_state (&mis->state,MIGRATION_STATUS_ACTIVE , +MIGRATION_STATUS_FAILED ); +error_report_err (local_err); +exit (EXIT_FAILURE ); + } mis->migration_incoming_co =qemu_coroutine_self ();qemu_thread_create (&mis->colo_incoming_thread,"COLO incoming" , colo_process_incoming_thread, mis,QEMU_THREAD_JOINABLE );
Signature · 1 line
2.7.4
PATCH v7 6/17 COLO: Remove colo_state migration struct
In reply to Zhang ChenWe need to know if migration is going into COLO state for incoming side before start normal migration.
Instead by using the VMStateDescription to send colo_state from source side to destination side, we use MIG_CMD_ENABLE_COLO to indicate whether COLO is enabled or not.
--- include/migration/colo.h | 5 ++-- migration/Makefile.objs | 2 +- migration/colo-comm.c | 76 ------------------------------------------------ migration/colo.c | 13 ++++++++- migration/migration.c | 23 ++++++++++++++- migration/savevm.c | 20 +++++++++++++ migration/savevm.h | 1 + migration/trace-events | 1 + vl.c | 2 -- 9 files changed, 60 insertions(+), 83 deletions(-) delete mode 100644 migration/colo-comm.c
include/migration/colo.h +3 -2
@@ -28,8 +28,9 @@ void migrate_start_colo_process(MigrationState *s);bool migration_in_colo_state (void );/* loadvm */ -bool migration_incoming_enable_colo (void ); -void migration_incoming_exit_colo (void ); +void migration_incoming_enable_colo (void ); +void migration_incoming_disable_colo (void ); +bool migration_incoming_colo_enabled (void );void *colo_process_incoming_thread (void *opaque);bool migration_incoming_in_colo_state (void );
migration/Makefile.objs +1 -1
@@ -1,6 +1,6 @@ common-obj-y += migration.o socket.o fd.o exec.o common-obj-y += tls.o channel.o savevm.o -common-obj-y += colo-comm.o colo.o colo-failover.o +common-obj-y += colo.o colo-failover.o common-obj-y += vmstate.o vmstate-types.o page_cache.o common-obj-y += qemu-file.o global_state.o common-obj-y += qemu-file-channel.o
migration/colo-comm.c deleted +0 -76
76 lines not on this page · raw message
migration/colo.c +12 -1
@@ -152,6 +152,17 @@ static void primary_vm_do_failover(void)qemu_sem_post (&s->colo_exit_sem); } +COLOMode get_colo_mode (void ) +{ +if (migration_in_colo_state ()) { +return COLO_MODE_PRIMARY ; + }else if (migration_incoming_in_colo_state ()) { +return COLO_MODE_SECONDARY ; + }else { +return COLO_MODE_UNKNOWN ; + } +} +void colo_do_failover (MigrationState *s) {/* Make sure VM stopped while failover happened. */
@@ -745,7 +756,7 @@ out:if (mis->to_src_file) {qemu_fclose (mis->to_src_file); } -migration_incoming_exit_colo (); +migration_incoming_disable_colo ();return NULL ; }
migration/migration.c +22 -1
@@ -277,6 +277,22 @@ int migrate_send_rp_req_pages(MigrationIncomingState *mis, const char *rbname,return migrate_send_rp_message (mis, msg_type, msglen, bufc); } +static bool migration_colo_enabled; +bool migration_incoming_colo_enabled (void ) +{ +return migration_colo_enabled; +} + +void migration_incoming_disable_colo (void ) +{ + migration_colo_enabled = false; +} + +void migration_incoming_enable_colo (void ) +{ + migration_colo_enabled = true; +} +void qemu_start_incoming_migration (const char *uri,Error **errp) {const char *p;
@@ -388,7 +404,7 @@ static void process_incoming_migration_co(void *opaque) }/* we get COLO info, and know if we are in COLO mode */ -if (!ret &&migration_incoming_enable_colo ()) { +if (!ret &&migration_incoming_colo_enabled ()) {/* Make sure all file formats flush their mutable metadata */ bdrv_invalidate_cache_all (&local_err);if (local_err) {
@@ -2431,6 +2447,11 @@ static void *migration_thread(void *opaque)qemu_savevm_send_postcopy_advise (s->to_dst_file); } +if (migrate_colo_enabled ()) { +/* Notify migration destination that we enable COLO */ +qemu_savevm_send_colo_enable (s->to_dst_file); + } +qemu_savevm_state_setup (s->to_dst_file); s->setup_time =qemu_clock_get_ms (QEMU_CLOCK_HOST ) - setup_start;
migration/savevm.c +20 -0
@@ -55,6 +55,8 @@#include "io/channel-buffer.h" #include "io/channel-file.h" #include "sysemu/replay.h" +#include "migration/colo.h" +#ifndef ETH_P_RARP #define ETH_P_RARP 0x8035
@@ -81,6 +83,9 @@ enum qemu_vm_cmd {were previously sent during precopy but are dirty. */ MIG_CMD_PACKAGED ,/* Send a wrapped stream within this stream */ + +MIG_CMD_ENABLE_COLO ,/* Enable COLO */ + MIG_CMD_MAX };
@@ -836,6 +841,12 @@ static void qemu_savevm_command_send(QEMUFile *f,qemu_fflush (f); } +void qemu_savevm_send_colo_enable (QEMUFile *f) +{ +trace_savevm_send_colo_enable (); +qemu_savevm_command_send (f,MIG_CMD_ENABLE_COLO ,0 ,NULL ); +} +void qemu_savevm_send_ping (QEMUFile *f,uint32_t value) {uint32_t buf;
@@ -1793,6 +1804,12 @@ static int loadvm_handle_cmd_packaged(MigrationIncomingState *mis)return ret; } +static int loadvm_process_enable_colo (MigrationIncomingState *mis) +{ +migration_incoming_enable_colo (); +return 0 ; +} +/* * Process an incoming 'QEMU_VM_COMMAND' * 0 just a normal return
@@ -1866,6 +1883,9 @@ static int loadvm_process_command(QEMUFile *f)case MIG_CMD_POSTCOPY_RAM_DISCARD :return loadvm_postcopy_ram_handle_discard (mis, len); + +case MIG_CMD_ENABLE_COLO : +return loadvm_process_enable_colo (mis); }return 0 ;
migration/savevm.h +1 -0
@@ -52,6 +52,7 @@ void qemu_savevm_send_postcopy_ram_discard(QEMUFile *f, const char *name,uint16_t len, uint64_t *start_list, uint64_t *length_list); +void qemu_savevm_send_colo_enable (QEMUFile *f);int qemu_loadvm_state (QEMUFile *f);void qemu_loadvm_state_cleanup (void );
migration/trace-events +1 -0
@@ -34,6 +34,7 @@ savevm_send_open_return_path(void) "" savevm_send_ping(uint32_t val) "0x%x" savevm_send_postcopy_listen(void) "" savevm_send_postcopy_run(void) "" +savevm_send_colo_enable(void) "" savevm_state_setup(void) "" savevm_state_header(void) "" savevm_state_iterate(void) ""
vl.c +0 -2
@@ -4437,8 +4437,6 @@ int main(int argc, char **argv, char **envp)#endif } -colo_info_init (); -if (net_init_clients (&err) <0 ) {error_report_err (err);exit (1 );
Signature · 1 line
2.7.4
PATCH v7 7/17 COLO: Load dirty pages into SVM's RAM cache firstly
In reply to Zhang ChenWe should not load PVM's state directly into SVM, because there maybe some errors happen when SVM is receving data, which will break SVM.
We need to ensure receving all data before load the state into SVM. We use an extra memory to cache these data (PVM's ram). The ram cache in secondary side is initially the same as SVM/PVM's memory. And in the process of checkpoint, we cache the dirty pages of PVM into this ram cache firstly, so this ram cache always the same as PVM's memory at every checkpoint, then we flush this cached ram to SVM after we receive all PVM's state.
--- include/exec/ram_addr.h | 1 + migration/migration.c | 2 + migration/ram.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++-- migration/ram.h | 4 ++ migration/savevm.c | 2 +- 5 files changed, 104 insertions(+), 4 deletions(-)
include/exec/ram_addr.h +1 -0
@@ -27,6 +27,7 @@ struct RAMBlock {struct rcu_head rcu;struct MemoryRegion *mr;uint8_t *host; +uint8_t *colo_cache;/* For colo, VM's ram cache */ ram_addr_t offset;ram_addr_t used_length;ram_addr_t max_length;
migration/migration.c +2 -0
@@ -421,6 +421,8 @@ static void process_incoming_migration_co(void *opaque)/* Wait checkpoint incoming thread exit before free resource */ qemu_thread_join (&mis->colo_incoming_thread); +/* We hold the global iothread lock, so it is safe here */ +colo_release_ram_cache (); }if (ret <0 ) {
migration/ram.c +96 -3
146 lines not on this page · raw message
migration/ram.h +4 -0
@@ -64,4 +64,8 @@ bool ramblock_recv_bitmap_test_byte_offset(RAMBlock *rb, uint64_t byte_offset);void ramblock_recv_bitmap_set (RAMBlock *rb,void *host_addr);void ramblock_recv_bitmap_set_range (RAMBlock *rb,void *host_addr,size_t nr); +/* ram cache */ +int colo_init_ram_cache (void ); +void colo_release_ram_cache (void ); +#endif
migration/savevm.c +1 -1
@@ -1807,7 +1807,7 @@ static int loadvm_handle_cmd_packaged(MigrationIncomingState *mis)static int loadvm_process_enable_colo (MigrationIncomingState *mis) {migration_incoming_enable_colo (); -return 0 ; +return colo_init_ram_cache (); }/*
Signature · 1 line
2.7.4
PATCH v7 8/17 ram/COLO: Record the dirty pages that SVM received
In reply to Zhang ChenWe record the address of the dirty pages that received, it will help flushing pages that cached into SVM.
Here, it is a trick, we record dirty pages by re-using migration dirty bitmap. In the later patch, we will start the dirty log for SVM, just like migration, in this way, we can record both the dirty pages caused by PVM and SVM, we only flush those dirty pages from RAM cache while do checkpoint.
--- migration/ram.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+)
migration/ram.c +33 -0
@@ -2531,6 +2531,15 @@ static inline void *colo_cache_from_block_offset(RAMBlock *block, __func__, block->idstr);return NULL ; } + +/* +* During colo checkpoint, we need bitmap of these migrated pages. +* It help us to decide which pages in ram cache should be flushed +* into VM's RAM later. +*/ +if (!test_and_set_bit (offset >>TARGET_PAGE_BITS , block->bmap)) { + ram_state->migration_dirty_pages++; + }return block->colo_cache + offset; }
@@ -2760,6 +2769,24 @@ int colo_init_ram_cache(void) } }rcu_read_unlock (); +/* +* Record the dirty pages that sent by PVM, we use this dirty bitmap together +* with to decide which page in cache should be flushed into SVM's RAM. Here +* we use the same name 'ram_bitmap' as for migration. +*/ +if (ram_bytes_total ()) { +RAMBlock *block; + + QLIST_FOREACH_RCU(block, &ram_list.blocks, next) { +unsigned long pages = block->max_length >>TARGET_PAGE_BITS ; + + block->bmap =bitmap_new (pages); +bitmap_set (block->bmap,0 , pages); + } + } + ram_state =g_new0 (RAMState,1 ); + ram_state->migration_dirty_pages =0 ; +return 0 ; out_locked:
@@ -2779,6 +2806,10 @@ void colo_release_ram_cache(void) {RAMBlock *block; + QLIST_FOREACH_RCU(block, &ram_list.blocks, next) { +g_free (block->bmap); + block->bmap =NULL ; + }rcu_read_lock (); QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {if (block->colo_cache) {
@@ -2787,6 +2818,8 @@ void colo_release_ram_cache(void) } }rcu_read_unlock (); +g_free (ram_state); + ram_state =NULL ; }/**
Signature · 1 line
2.7.4
PATCH v7 9/17 COLO: Flush memory data from ram cache
In reply to Zhang ChenDuring the time of VM's running, PVM may dirty some pages, we will transfer PVM's dirty pages to SVM and store them into SVM's RAM cache at next checkpoint time. So, the content of SVM's RAM cache will always be same with PVM's memory after checkpoint.
Instead of flushing all content of PVM's RAM cache into SVM's MEMORY, we do this in a more efficient way:
Only flush any page that dirtied by PVM since last checkpoint. In this way, we can ensure SVM's memory same with PVM's.
Besides, we must ensure flush RAM cache before load device state.
--- migration/ram.c | 39 +++++++++++++++++++++++++++++++++++++++ migration/trace-events | 2 ++ 2 files changed, 41 insertions(+)
migration/ram.c +39 -0
@@ -3031,6 +3031,40 @@ static bool postcopy_is_running(void)return ps >=POSTCOPY_INCOMING_LISTENING && ps <POSTCOPY_INCOMING_END ; } +/* +* Flush content of RAM cache into SVM's memory. +* Only flush the pages that be dirtied by PVM or SVM or both. +*/ +static void colo_flush_ram_cache (void ) +{ +RAMBlock *block =NULL ; +void *dst_host; +void *src_host; +unsigned long offset =0 ; + +trace_colo_flush_ram_cache_begin (ram_state->migration_dirty_pages); +rcu_read_lock (); + block =QLIST_FIRST_RCU (&ram_list.blocks); + +while (block) { + offset =migration_bitmap_find_dirty (ram_state, block, offset); +migration_bitmap_clear_dirty (ram_state, block, offset); + +if (offset <<TARGET_PAGE_BITS >= block->used_length) { + offset =0 ; + block =QLIST_NEXT_RCU (block, next); + }else { + dst_host = block->host + (offset <<TARGET_PAGE_BITS ); + src_host = block->colo_cache + (offset <<TARGET_PAGE_BITS ); +memcpy (dst_host, src_host,TARGET_PAGE_SIZE ); + } + } + +rcu_read_unlock (); +trace_colo_flush_ram_cache_end (); +assert (ram_state->migration_dirty_pages ==0 ); +} +static int ram_load (QEMUFile *f,void *opaque,int version_id) {int flags =0 , ret =0 , invalid_flags =0 ;
@@ -3043,6 +3077,7 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id)bool postcopy_running =postcopy_is_running ();/* ADVISE is earlier, it shows the source has the postcopy capability on */ bool postcopy_advised =postcopy_is_advised (); +bool need_flush = false; seq_iter++;
@@ -3218,6 +3253,10 @@ static int ram_load(QEMUFile *f, void *opaque, int version_id) ret |=wait_for_decompress_done ();rcu_read_unlock ();trace_ram_load_complete (ret, seq_iter); + +if (!ret &&migration_incoming_in_colo_state () && need_flush) { +colo_flush_ram_cache (); + }return ret; }
migration/trace-events +2 -0
@@ -78,6 +78,8 @@ ram_load_postcopy_loop(uint64_t addr, int flags) "@%" PRIx64 " %x" ram_postcopy_send_discard_bitmap(void) "" ram_save_page(const char *rbname, uint64_t offset, void *host) "%s: offset: 0x%" PRIx64 " host: %p" ram_save_queue_pages(const char *rbname, size_t start, size_t len) "%s: start: 0x%zx len: 0x%zx" +colo_flush_ram_cache_begin(uint64_t dirty_pages) "dirty_pages %" PRIu64 +colo_flush_ram_cache_end(void) "" # migration/migration.c await_return_path_close_on_source_close(void) ""
Signature · 1 line
2.7.4
PATCH v7 10/17 qmp event: Add COLO_EXIT event to notify users while exited COLO
In reply to Zhang ChenFrom: zhanghailiang <[email protected]>
If some errors happen during VM's COLO FT stage, it's important to notify the users of this event. Together with 'x-colo-lost-heartbeat', Users can intervene in COLO's failover work immediately.
If users don't want to get involved in COLO's failover verdict, it is still necessary to notify users that we exited COLO mode.
--- migration/colo.c | 20 ++++++++++++++++++++ qapi/migration.json | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+)
migration/colo.c +20 -0
@@ -28,6 +28,7 @@#include "net/colo-compare.h" #include "net/colo.h" #include "block/block.h" +#include "qapi/qapi-events-migration.h" static bool vmstate_loading;static Notifier packets_compare_notifier;
@@ -514,6 +515,18 @@ out:qemu_fclose (fb); } +/* +* There are only two reasons we can go here, some error happened. +* Or the user triggered failover. +*/ +if (failover_get_state () ==FAILOVER_STATUS_NONE ) { +qapi_event_send_colo_exit (COLO_MODE_PRIMARY , +COLO_EXIT_REASON_ERROR ,NULL ); + }else { +qapi_event_send_colo_exit (COLO_MODE_PRIMARY , +COLO_EXIT_REASON_REQUEST ,NULL ); + } +/* Hope this not to be too long to wait here */ qemu_sem_wait (&s->colo_exit_sem);qemu_sem_destroy (&s->colo_exit_sem);
@@ -744,6 +757,13 @@ out:if (local_err) {error_report_err (local_err); } +if (failover_get_state () ==FAILOVER_STATUS_NONE ) { +qapi_event_send_colo_exit (COLO_MODE_SECONDARY , +COLO_EXIT_REASON_ERROR ,NULL ); + }else { +qapi_event_send_colo_exit (COLO_MODE_SECONDARY , +COLO_EXIT_REASON_REQUEST ,NULL ); + }if (fb) {qemu_fclose (fb);
qapi/migration.json +37 -0
@@ -875,6 +875,43 @@ 'data': [ 'none', 'require', 'active', 'completed', 'relaunch' ] } ## +# @COLO_EXIT: +# +# Emitted when VM finishes COLO mode due to some errors happening or +# at the request of users. +# +# @mode: report COLO mode when COLO exited. +# +# @reason: describes the reason for the COLO exit. +# +# Since: 2.13 +# +# Example: +# +# <- { "timestamp": {"seconds": 2032141960, "microseconds": 417172}, +# "event": "COLO_EXIT", "data": {"mode": "primary", "reason": "request" } } +# +## +{ 'event': 'COLO_EXIT', + 'data': {'mode': 'COLOMode', 'reason': 'COLOExitReason' } } + +## +# @COLOExitReason: +# +# The reason for a COLO exit +# +# @none: no failover has ever happened. +# +# @request: COLO exit is due to an external request +# +# @error: COLO exit is due to an internal error +# +# Since: 2.13 +## +{ 'enum': 'COLOExitReason', + 'data': [ 'none', 'request', 'error' ] } + +## # @x-colo-lost-heartbeat: # # Tell qemu that heartbeat is lost, request it to do takeover procedures.
Signature · 1 line
2.7.4
Re: [Qemu-devel] [PATCH V7 10/17] qmp event: Add COLO_EXIT event to notify users while exited COLO
Quoted 34 lines · Zhang Chen
From: zhanghailiang <[email protected]>
If some errors happen during VM's COLO FT stage, it's important to notify the users of this event. Together with 'x-colo-lost-heartbeat', Users can intervene in COLO's failover work immediately.
If users don't want to get involved in COLO's failover verdict, it is still necessary to notify users that we exited COLO mode.Signed-off-by zhanghailiang <[email protected]>Signed-off-by Li Zhijian <[email protected]>Signed-off-by Zhang Chen <[email protected]>Reviewed-by Eric Blake <[email protected]>--- migration/colo.c | 20 ++++++++++++++++++++ qapi/migration.json | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+)migration/colo.c +2
-0@@ -28,6 +28,7 @@#include "net/colo-compare.h" #include "net/colo.h" #include "block/block.h" +#include "qapi/qapi-events-migration.h" static bool vmstate_loading;static Notifier packets_compare_notifier;@@ -514,6 +515,18 @@ out:qemu_fclose (fb); } +/*
migration/colo.c out: · line 528
Quoted 10 lines
migration/colo.c +10
-0+* There are only two reasons we can go here, some error happened. +* Or the user triggered failover. +*/ +if (failover_get_state () ==FAILOVER_STATUS_NONE ) { +qapi_event_send_colo_exit (COLO_MODE_PRIMARY , +COLO_EXIT_REASON_ERROR ,NULL ); + }else { +qapi_event_send_colo_exit (COLO_MODE_PRIMARY , +COLO_EXIT_REASON_REQUEST ,NULL ); + }
Your comment makes me suspect failover_get_state() can only be FAILOVER_STATUS_NONE or FAILOVER_STATUS_REQUIRE here. Is that correct?
If yes, I recommend to add a suitable assertion.
Quoted 5 lines
migration/colo.c +1
-0+/* Hope this not to be too long to wait here */ qemu_sem_wait (&s->colo_exit_sem);qemu_sem_destroy (&s->colo_exit_sem);
migration/colo.c out: · line 766
Quoted 10 lines
migration/colo.c +7
-0@@ -744,6 +757,13 @@ out:if (local_err) {error_report_err (local_err); } +if (failover_get_state () ==FAILOVER_STATUS_NONE ) { +qapi_event_send_colo_exit (COLO_MODE_SECONDARY , +COLO_EXIT_REASON_ERROR ,NULL ); + }else { +qapi_event_send_colo_exit (COLO_MODE_SECONDARY , +COLO_EXIT_REASON_REQUEST ,NULL ); + }
Same question.
Quoted 20 lines
migration/colo.c +0
-0if (fb) {qemu_fclose (fb);qapi/migration.json +9
-0@@ -875,6 +875,43 @@ 'data': [ 'none', 'require', 'active', 'completed', 'relaunch' ] } ## +# @COLO_EXIT: +# +# Emitted when VM finishes COLO mode due to some errors happening or +# at the request of users. +# +# @mode: report COLO mode when COLO exited. +# +# @reason: describes the reason for the COLO exit. +#
qapi/migration.json line 896
Quoted 10 lines
qapi/migration.json +10
-0+# Since: 2.13 +# +# Example: +# +# <- { "timestamp": {"seconds": 2032141960, "microseconds": 417172}, +# "event": "COLO_EXIT", "data": {"mode": "primary", "reason": "request" } } +# +## +{ 'event': 'COLO_EXIT', + 'data': {'mode': 'COLOMode', 'reason': 'COLOExitReason' } }
'data' duplicates the next patch's ColoStatus, except it lacks @colo-running. Factoring out the common part doesn't seem worth the bother. Okay as is.
qapi/migration.json line 903
Quoted 7 lines
qapi/migration.json +7
-0+ +## +# @COLOExitReason: +# +# The reason for a COLO exit +# +# @none: no failover has ever happened.
This can't occur in the COLO_EXIT event, only in the result of query-colo-status, can it?
Worth spelling that out in the documentation?
Quoted 14 lines
qapi/migration.json +11
-0+# +# @request: COLO exit is due to an external request +# +# @error: COLO exit is due to an internal error +# +# Since: 2.13 +## +{ 'enum': 'COLOExitReason', + 'data': [ 'none', 'request', 'error' ] } + +## # @x-colo-lost-heartbeat: # # Tell qemu that heartbeat is lost, request it to do takeover procedures.
Re: [Qemu-devel] [PATCH V7 10/17] qmp event: Add COLO_EXIT event to notify users while exited COLO
Quoted 50 lines · Markus Armbruster
Quoted 34 lines · Zhang Chen
From: zhanghailiang <[email protected]>
If some errors happen during VM's COLO FT stage, it's important to notify the users of this event. Together with 'x-colo-lost-heartbeat', Users can intervene in COLO's failover work immediately.
If users don't want to get involved in COLO's failover verdict, it is still necessary to notify users that we exited COLO mode.Signed-off-by zhanghailiang <[email protected]>Signed-off-by Li Zhijian <[email protected]>Signed-off-by Zhang Chen <[email protected]>Reviewed-by Eric Blake <[email protected]>--- migration/colo.c | 20 ++++++++++++++++++++ qapi/migration.json | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+)migration/colo.c +2
-0@@ -28,6 +28,7 @@#include "net/colo-compare.h" #include "net/colo.h" #include "block/block.h" +#include "qapi/qapi-events-migration.h" static bool vmstate_loading;static Notifier packets_compare_notifier;@@ -514,6 +515,18 @@ out:qemu_fclose (fb); } +/* migration/colo.c out: · line 528
Quoted 10 lines
migration/colo.c +10
-0+* There are only two reasons we can go here, some error happened. +* Or the user triggered failover. +*/ +if (failover_get_state () ==FAILOVER_STATUS_NONE ) { +qapi_event_send_colo_exit (COLO_MODE_PRIMARY , +COLO_EXIT_REASON_ERROR ,NULL ); + }else { +qapi_event_send_colo_exit (COLO_MODE_PRIMARY , +COLO_EXIT_REASON_REQUEST ,NULL ); + }Your comment makes me suspect
failover_get_state()can only beFAILOVER_STATUS_NONEorFAILOVER_STATUS_REQUIREhere. Is that correct?
Quoted 2 lines
If yes, I recommend to add a suitable assertion.
Yes, and what kinds of 'suitable assertion'? Just for the 'failover_get_state()' ?
Quoted 55 lines
Quoted 6 lines
migration/colo.c +1
-0+/* Hope this not to be too long to wait here */ qemu_sem_wait (&s->colo_exit_sem);qemu_sem_destroy (&s->colo_exit_sem);migration/colo.c out: · line 766
Quoted 10 lines
migration/colo.c +7
-0@@ -744,6 +757,13 @@ out:if (local_err) {error_report_err (local_err); } +if (failover_get_state () ==FAILOVER_STATUS_NONE ) { +qapi_event_send_colo_exit (COLO_MODE_SECONDARY , +COLO_EXIT_REASON_ERROR ,NULL ); + }else { +qapi_event_send_colo_exit (COLO_MODE_SECONDARY , +COLO_EXIT_REASON_REQUEST ,NULL ); + }Same question.
Quoted 16 lines
migration/colo.c +0
-0if (fb) {qemu_fclose (fb);qapi/migration.json +5
-0@@ -875,6 +875,43 @@ 'data': [ 'none', 'require', 'active', 'completed', 'relaunch' ] } ## +# @COLO_EXIT: +# +# Emitted when VM finishes COLO mode due to some errors happening or +# at the request of users. +#qapi/migration.json line 892
Quoted 10 lines
qapi/migration.json +10
-0+# @mode: report COLO mode when COLO exited. +# +# @reason: describes the reason for the COLO exit. +# +# Since: 2.13 +# +# Example: +# +# <- { "timestamp": {"seconds": 2032141960, "microseconds": 417172}, +# "event": "COLO_EXIT", "data": {"mode": "primary", "reason":"request" } }
qapi/migration.json line 896
Quoted 4 lines
qapi/migration.json +4
-0+# +## +{ 'event': 'COLO_EXIT', + 'data': {'mode': 'COLOMode', 'reason': 'COLOExitReason' } }'data' duplicates the next patch's ColoStatus, except it lacks @colo-running. Factoring out the common part doesn't seem worth the bother. Okay as is.
Quoted 10 lines
qapi/migration.json line 903
Quoted 7 lines
qapi/migration.json +7
-0+ +## +# @COLOExitReason: +# +# The reason for a COLO exit +# +# @none: no failover has ever happened.This can't occur in the
COLO_EXITevent, only in the result of query-colo-status, can it?
Yes.
Quoted 3 lines
Worth spelling that out in the documentation?
OK, I will add more comments here in next version.
Thanks
Zhang Chen
Quoted 16 lines
Quoted 4 lines
qapi/migration.json +4
-0+# +# @request: COLO exit is due to an external request +# +# @error: COLO exit is due to an internal errorqapi/migration.json
Quoted 10 lines
qapi/migration.json +7
-0+# +# Since: 2.13 +## +{ 'enum': 'COLOExitReason', + 'data': [ 'none', 'request', 'error' ] } + +## # @x-colo-lost-heartbeat: # # Tell qemu that heartbeat is lost, request it to do takeoverprocedures.
Re: [Qemu-devel] [PATCH V7 10/17] qmp event: Add COLO_EXIT event to notify users while exited COLO
Quoted 53 lines · Zhang Chen
Quoted 50 lines · Markus Armbruster
Quoted 34 lines · Zhang Chen
From: zhanghailiang <[email protected]>
If some errors happen during VM's COLO FT stage, it's important to notify the users of this event. Together with 'x-colo-lost-heartbeat', Users can intervene in COLO's failover work immediately.
If users don't want to get involved in COLO's failover verdict, it is still necessary to notify users that we exited COLO mode.Signed-off-by zhanghailiang <[email protected]>Signed-off-by Li Zhijian <[email protected]>Signed-off-by Zhang Chen <[email protected]>Reviewed-by Eric Blake <[email protected]>--- migration/colo.c | 20 ++++++++++++++++++++ qapi/migration.json | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+)migration/colo.c +2
-0@@ -28,6 +28,7 @@#include "net/colo-compare.h" #include "net/colo.h" #include "block/block.h" +#include "qapi/qapi-events-migration.h" static bool vmstate_loading;static Notifier packets_compare_notifier;@@ -514,6 +515,18 @@ out:qemu_fclose (fb); } +/* migration/colo.c out: · line 528
Quoted 10 lines
migration/colo.c +10
-0+* There are only two reasons we can go here, some error happened. +* Or the user triggered failover. +*/ +if (failover_get_state () ==FAILOVER_STATUS_NONE ) { +qapi_event_send_colo_exit (COLO_MODE_PRIMARY , +COLO_EXIT_REASON_ERROR ,NULL ); + }else { +qapi_event_send_colo_exit (COLO_MODE_PRIMARY , +COLO_EXIT_REASON_REQUEST ,NULL ); + }Your comment makes me suspect
failover_get_state()can only beFAILOVER_STATUS_NONEorFAILOVER_STATUS_REQUIREhere. Is that correct?
Quoted 1 line
Quoted 1 line
If yes, I recommend to add a suitable assertion.
... to make the possible states immediately obvious. The fact that you felt a need for a comment is further evidence of non-obviousness.
Quoted 3 lines
Yes, and what kinds of 'suitable assertion'? Just for the '
failover_get_state()' ?
Here's one way to skin this cat:
failover_state = failover_get_state();
if (failover_state == FAILOVER_STATUS_NONE) {
qapi_event_send_colo_exit(COLO_MODE_PRIMARY,
COLO_EXIT_REASON_ERROR, NULL);
} else {
assert(failover_state == FAILOVER_STATUS_REQUIRE);
qapi_event_send_colo_exit(COLO_MODE_PRIMARY,
COLO_EXIT_REASON_REQUEST, NULL);
}Another one:
switch (failover_get_state() {
case FAILOVER_STATUS_NONE:
qapi_event_send_colo_exit(COLO_MODE_PRIMARY,
COLO_EXIT_REASON_ERROR, NULL);
break;
case FAILOVER_STATUS_REQUIRE:
qapi_event_send_colo_exit(COLO_MODE_PRIMARY,
COLO_EXIT_REASON_REQUEST, NULL);
break;
default:
abort();
}Either way, the possible states are immediately obvious. The run time check is a nice bonus.
With just your comment, the reader still has to make the connection from the comment's prose to states, i.e. from "some error happened" to FAILOVER_STATUS_NONE, and from "user triggered failover" to FAILOVER_STATUS_REQUIRE.
[...]
Re: [Qemu-devel] [PATCH V7 10/17] qmp event: Add COLO_EXIT event to notify users while exited COLO
Quoted 95 lines · Markus Armbruster
Quoted 32 lines · Zhang Chen
Quoted 29 lines · Markus Armbruster
Quoted 27 lines · Zhang Chen
From: zhanghailiang <[email protected]>
If some errors happen during VM's COLO FT stage, it's important to notify the users of this event. Together with 'x-colo-lost-heartbeat', Users can intervene in COLO's failover work immediately.
If users don't want to get involved in COLO's failover verdict, it is still necessary to notify users that we exited COLO mode.Signed-off-by zhanghailiang <[email protected]>Signed-off-by Li Zhijian <[email protected]>Signed-off-by Zhang Chen <[email protected]>Reviewed-by Eric Blake <[email protected]>--- migration/colo.c | 20 ++++++++++++++++++++ qapi/migration.json | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+)migration/colo.c +1
-0@@ -28,6 +28,7 @@#include "net/colo-compare.h" #include "net/colo.h" #include "block/block.h" +#include "qapi/qapi-events-migration.h" Quoted 8 lines
Quoted 8 lines
migration/colo.c out: · line 519
Quoted 8 lines
migration/colo.c +2
-0static bool vmstate_loading;static Notifier packets_compare_notifier;@@ -514,6 +515,18 @@ out:qemu_fclose (fb); } +/* +* There are only two reasons we can go here, some error happened.
Quoted 10 lines
Quoted 10 lines
Quoted 9 lines
migration/colo.c +9
-0+* Or the user triggered failover. +*/ +if (failover_get_state () ==FAILOVER_STATUS_NONE ) { +qapi_event_send_colo_exit (COLO_MODE_PRIMARY , +COLO_EXIT_REASON_ERROR ,NULL ); + }else { +qapi_event_send_colo_exit (COLO_MODE_PRIMARY , +COLO_EXIT_REASON_REQUEST ,NULL ); + }Quoted 4 lines
Quoted 4 lines
Your comment makes me suspect
failover_get_state()can only beFAILOVER_STATUS_NONEorFAILOVER_STATUS_REQUIREhere. Is that correct?If yes, I recommend to add a suitable assertion.
... to make the possible states immediately obvious. The fact that you felt a need for a comment is further evidence of non-obviousness.
Quoted 3 lines
Yes, and what kinds of 'suitable assertion'? Just for the '
failover_get_state()' ?Here's one way to skin this cat:
failover_state = failover_get_state(); if (failover_state == FAILOVER_STATUS_NONE) { qapi_event_send_colo_exit(COLO_MODE_PRIMARY, COLO_EXIT_REASON_ERROR, NULL); } else { assert(failover_state == FAILOVER_STATUS_REQUIRE); qapi_event_send_colo_exit(COLO_MODE_PRIMARY, COLO_EXIT_REASON_REQUEST, NULL); }Another one:
switch (failover_get_state() { case FAILOVER_STATUS_NONE: qapi_event_send_colo_exit(COLO_MODE_PRIMARY, COLO_EXIT_REASON_ERROR, NULL); break; case FAILOVER_STATUS_REQUIRE: qapi_event_send_colo_exit(COLO_MODE_PRIMARY, COLO_EXIT_REASON_REQUEST, NULL); break; default: abort(); }Either way, the possible states are immediately obvious. The run time check is a nice bonus.
Quoted 7 lines
With just your comment, the reader still has to make the connection from the comment's prose to states, i.e. from "some error happened" to
FAILOVER_STATUS_NONE, and from "user triggered failover" toFAILOVER_STATUS_REQUIRE.[...]
I got it, thanks for your detailed reply.
I will fix it in next version.
Thanks
Zhang Chen
PATCH v7 11/17 qapi: Add new command to query colo status
In reply to Zhang ChenLibvirt or other high level software can use this command query colo status. You can test this command like that:
{'execute':'query-colo-status'}
--- migration/colo.c | 34 ++++++++++++++++++++++++++++++++++ qapi/migration.json | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+)
migration/colo.c +34 -0
@@ -29,6 +29,7 @@#include "net/colo.h" #include "block/block.h" #include "qapi/qapi-events-migration.h" +#include "qapi/qmp/qerror.h" static bool vmstate_loading;static Notifier packets_compare_notifier;
@@ -237,6 +238,39 @@ void qmp_xen_colo_do_checkpoint(Error **errp)#endif } +COLOStatus *qmp_query_colo_status (Error **errp) +{ +int state; +COLOStatus *s =g_new0 (COLOStatus,1 ); + +if (get_colo_mode () ==COLO_MODE_UNKNOWN ) { +error_setg (errp,QERR_FEATURE_DISABLED ,"colo" ); + s->colo_running = false; + goto out; + }else if (get_colo_mode () ==COLO_MODE_PRIMARY ) { + state =migrate_get_current ()->state; + }else { + state =migration_incoming_get_current ()->state; + } + s->colo_running = state ==MIGRATION_STATUS_COLO ; + +out: + s->mode =get_colo_mode (); + +switch (failover_get_state ()) { +case FAILOVER_STATUS_NONE : + s->reason =COLO_EXIT_REASON_NONE ; +break ; +case FAILOVER_STATUS_REQUIRE : + s->reason =COLO_EXIT_REASON_REQUEST ; +break ; +default : + s->reason =COLO_EXIT_REASON_ERROR ; + } + +return s; +} +static void colo_send_message (QEMUFile *f,COLOMessage msg,Error **errp) {
qapi/migration.json +33 -0
@@ -1220,3 +1220,36 @@ # Since: 2.9 ## { 'command': 'xen-colo-do-checkpoint' } + +## +# @COLOStatus: +# +# The result format for 'query-colo-status'. +# +# @mode: which COLO mode the VM was in when it exited. +# +# @colo-running: true if COLO is running. +# +# @reason: describes the reason for the COLO exit. +# +# Since: 2.13 +## +{ 'struct': 'COLOStatus', + 'data': { 'mode': 'COLOMode', 'colo-running': 'bool', 'reason': 'COLOExitReason' } } + +## +# @query-colo-status: +# +# Query COLO status while the vm is running. +# +# Returns: A @COLOStatus object showing the status. +# +# Example: +# +# -> { "execute": "query-colo-status" } +# <- { "return": { "mode": "primary", "colo-running": true, "reason": "request" } } +# +# Since: 2.13 +## +{ 'command': 'query-colo-status', + 'returns': 'COLOStatus' }
Signature · 1 line
2.7.4
Re: [Qemu-devel] [PATCH V7 11/17] qapi: Add new command to query colo status
Quoted 30 lines · Zhang Chen
Libvirt or other high level software can use this command query colo status. You can test this command like that:
{'execute':'query-colo-status'}Signed-off-by Zhang Chen <[email protected]>--- migration/colo.c | 34 ++++++++++++++++++++++++++++++++++ qapi/migration.json | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+)migration/colo.c +5
-0@@ -29,6 +29,7 @@#include "net/colo.h" #include "block/block.h" #include "qapi/qapi-events-migration.h" +#include "qapi/qmp/qerror.h" static bool vmstate_loading;static Notifier packets_compare_notifier;@@ -237,6 +238,39 @@ void qmp_xen_colo_do_checkpoint(Error **errp)#endif } +COLOStatus *qmp_query_colo_status (Error **errp) +{ +int state; +COLOStatus *s =g_new0 (COLOStatus,1 );
migration/colo.c void qmp_xen_colo_do_checkpoint(Error **errp) · line 254
Quoted 10 lines
migration/colo.c +10
-0+ +if (get_colo_mode () ==COLO_MODE_UNKNOWN ) { +error_setg (errp,QERR_FEATURE_DISABLED ,"colo" ); + s->colo_running = false; + goto out; + }else if (get_colo_mode () ==COLO_MODE_PRIMARY ) { + state =migrate_get_current ()->state; + }else { + state =migration_incoming_get_current ()->state; + }
Indentation's off, as patchew pointed out. Perhaps the maintainer could fix that for you.
migration/colo.c void qmp_xen_colo_do_checkpoint(Error **errp) · line 258
Quoted 4 lines
migration/colo.c +4
-0+ s->colo_running = state ==MIGRATION_STATUS_COLO ; + +out: + s->mode =get_colo_mode ();
I'm okay with this.
If you need to respin anyway, consider whether you like this better:
s->mode = get_colo_mode();
switch (s->mode) {
case COLO_MODE_UNKNOWN:
error_setg(errp, "COLO is disabled");
state = MIGRATION_STATUS_NONE;
break;
case COLO_MODE_PRIMARY:
state = migrate_get_current()->state;
break;
case COLO_MODE_SECONDARY:
state = migration_incoming_get_current()->state;
break;
default:
abort();
}
s->colo_running = state == MIGRATION_STATUS_COLO;Aside: we should really finish off the QERR_ macros.
Quoted 23 lines
migration/colo.c +15
-0+ +switch (failover_get_state ()) { +case FAILOVER_STATUS_NONE : + s->reason =COLO_EXIT_REASON_NONE ; +break ; +case FAILOVER_STATUS_REQUIRE : + s->reason =COLO_EXIT_REASON_REQUEST ; +break ; +default : + s->reason =COLO_EXIT_REASON_ERROR ; + } + +return s; +} +static void colo_send_message (QEMUFile *f,COLOMessage msg,Error **errp) {qapi/migration.json +0
-0
qapi/migration.json line 1229
Quoted 10 lines
qapi/migration.json +7
-0@@ -1220,3 +1220,36 @@ # Since: 2.9 ## { 'command': 'xen-colo-do-checkpoint' } + +## +# @COLOStatus: +# +# The result format for 'query-colo-status'. +# +# @mode: which COLO mode the VM was in when it exited.
Pardon my COLO-ignorance...
What does "when it exited" mean?
What's the value of @mode before "it exited"?
qapi/migration.json line 1231
Quoted 1 line
qapi/migration.json +1
-0+# @colo-running: true if COLO is running.
If COLO is running, has "it exited", yet?
qapi/migration.json line 1232
Quoted 2 lines
qapi/migration.json +2
-0+# +# @reason: describes the reason for the COLO exit.
What's the value of @reason before a "COLO exit"?
Remember, while a COLO_EXIT event is tied to an exit, a query-colo-status can be executed at any time, in particular before any "COLO exit".
Quoted 12 lines
qapi/migration.json +12
-0+# +# Since: 2.13 +## +{ 'struct': 'COLOStatus', + 'data': { 'mode': 'COLOMode', 'colo-running': 'bool', 'reason': 'COLOExitReason' } } + +## +# @query-colo-status: +# +# Query COLO status while the vm is running. +# +# Returns: A @COLOStatus object showing the status.
qapi/migration.json line 1255
Quoted 10 lines
qapi/migration.json +10
-0+# +# Example: +# +# -> { "execute": "query-colo-status" } +# <- { "return": { "mode": "primary", "colo-running": true, "reason": "request" } } +# +# Since: 2.13 +## +{ 'command': 'query-colo-status', + 'returns': 'COLOStatus' }
Almost ready :)
Re: [Qemu-devel] [PATCH V7 11/17] qapi: Add new command to query colo status
Quoted 38 lines · Markus Armbruster
Quoted 1 line · Zhang Chen
Libvirt or other high level software can use this command query colo
status.
Quoted 34 lines
You can test this command like that:
{'execute':'query-colo-status'}Signed-off-by Zhang Chen <[email protected]>--- migration/colo.c | 34 ++++++++++++++++++++++++++++++++++ qapi/migration.json | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+)migration/colo.c +10
-0@@ -29,6 +29,7 @@#include "net/colo.h" #include "block/block.h" #include "qapi/qapi-events-migration.h" +#include "qapi/qmp/qerror.h" static bool vmstate_loading;static Notifier packets_compare_notifier;@@ -237,6 +238,39 @@ void qmp_xen_colo_do_checkpoint(Error **errp)#endif } +COLOStatus *qmp_query_colo_status (Error **errp) +{ +int state; +COLOStatus *s =g_new0 (COLOStatus,1 ); + +if (get_colo_mode () ==COLO_MODE_UNKNOWN ) { +error_setg (errp,QERR_FEATURE_DISABLED ,"colo" ); + s->colo_running = false; + goto out;
Quoted 9 lines
migration/colo.c void qmp_xen_colo_do_checkpoint(Error **errp) · line 254
Quoted 5 lines
migration/colo.c +5
-0+ }else if (get_colo_mode () ==COLO_MODE_PRIMARY ) { + state =migrate_get_current ()->state; + }else { + state =migration_incoming_get_current ()->state; + }Indentation's off, as patchew pointed out. Perhaps the maintainer could fix that for you.
I have sent the "RESEND" version fix this problem.
Quoted 27 lines
migration/colo.c void qmp_xen_colo_do_checkpoint(Error **errp) · line 258
Quoted 5 lines
migration/colo.c +4
-0+ s->colo_running = state ==MIGRATION_STATUS_COLO ; + +out: + s->mode =get_colo_mode ();I'm okay with this.
If you need to respin anyway, consider whether you like this better:
s->mode = get_colo_mode(); switch (s->mode) { case COLO_MODE_UNKNOWN: error_setg(errp, "COLO is disabled"); state = MIGRATION_STATUS_NONE; break; case COLO_MODE_PRIMARY: state = migrate_get_current()->state; break; case COLO_MODE_SECONDARY: state = migration_incoming_get_current()->state; break; default: abort(); } s->colo_running = state == MIGRATION_STATUS_COLO;
Quoted 2 lines
Aside: we should really finish off the
QERR_macros.
OK, I will remove the QERR_macros and change to this style in next version.
Quoted 37 lines
Quoted 24 lines
migration/colo.c +15
-0+ +switch (failover_get_state ()) { +case FAILOVER_STATUS_NONE : + s->reason =COLO_EXIT_REASON_NONE ; +break ; +case FAILOVER_STATUS_REQUIRE : + s->reason =COLO_EXIT_REASON_REQUEST ; +break ; +default : + s->reason =COLO_EXIT_REASON_ERROR ; + } + +return s; +} +static void colo_send_message (QEMUFile *f,COLOMessage msg,Error **errp) {qapi/migration.json +0
-0qapi/migration.json line 1229
Quoted 10 lines
qapi/migration.json +7
-0@@ -1220,3 +1220,36 @@ # Since: 2.9 ## { 'command': 'xen-colo-do-checkpoint' } + +## +# @COLOStatus: +# +# The result format for 'query-colo-status'. +# +# @mode: which COLO mode the VM was in when it exited.Pardon my COLO-ignorance...
Quoted 2 lines
What does "when it exited" mean?
Sorry, this is a typo, change the 'exited' to 'exist'.
Quoted 7 lines
What's the value of @mode before "it exited"?
qapi/migration.json line 1231
Quoted 1 line
qapi/migration.json +1
-0+# @colo-running: true if COLO is running.If COLO is running, has "it exited", yet?
If COLO running, this field will return 'primary' or 'secondary' mode.
Quoted 10 lines
qapi/migration.json line 1232
Quoted 3 lines
qapi/migration.json +2
-0+# +# @reason: describes the reason for the COLO exit.What's the value of @reason before a "COLO exit"?
Remember, while a
COLO_EXITevent is tied to an exit, a query-colo-status can be executed at any time, in particular before any "COLO exit".
Yes, you are right.
Thanks
Zhang Chen
Quoted 28 lines
qapi/migration.json
Quoted 6 lines
qapi/migration.json +5
-0+# +# Since: 2.13 +## +{ 'struct': 'COLOStatus', + 'data': { 'mode': 'COLOMode', 'colo-running': 'bool', 'reason':'COLOExitReason' } }
qapi/migration.json
Quoted 12 lines
qapi/migration.json +12
-0+ +## +# @query-colo-status: +# +# Query COLO status while the vm is running. +# +# Returns: A @COLOStatus object showing the status. +# +# Example: +# +# -> { "execute": "query-colo-status" } +# <- { "return": { "mode": "primary", "colo-running": true, "reason":"request" } }
qapi/migration.json line 1255
Quoted 5 lines
qapi/migration.json +5
-0+# +# Since: 2.13 +## +{ 'command': 'query-colo-status', + 'returns': 'COLOStatus' }Almost ready :)
PATCH v7 12/17 savevm: split the process of different stages for loadvm/savevm
In reply to Zhang ChenFrom: zhanghailiang <[email protected]>
There are several stages during loadvm/savevm process. In different stage, migration incoming processes different types of sections.
We want to control these stages more accuracy, it will benefit COLO performance, we don't have to save type of QEMU_VM_SECTION_START sections everytime while do checkpoint, besides, we want to separate the process of saving/loading memory and devices state.
So we add three new helper functions: qemu_load_device_state() and qemu_savevm_live_state() to achieve different process during migration.
Besides, we make qemu_loadvm_state_main() and qemu_save_device_state() public, and simplify the codes of qemu_save_device_state() by calling the wrapper qemu_savevm_state_header().
--- migration/colo.c | 36 ++++++++++++++++++++++++++++-------- migration/savevm.c | 35 ++++++++++++++++++++++++++++------- migration/savevm.h | 4 ++++ 3 files changed, 60 insertions(+), 15 deletions(-)
migration/colo.c +28 -8
@@ -30,6 +30,7 @@#include "block/block.h" #include "qapi/qapi-events-migration.h" #include "qapi/qmp/qerror.h" +#include "sysemu/cpus.h" static bool vmstate_loading;static Notifier packets_compare_notifier;
@@ -414,24 +415,31 @@ static int colo_do_checkpoint_transaction(MigrationState *s,/* Disable block migration */ migrate_set_block_enabled (false, &local_err); -qemu_savevm_state_header (fb); -qemu_savevm_state_setup (fb);qemu_mutex_lock_iothread ();replication_do_checkpoint_all (&local_err);if (local_err) {qemu_mutex_unlock_iothread (); goto out; } -qemu_savevm_state_complete_precopy (fb, false, false); -qemu_mutex_unlock_iothread (); - -qemu_fflush (fb);colo_send_message (s->to_dst_file,COLO_MESSAGE_VMSTATE_SEND , &local_err);if (local_err) { goto out; }/* +* Only save VM's live state, which not including device state. +* TODO: We may need a timeout mechanism to prevent COLO process +* to be blocked here. +*/ +qemu_savevm_live_state (s->to_dst_file); +/* Note: device state is saved into buffer */ + ret =qemu_save_device_state (fb); + +qemu_mutex_unlock_iothread (); + +qemu_fflush (fb); + +/* * We need the size of the VMstate data in Secondary side, * With which we can decide how much data should be read. */
@@ -643,6 +651,7 @@ void *colo_process_incoming_thread(void *opaque)uint64_t total_size;uint64_t value;Error *local_err =NULL ; +int ret;qemu_sem_init (&mis->colo_incoming_sem,0 );
@@ -715,6 +724,16 @@ void *colo_process_incoming_thread(void *opaque) goto out; } +qemu_mutex_lock_iothread (); +cpu_synchronize_all_pre_loadvm (); + ret =qemu_loadvm_state_main (mis->from_src_file, mis); +qemu_mutex_unlock_iothread (); + +if (ret <0 ) { +error_report ("Load VM's live state (ram) error" ); + goto out; + } + value =colo_receive_message_value (mis->from_src_file,COLO_MESSAGE_VMSTATE_SIZE , &local_err);if (local_err) {
@@ -748,8 +767,9 @@ void *colo_process_incoming_thread(void *opaque)qemu_mutex_lock_iothread ();qemu_system_reset (SHUTDOWN_CAUSE_NONE ); vmstate_loading = true; -if (qemu_loadvm_state (fb) <0 ) { -error_report ("COLO: loadvm failed" ); + ret =qemu_load_device_state (fb); +if (ret <0 ) { +error_report ("COLO: load device state failed" );qemu_mutex_unlock_iothread (); goto out; }
migration/savevm.c +28 -7
@@ -1332,13 +1332,20 @@ done:return ret; } -static int qemu_save_device_state (QEMUFile *f) +void qemu_savevm_live_state (QEMUFile *f) { -SaveStateEntry *se; +/* save QEMU_VM_SECTION_END section */ +qemu_savevm_state_complete_precopy (f, true, false); +qemu_put_byte (f,QEMU_VM_EOF ); +} -qemu_put_be32 (f,QEMU_VM_FILE_MAGIC ); -qemu_put_be32 (f,QEMU_VM_FILE_VERSION ); +int qemu_save_device_state (QEMUFile *f) +{ +SaveStateEntry *se; +if (!migration_in_colo_state ()) { +qemu_savevm_state_header (f); + }cpu_synchronize_all_states (); QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
@@ -1394,8 +1401,6 @@ enum LoadVMExitCodes { LOADVM_QUIT = 1, }; -static int qemu_loadvm_state_main (QEMUFile *f,MigrationIncomingState *mis); -/* ------ incoming postcopy messages ------ */ /* 'advise' arrives before any transfers just to tell us that a postcopy * *might* happen - it might be skipped if precopy transferred everything
@@ -2075,7 +2080,7 @@ void qemu_loadvm_state_cleanup(void) } } -static int qemu_loadvm_state_main (QEMUFile *f,MigrationIncomingState *mis) +int qemu_loadvm_state_main (QEMUFile *f,MigrationIncomingState *mis) {uint8_t section_type;int ret =0 ;
@@ -2229,6 +2234,22 @@ int qemu_loadvm_state(QEMUFile *f)return ret; } +int qemu_load_device_state (QEMUFile *f) +{ +MigrationIncomingState *mis =migration_incoming_get_current (); +int ret; + +/* Load QEMU_VM_SECTION_FULL section */ + ret =qemu_loadvm_state_main (f, mis); +if (ret <0 ) { +error_report ("Failed to load device state: %d" , ret); +return ret; + } + +cpu_synchronize_all_post_init (); +return 0 ; +} +int save_snapshot (const char *name,Error **errp) {BlockDriverState *bs, *bs1;
migration/savevm.h +4 -0
@@ -53,8 +53,12 @@ void qemu_savevm_send_postcopy_ram_discard(QEMUFile *f, const char *name,uint64_t *start_list, uint64_t *length_list);void qemu_savevm_send_colo_enable (QEMUFile *f); +void qemu_savevm_live_state (QEMUFile *f); +int qemu_save_device_state (QEMUFile *f);int qemu_loadvm_state (QEMUFile *f);void qemu_loadvm_state_cleanup (void ); +int qemu_loadvm_state_main (QEMUFile *f,MigrationIncomingState *mis); +int qemu_load_device_state (QEMUFile *f);#endif
Signature · 1 line
2.7.4
PATCH v7 13/17 COLO: flush host dirty ram from cache
In reply to Zhang ChenFrom: zhanghailiang <[email protected]>
Don't need to flush all VM's ram from cache, only
flush the dirty pages since last checkpoint
--- migration/ram.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
migration/ram.c +12 -0
@@ -2786,6 +2786,7 @@ int colo_init_ram_cache(void) } ram_state =g_new0 (RAMState,1 ); ram_state->migration_dirty_pages =0 ; +memory_global_dirty_log_start ();return 0 ;
@@ -2806,10 +2807,12 @@ void colo_release_ram_cache(void) {RAMBlock *block; +memory_global_dirty_log_stop (); QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {g_free (block->bmap); block->bmap =NULL ; } +rcu_read_lock (); QLIST_FOREACH_RCU(block, &ram_list.blocks, next) {if (block->colo_cache) {
@@ -3042,6 +3045,15 @@ static void colo_flush_ram_cache(void)void *src_host;unsigned long offset =0 ; +memory_global_dirty_log_sync (); +qemu_mutex_lock (&ram_state->bitmap_mutex); +rcu_read_lock (); +RAMBLOCK_FOREACH (block) { +migration_bitmap_sync_range (ram_state, block,0 , block->used_length); + } +rcu_read_unlock (); +qemu_mutex_unlock (&ram_state->bitmap_mutex); +trace_colo_flush_ram_cache_begin (ram_state->migration_dirty_pages);rcu_read_lock (); block =QLIST_FIRST_RCU (&ram_list.blocks);
Signature · 1 line
2.7.4
PATCH v7 14/17 filter: Add handle_event method for NetFilterClass
In reply to Zhang ChenFilter needs to process the event of checkpoint/failover or other event passed by COLO frame.
--- include/net/filter.h | 5 +++++ net/filter.c | 17 +++++++++++++++++ net/net.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+)
include/net/filter.h +5 -0
@@ -38,6 +38,8 @@ typedef ssize_t (FilterReceiveIOV)(NetFilterState *nc,typedef void (FilterStatusChanged ) (NetFilterState *nf,Error **errp); +typedef void (FilterHandleEvent ) (NetFilterState *nf,int event,Error **errp); + typedef struct NetFilterClass { ObjectClass parent_class;
@@ -45,6 +47,7 @@ typedef struct NetFilterClass {FilterSetup *setup;FilterCleanup *cleanup;FilterStatusChanged *status_changed; +FilterHandleEvent *handle_event;/* mandatory */ FilterReceiveIOV *receive_iov; } NetFilterClass;
@@ -77,4 +80,6 @@ ssize_t qemu_netfilter_pass_to_next(NetClientState *sender,int iovcnt, void *opaque); +void colo_notify_filters_event (int event,Error **errp); +#endif /* QEMU_NET_FILTER_H */
net/filter.c +17 -0
@@ -17,6 +17,8 @@#include "net/vhost_net.h" #include "qom/object_interfaces.h" #include "qemu/iov.h" +#include "net/colo.h" +#include "migration/colo.h" static inline bool qemu_can_skip_netfilter (NetFilterState *nf) {
@@ -245,11 +247,26 @@ static void netfilter_finalize(Object *obj)g_free (nf->netdev_id); } +static void dummy_handle_event (NetFilterState *nf,int event,Error **errp) +{ +switch (event) { +case COLO_EVENT_CHECKPOINT : +break ; +case COLO_EVENT_FAILOVER : +object_property_set_str (OBJECT (nf),"off" ,"status" , errp); +break ; +default : +break ; + } +} +static void netfilter_class_init (ObjectClass *oc,void *data) {UserCreatableClass *ucc =USER_CREATABLE_CLASS (oc); +NetFilterClass *nfc =NETFILTER_CLASS (oc); ucc->complete = netfilter_complete; + nfc->handle_event = dummy_handle_event; }static const TypeInfo netfilter_info = {
net/net.c +28 -0
@@ -1335,6 +1335,34 @@ void hmp_info_network(Monitor *mon, const QDict *qdict) } } +void colo_notify_filters_event (int event,Error **errp) +{ +NetClientState *nc, *peer; +NetClientDriver type; +NetFilterState *nf; +NetFilterClass *nfc =NULL ; +Error *local_err =NULL ; + + QTAILQ_FOREACH(nc, &net_clients, next) { + peer = nc->peer; + type = nc->info->type; +if (!peer || type !=NET_CLIENT_DRIVER_TAP ) { +continue ; + } + QTAILQ_FOREACH(nf, &nc->filters, next) { + nfc =NETFILTER_GET_CLASS (OBJECT (nf)); +if (!nfc->handle_event) { +continue ; + } + nfc->handle_event (nf, event, &local_err); +if (local_err) { +error_propagate (errp, local_err); +return ; + } + } + } +} +void qmp_set_link (const char *name,bool up,Error **errp) {NetClientState *ncs[MAX_QUEUE_NUM ];
Signature · 1 line
2.7.4
PATCH v7 15/17 filter-rewriter: handle checkpoint and failover event
In reply to Zhang ChenAfter one round of checkpoint, the states between PVM and SVM become consistent, so it is unnecessary to adjust the sequence of net packets for old connections, besides, while failover happens, filter-rewriter needs to check if it still needs to adjust sequence of net packets.
--- migration/colo.c | 13 +++++++++++++ net/filter-rewriter.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+)
migration/colo.c +13 -0
@@ -31,6 +31,7 @@#include "qapi/qapi-events-migration.h" #include "qapi/qmp/qerror.h" #include "sysemu/cpus.h" +#include "net/filter.h" static bool vmstate_loading;static Notifier packets_compare_notifier;
@@ -82,6 +83,11 @@ static void secondary_vm_do_failover(void)if (local_err) {error_report_err (local_err); } +/* Notify all filters of all NIC to do checkpoint */ +colo_notify_filters_event (COLO_EVENT_FAILOVER , &local_err); +if (local_err) { +error_report_err (local_err); + }if (!autostart) {error_report ("\"-S\" qemu option will be ignored in secondary side" );
@@ -786,6 +792,13 @@ void *colo_process_incoming_thread(void *opaque) goto out; } +/* Notify all filters of all NIC to do checkpoint */ +colo_notify_filters_event (COLO_EVENT_CHECKPOINT , &local_err); +if (local_err) { +qemu_mutex_unlock_iothread (); + goto out; + } + vmstate_loading = false;vm_start ();trace_colo_vm_state_change ("stop" ,"run" );
net/filter-rewriter.c +40 -0
@@ -20,6 +20,8 @@#include "qemu/main-loop.h" #include "qemu/iov.h" #include "net/checksum.h" +#include "net/colo.h" +#include "migration/colo.h" #define FILTER_COLO_REWRITER (obj) \ OBJECT_CHECK(RewriterState, (obj), TYPE_FILTER_REWRITER)
@@ -277,6 +279,43 @@ static ssize_t colo_rewriter_receive_iov(NetFilterState *nf,return 0 ; } +static void reset_seq_offset (gpointer key,gpointer value,gpointer user_data) +{ +Connection *conn = (Connection *)value; + + conn->offset =0 ; +} + +static gboolean offset_is_nonzero (gpointer key, +gpointer value, +gpointer user_data) +{ +Connection *conn = (Connection *)value; + +return conn->offset ? true : false; +} + +static void colo_rewriter_handle_event (NetFilterState *nf,int event, +Error **errp) +{ +RewriterState *rs =FILTER_COLO_REWRITER (nf); + +switch (event) { +case COLO_EVENT_CHECKPOINT : +g_hash_table_foreach (rs->connection_track_table, + reset_seq_offset,NULL ); +break ; +case COLO_EVENT_FAILOVER : +if (!g_hash_table_find (rs->connection_track_table, + offset_is_nonzero,NULL )) { +object_property_set_str (OBJECT (nf),"off" ,"status" , errp); + } +break ; +default : +break ; + } +} +static void colo_rewriter_cleanup (NetFilterState *nf) {RewriterState *s =FILTER_COLO_REWRITER (nf);
@@ -332,6 +371,7 @@ static void colo_rewriter_class_init(ObjectClass *oc, void *data) nfc->setup = colo_rewriter_setup; nfc->cleanup = colo_rewriter_cleanup; nfc->receive_iov = colo_rewriter_receive_iov; + nfc->handle_event = colo_rewriter_handle_event; }static const TypeInfo colo_rewriter_info = {
Signature · 1 line
2.7.4
PATCH v7 16/17 COLO: notify net filters about checkpoint/failover event
In reply to Zhang ChenFrom: zhanghailiang <[email protected]>
Notify all net filters about the checkpoint and failover event.
--- migration/colo.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
migration/colo.c +12 -0
@@ -88,6 +88,11 @@ static void secondary_vm_do_failover(void)if (local_err) {error_report_err (local_err); } +/* Notify all filters of all NIC to do checkpoint */ +colo_notify_filters_event (COLO_EVENT_FAILOVER , &local_err); +if (local_err) { +error_report_err (local_err); + }if (!autostart) {error_report ("\"-S\" qemu option will be ignored in secondary side" );
@@ -799,6 +804,13 @@ void *colo_process_incoming_thread(void *opaque) goto out; } +/* Notify all filters of all NIC to do checkpoint */ +colo_notify_filters_event (COLO_EVENT_CHECKPOINT , &local_err); +if (local_err) { +qemu_mutex_unlock_iothread (); + goto out; + } + vmstate_loading = false;vm_start ();trace_colo_vm_state_change ("stop" ,"run" );
Signature · 1 line
2.7.4
PATCH v7 17/17 COLO: quick failover process by kick COLO thread
In reply to Zhang ChenFrom: zhanghailiang <[email protected]>
COLO thread may sleep at qemu_sem_wait(&s->colo_checkpoint_sem), while failover works begin, It's better to wakeup it to quick the process.
--- migration/colo.c | 8 ++++++++ 1 file changed, 8 insertions(+)
migration/colo.c +8 -0
@@ -135,6 +135,11 @@ static void primary_vm_do_failover(void)migrate_set_state (&s->state,MIGRATION_STATUS_COLO ,MIGRATION_STATUS_COMPLETED ); +/* +* kick COLO thread which might wait at +* qemu_sem_wait(&s->colo_checkpoint_sem). +*/ +colo_checkpoint_notify (migrate_get_current ());/* * Wake up COLO thread which may blocked in recv() or send(),
@@ -552,6 +557,9 @@ static void colo_process_checkpoint(MigrationState *s)qemu_sem_wait (&s->colo_checkpoint_sem); +if (s->state !=MIGRATION_STATUS_COLO ) { + goto out; + } ret =colo_do_checkpoint_transaction (s, bioc, fb);if (ret <0 ) { goto out;
Signature · 1 line
2.7.4
This series seems to have some coding style problems. See output below for more information:
Hi,
This series seems to have some coding style problems. See output below for more information:
Type: series
Message-id: [email protected]
Subject: [Qemu-devel] [PATCH V7 00/17] COLO: integrate colo frame with block replication and COLO proxy
=== TEST SCRIPT BEGIN ===
#!/bin/bash
BASE=base
n=1
total=$(git log --oneline $BASE.. | wc -l)
failed=0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
commits="$(git log --format=%H --reverse $BASE..)" for c in $commits; do
echo "Checking PATCH $n/$total: $(git log -n 1 --format=%s $c)..."
if ! git show $c --format=email | ./scripts/checkpatch.pl --mailback -; then
failed=1
echo
fi
n=$((n+1))done
exit $failed
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
* [new tag] patchew/[email protected] -> patchew/[email protected]
t [tag update] patchew/[email protected] -> patchew/[email protected]
Switched to a new branch 'test'd4ddea2a1a COLO: quick failover process by kick COLO thread0f2e1983ea COLO: notify net filters about checkpoint/failover event c122b558f5 filter-rewriter: handle checkpoint and failover event 191fa37245 filter: Add handle_event method for NetFilterClass c12e3da392 COLO: flush host dirty ram from cache2324bc5e36 savevm: split the process of different stages for loadvm/savevm 19f435ca08 qapi: Add new command to query colo status9fa29026c0 qmp event: Add COLO_EXIT event to notify users while exited COLO 3ec0bd3b60 COLO: Flush memory data from ram cache445775dcd7 ram/COLO: Record the dirty pages that SVM received f14876f270 COLO: Load dirty pages into SVM's RAM cache firstly f03200f394 COLO: Remove colo_state migration structcdeb27e766 COLO: Add block replication into colo processbe854ac29e COLO: integrate colo compare with colo frame551fe70729 colo-compare: use notifier to notify packets comparing result 6c5ccec4e6 colo-compare: implement the process of checkpoint 922a703d44 filter-rewriter: fix memory leak for connection in connection_track_table
=== OUTPUT BEGIN ===
Checking PATCH 1/17: filter-rewriter: fix memory leak for connection in connection_track_table... Checking PATCH 2/17: colo-compare: implement the process of checkpoint... Checking PATCH 3/17: colo-compare: use notifier to notify packets comparing result... Checking PATCH 4/17: COLO: integrate colo compare with colo frame...
Checking PATCH 5/17: COLO: Add block replication into colo process...
Checking PATCH 6/17: COLO: Remove colo_state migration struct...
Checking PATCH 7/17: COLO: Load dirty pages into SVM's RAM cache firstly... Checking PATCH 8/17: ram/COLO: Record the dirty pages that SVM received... Checking PATCH 9/17: COLO: Flush memory data from ram cache...
Checking PATCH 10/17: qmp event: Add COLO_EXIT event to notify users while exited COLO... Checking PATCH 11/17: qapi: Add new command to query colo status...
ERROR: suspect code indent for conditional statements (4, 9)
#38: FILE: migration/colo.c:250:
+ } else if (get_colo_mode() == COLO_MODE_PRIMARY) {
+ state = migrate_get_current()->state;
total: 1 errors, 0 warnings, 82 lines checked
Your patch has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
Checking PATCH 12/17: savevm: split the process of different stages for loadvm/savevm... Checking PATCH 13/17: COLO: flush host dirty ram from cache...
Checking PATCH 14/17: filter: Add handle_event method for NetFilterClass... Checking PATCH 15/17: filter-rewriter: handle checkpoint and failover event... Checking PATCH 16/17: COLO: notify net filters about checkpoint/failover event... Checking PATCH 17/17: COLO: quick failover process by kick COLO thread... === OUTPUT END ===
Test command exited with code: 1
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]