qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Jason Wang <jasowang@redhat.com>
To: peter.maydell@linaro.org, qemu-devel@nongnu.org
Cc: Zhang Chen <zhangckid@gmail.com>,
	zhanghailiang <zhang.zhanghailiang@huawei.com>,
	Zhang Chen <chen.zhang@intel.com>,
	Jason Wang <jasowang@redhat.com>
Subject: [Qemu-devel] [PULL 16/26] filter-rewriter: handle checkpoint and failover event
Date: Mon, 15 Oct 2018 16:46:16 +0800	[thread overview]
Message-ID: <1539593186-32183-17-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1539593186-32183-1-git-send-email-jasowang@redhat.com>

From: Zhang Chen <zhangckid@gmail.com>

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 will into failover mode that needn't
handle the new TCP connection.

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>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 net/colo-compare.c    | 12 +++++------
 net/colo.c            |  8 ++++++++
 net/colo.h            |  2 ++
 net/filter-rewriter.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 73 insertions(+), 6 deletions(-)

diff --git a/net/colo-compare.c b/net/colo-compare.c
index 3f7e240..a39191d 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -116,6 +116,12 @@ enum {
     SECONDARY_IN,
 };
 
+static void colo_compare_inconsistency_notify(void)
+{
+    notifier_list_notify(&colo_compare_notifiers,
+                migrate_get_current());
+}
+
 static int compare_chr_send(CompareState *s,
                             const uint8_t *buf,
                             uint32_t size,
@@ -330,12 +336,6 @@ static bool colo_mark_tcp_pkt(Packet *ppkt, Packet *spkt,
     return false;
 }
 
-static void colo_compare_inconsistency_notify(void)
-{
-    notifier_list_notify(&colo_compare_notifiers,
-                migrate_get_current());
-}
-
 static void colo_compare_tcp(CompareState *s, Connection *conn)
 {
     Packet *ppkt = NULL, *spkt = NULL;
diff --git a/net/colo.c b/net/colo.c
index 97c8fc9..49176bf 100644
--- a/net/colo.c
+++ b/net/colo.c
@@ -221,3 +221,11 @@ Connection *connection_get(GHashTable *connection_track_table,
 
     return conn;
 }
+
+bool connection_has_tracked(GHashTable *connection_track_table,
+                            ConnectionKey *key)
+{
+    Connection *conn = g_hash_table_lookup(connection_track_table, key);
+
+    return conn ? true : false;
+}
diff --git a/net/colo.h b/net/colo.h
index 0277e0e..11c5226 100644
--- a/net/colo.h
+++ b/net/colo.h
@@ -98,6 +98,8 @@ void connection_destroy(void *opaque);
 Connection *connection_get(GHashTable *connection_track_table,
                            ConnectionKey *key,
                            GQueue *conn_list);
+bool connection_has_tracked(GHashTable *connection_track_table,
+                            ConnectionKey *key);
 void connection_hashtable_reset(GHashTable *connection_track_table);
 Packet *packet_new(const void *data, int size, int vnet_hdr_len);
 void packet_destroy(void *opaque, void *user_data);
diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c
index dd323fa..bb8f4d9 100644
--- a/net/filter-rewriter.c
+++ b/net/filter-rewriter.c
@@ -20,11 +20,15 @@
 #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)
 
 #define TYPE_FILTER_REWRITER "filter-rewriter"
+#define FAILOVER_MODE_ON  true
+#define FAILOVER_MODE_OFF false
 
 typedef struct RewriterState {
     NetFilterState parent_obj;
@@ -32,8 +36,14 @@ typedef struct RewriterState {
     /* hashtable to save connection */
     GHashTable *connection_track_table;
     bool vnet_hdr;
+    bool failover_mode;
 } RewriterState;
 
+static void filter_rewriter_failover_mode(RewriterState *s)
+{
+    s->failover_mode = FAILOVER_MODE_ON;
+}
+
 static void filter_rewriter_flush(NetFilterState *nf)
 {
     RewriterState *s = FILTER_COLO_REWRITER(nf);
@@ -273,6 +283,13 @@ static ssize_t colo_rewriter_receive_iov(NetFilterState *nf,
              */
             reverse_connection_key(&key);
         }
+
+        /* After failover we needn't change new TCP packet */
+        if (s->failover_mode &&
+            !connection_has_tracked(s->connection_track_table, &key)) {
+            goto out;
+        }
+
         conn = connection_get(s->connection_track_table,
                               &key,
                               NULL);
@@ -306,11 +323,49 @@ static ssize_t colo_rewriter_receive_iov(NetFilterState *nf,
         }
     }
 
+out:
     packet_destroy(pkt, NULL);
     pkt = NULL;
     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)) {
+            filter_rewriter_failover_mode(rs);
+        }
+        break;
+    default:
+        break;
+    }
+}
+
 static void colo_rewriter_cleanup(NetFilterState *nf)
 {
     RewriterState *s = FILTER_COLO_REWRITER(nf);
@@ -354,6 +409,7 @@ static void filter_rewriter_init(Object *obj)
     RewriterState *s = FILTER_COLO_REWRITER(obj);
 
     s->vnet_hdr = false;
+    s->failover_mode = FAILOVER_MODE_OFF;
     object_property_add_bool(obj, "vnet_hdr_support",
                              filter_rewriter_get_vnet_hdr,
                              filter_rewriter_set_vnet_hdr, NULL);
@@ -366,6 +422,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.5.0

  parent reply	other threads:[~2018-10-15  8:47 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-15  8:46 [Qemu-devel] [PULL 00/26] Net patches Jason Wang
2018-10-15  8:46 ` [Qemu-devel] [PULL 01/26] filter-rewriter: Add TCP state machine and fix memory leak in connection_track_table Jason Wang
2018-10-15  8:46 ` [Qemu-devel] [PULL 02/26] colo-compare: implement the process of checkpoint Jason Wang
2018-10-15  8:46 ` [Qemu-devel] [PULL 03/26] colo-compare: use notifier to notify packets comparing result Jason Wang
2018-10-15  8:46 ` [Qemu-devel] [PULL 04/26] COLO: integrate colo compare with colo frame Jason Wang
2018-10-15  8:46 ` [Qemu-devel] [PULL 05/26] COLO: Add block replication into colo process Jason Wang
2018-10-15  8:46 ` [Qemu-devel] [PULL 06/26] COLO: Remove colo_state migration struct Jason Wang
2018-10-15  8:46 ` [Qemu-devel] [PULL 07/26] COLO: Load dirty pages into SVM's RAM cache firstly Jason Wang
2018-10-15  8:46 ` [Qemu-devel] [PULL 08/26] ram/COLO: Record the dirty pages that SVM received Jason Wang
2018-10-15  8:46 ` [Qemu-devel] [PULL 09/26] COLO: Flush memory data from ram cache Jason Wang
2018-10-15  8:46 ` [Qemu-devel] [PULL 10/26] qmp event: Add COLO_EXIT event to notify users while exited COLO Jason Wang
2018-10-15  8:46 ` [Qemu-devel] [PULL 11/26] qapi/migration.json: Rename COLO unknown mode to none mode Jason Wang
2018-10-15  8:46 ` [Qemu-devel] [PULL 12/26] qapi: Add new command to query colo status Jason Wang
2018-10-15 18:31   ` Eric Blake
2018-10-15  8:46 ` [Qemu-devel] [PULL 13/26] savevm: split the process of different stages for loadvm/savevm Jason Wang
2018-10-15  8:46 ` [Qemu-devel] [PULL 14/26] COLO: flush host dirty ram from cache Jason Wang
2018-10-15  8:46 ` [Qemu-devel] [PULL 15/26] filter: Add handle_event method for NetFilterClass Jason Wang
2018-10-15  8:46 ` Jason Wang [this message]
2018-10-15  8:46 ` [Qemu-devel] [PULL 17/26] COLO: notify net filters about checkpoint/failover event Jason Wang
2018-10-15  8:46 ` [Qemu-devel] [PULL 18/26] COLO: quick failover process by kick COLO thread Jason Wang
2018-10-15  8:46 ` [Qemu-devel] [PULL 19/26] docs: Add COLO status diagram to COLO-FT.txt Jason Wang
2018-10-15  8:46 ` [Qemu-devel] [PULL 20/26] clean up callback when del virtqueue Jason Wang
2018-10-15  8:46 ` [Qemu-devel] [PULL 21/26] ne2000: fix possible out of bound access in ne2000_receive Jason Wang
2018-10-15  8:46 ` [Qemu-devel] [PULL 22/26] rtl8139: fix possible out of bound access Jason Wang
2018-10-15  8:46 ` [Qemu-devel] [PULL 23/26] pcnet: fix possible buffer overflow Jason Wang
2018-10-15  8:46 ` [Qemu-devel] [PULL 24/26] net: ignore packet size greater than INT_MAX Jason Wang
2018-10-15  8:46 ` [Qemu-devel] [PULL 25/26] e1000: indicate dropped packets in HW counters Jason Wang
2018-10-15  8:46 ` [Qemu-devel] [PULL 26/26] qemu-options: Fix bad "macaddr" property in the documentation Jason Wang
2018-10-15 13:20 ` [Qemu-devel] [PULL 00/26] Net patches Peter Maydell
2018-10-16 10:10   ` Jason Wang

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=1539593186-32183-17-git-send-email-jasowang@redhat.com \
    --to=jasowang@redhat.com \
    --cc=chen.zhang@intel.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=zhang.zhanghailiang@huawei.com \
    --cc=zhangckid@gmail.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).