qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Zhang Chen <zhangckid@gmail.com>
To: qemu-devel@nongnu.org, Paolo Bonzini <pbonzini@redhat.com>,
	Juan Quintela <quintela@redhat.com>,
	"Dr . David Alan Gilbert" <dgilbert@redhat.com>,
	Jason Wang <jasowang@redhat.com>, Eric Blake <eblake@redhat.com>,
	Markus Armbruster <armbru@redhat.com>
Cc: Zhang Chen <zhangckid@gmail.com>,
	zhanghailiang <zhang.zhanghailiang@huawei.com>,
	Li Zhijian <lizhijian@cn.fujitsu.com>,
	Zhang Chen <chen.zhang@intel.com>
Subject: [Qemu-devel] [PATCH V11 04/20] COLO: integrate colo compare with colo frame
Date: Sun, 12 Aug 2018 04:59:08 +0800	[thread overview]
Message-ID: <20180811205924.4113-5-zhangckid@gmail.com> (raw)
In-Reply-To: <20180811205924.4113-1-zhangckid@gmail.com>

For 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.

Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Signed-off-by: Zhang Chen <zhangckid@gmail.com>
Signed-off-by: Zhang Chen <chen.zhang@intel.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
 migration/colo.c      | 42 ++++++++++++++++++++++++++++++++++++++++--
 migration/migration.c |  6 ++----
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/migration/colo.c b/migration/colo.c
index 4381067ed4..081df1835f 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -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) {
diff --git a/migration/migration.c b/migration/migration.c
index b7d9854bda..33a2fd74c6 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -75,10 +75,8 @@
 /* Migration XBZRLE default cache size */
 #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.
- */
-#define DEFAULT_MIGRATE_X_CHECKPOINT_DELAY 200
+/* The delay time (in ms) between two COLO checkpoints */
+#define DEFAULT_MIGRATE_X_CHECKPOINT_DELAY (200 * 100)
 #define DEFAULT_MIGRATE_MULTIFD_CHANNELS 2
 #define DEFAULT_MIGRATE_MULTIFD_PAGE_COUNT 16
 
-- 
2.17.GIT

  parent reply	other threads:[~2018-08-11 21:00 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-11 20:59 [Qemu-devel] [PATCH V11 00/20] COLO: integrate colo frame with block replication and COLO proxy Zhang Chen
2018-08-11 20:59 ` [Qemu-devel] [PATCH V11 01/20] filter-rewriter: Add TCP state machine and fix memory leak in connection_track_table Zhang Chen
2018-08-11 20:59 ` [Qemu-devel] [PATCH V11 02/20] colo-compare: implement the process of checkpoint Zhang Chen
2018-08-11 20:59 ` [Qemu-devel] [PATCH V11 03/20] colo-compare: use notifier to notify packets comparing result Zhang Chen
2018-08-11 20:59 ` Zhang Chen [this message]
2018-08-11 20:59 ` [Qemu-devel] [PATCH V11 05/20] COLO: Add block replication into colo process Zhang Chen
2018-08-17 11:04   ` Dr. David Alan Gilbert
2018-08-11 20:59 ` [Qemu-devel] [PATCH V11 06/20] COLO: Remove colo_state migration struct Zhang Chen
2018-08-11 20:59 ` [Qemu-devel] [PATCH V11 07/20] COLO: Load dirty pages into SVM's RAM cache firstly Zhang Chen
2018-08-11 20:59 ` [Qemu-devel] [PATCH V11 08/20] ram/COLO: Record the dirty pages that SVM received Zhang Chen
2018-08-11 20:59 ` [Qemu-devel] [PATCH V11 09/20] COLO: Flush memory data from ram cache Zhang Chen
2018-08-11 20:59 ` [Qemu-devel] [PATCH V11 10/20] qmp event: Add COLO_EXIT event to notify users while exited COLO Zhang Chen
2018-08-11 20:59 ` [Qemu-devel] [PATCH V11 11/20] qapi/migration.json: Rename COLO unknown mode to none mode Zhang Chen
2018-08-11 20:59 ` [Qemu-devel] [PATCH V11 12/20] qapi: Add new command to query colo status Zhang Chen
2018-08-11 20:59 ` [Qemu-devel] [PATCH V11 13/20] savevm: split the process of different stages for loadvm/savevm Zhang Chen
2018-08-11 20:59 ` [Qemu-devel] [PATCH V11 14/20] COLO: flush host dirty ram from cache Zhang Chen
2018-08-11 20:59 ` [Qemu-devel] [PATCH V11 15/20] net/net.c: Add net client type check function for COLO Zhang Chen
2018-08-21  3:26   ` Jason Wang
2018-08-21  9:26     ` Zhang Chen
2018-08-22  8:22       ` Jason Wang
2018-08-23  9:37         ` Zhang Chen
2018-08-11 20:59 ` [Qemu-devel] [PATCH V11 16/20] filter: Add handle_event method for NetFilterClass Zhang Chen
2018-08-21  3:30   ` Jason Wang
2018-08-21  9:25     ` Zhang Chen
2018-08-22  8:21       ` Jason Wang
2018-08-24  5:57         ` Zhang Chen
2018-08-28  7:19           ` Jason Wang
2018-08-30  5:56             ` Zhang Chen
2018-08-11 20:59 ` [Qemu-devel] [PATCH V11 17/20] filter-rewriter: handle checkpoint and failover event Zhang Chen
2018-08-21  3:40   ` Jason Wang
2018-08-21  9:51     ` Zhang Chen
2018-08-11 20:59 ` [Qemu-devel] [PATCH V11 18/20] COLO: notify net filters about checkpoint/failover event Zhang Chen
2018-08-11 20:59 ` [Qemu-devel] [PATCH V11 19/20] COLO: quick failover process by kick COLO thread Zhang Chen
2018-08-11 20:59 ` [Qemu-devel] [PATCH V11 20/20] docs: Add COLO status diagram to COLO-FT.txt Zhang Chen
2018-08-21  3:06 ` [Qemu-devel] [PATCH V11 00/20] COLO: integrate colo frame with block replication and COLO proxy Zhang Chen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180811205924.4113-5-zhangckid@gmail.com \
    --to=zhangckid@gmail.com \
    --cc=armbru@redhat.com \
    --cc=chen.zhang@intel.com \
    --cc=dgilbert@redhat.com \
    --cc=eblake@redhat.com \
    --cc=jasowang@redhat.com \
    --cc=lizhijian@cn.fujitsu.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --cc=zhang.zhanghailiang@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).