[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V6 15/17] filter-rewriter: handle checkpoint and fai
From: |
Zhang Chen |
Subject: |
[Qemu-devel] [PATCH V6 15/17] filter-rewriter: handle checkpoint and failover event |
Date: |
Sun, 11 Mar 2018 15:45:12 +0800 |
After 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.
Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Zhang Chen <address@hidden>
---
migration/colo.c | 13 +++++++++++++
net/filter-rewriter.c | 40 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 53 insertions(+)
diff --git a/migration/colo.c b/migration/colo.c
index f514492..f3d588e 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -30,6 +30,7 @@
#include "block/block.h"
#include "qapi/qapi-events-migration.h"
#include "sysemu/cpus.h"
+#include "net/filter.h"
static bool vmstate_loading;
static Notifier packets_compare_notifier;
@@ -81,6 +82,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");
@@ -783,6 +789,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");
diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c
index 0909a9a..f3c306c 100644
--- a/net/filter-rewriter.c
+++ b/net/filter-rewriter.c
@@ -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 = {
--
2.7.4
- [Qemu-devel] [PATCH V6 05/17] COLO: Add block replication into colo process, (continued)
- [Qemu-devel] [PATCH V6 05/17] COLO: Add block replication into colo process, Zhang Chen, 2018/03/11
- [Qemu-devel] [PATCH V6 06/17] COLO: Remove colo_state migration struct, Zhang Chen, 2018/03/11
- [Qemu-devel] [PATCH V6 07/17] COLO: Load dirty pages into SVM's RAM cache firstly, Zhang Chen, 2018/03/11
- [Qemu-devel] [PATCH V6 08/17] ram/COLO: Record the dirty pages that SVM received, Zhang Chen, 2018/03/11
- [Qemu-devel] [PATCH V6 09/17] COLO: Flush memory data from ram cache, Zhang Chen, 2018/03/11
- [Qemu-devel] [PATCH V6 10/17] qmp event: Add COLO_EXIT event to notify users while exited COLO, Zhang Chen, 2018/03/11
- [Qemu-devel] [PATCH V6 11/17] qapi: Add new command to query colo status, Zhang Chen, 2018/03/11
- [Qemu-devel] [PATCH V6 12/17] savevm: split the process of different stages for loadvm/savevm, Zhang Chen, 2018/03/11
- [Qemu-devel] [PATCH V6 13/17] COLO: flush host dirty ram from cache, Zhang Chen, 2018/03/11
- [Qemu-devel] [PATCH V6 14/17] filter: Add handle_event method for NetFilterClass, Zhang Chen, 2018/03/11
- [Qemu-devel] [PATCH V6 15/17] filter-rewriter: handle checkpoint and failover event,
Zhang Chen <=
- [Qemu-devel] [PATCH V6 16/17] COLO: notify net filters about checkpoint/failover event, Zhang Chen, 2018/03/11
- [Qemu-devel] [PATCH V6 17/17] COLO: quick failover process by kick COLO thread, Zhang Chen, 2018/03/11