qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH COLO-Frame v6 24/31] COLO: Handle nfnetlink message


From: zhanghailiang
Subject: [Qemu-devel] [PATCH COLO-Frame v6 24/31] COLO: Handle nfnetlink message from proxy module
Date: Thu, 18 Jun 2015 16:58:48 +0800

Proxy module will send message to qemu through nfnetlink.
Now, the message only contains the result of packets comparation.

We use a global variable 'packet_compare_different' to store the result.
And this variable should be accessed by using atomic related function,
such as 'atomic_set' 'atomic_xchg'.

Cc: Stefan Hajnoczi <address@hidden>
Cc: Jason Wang <address@hidden>
Signed-off-by: zhanghailiang <address@hidden>
Signed-off-by: Li Zhijian <address@hidden>
---
 net/colo-nic.c | 42 ++++++++++++++++++++++++++++++++++++++++++
 trace-events   |  1 +
 2 files changed, 43 insertions(+)

diff --git a/net/colo-nic.c b/net/colo-nic.c
index 55bc055..4496bfa 100644
--- a/net/colo-nic.c
+++ b/net/colo-nic.c
@@ -22,6 +22,7 @@
 #include "net/colo-nic.h"
 #include "qemu/error-report.h"
 #include "net/tap.h"
+#include "trace.h"
 
 /* Remove the follow define after proxy is merged into kernel,
 * using #include <libnfnetlink/libnfnetlink.h> instead.
@@ -79,6 +80,7 @@ typedef struct nic_device {
 
 static struct nfnl_handle *nfnlh;
 static struct nfnl_subsys_handle *nfnlssh;
+static int32_t packet_compare_different; /* The result of packet comparing */
 
 QTAILQ_HEAD(, nic_device) nic_devices = QTAILQ_HEAD_INITIALIZER(nic_devices);
 
@@ -242,6 +244,38 @@ static int colo_proxy_send(enum nfnl_colo_msg_types 
msg_type,
     return ret;
 }
 
+static int __colo_rcv_pkt(struct nlmsghdr *nlh, struct nfattr *nfa[],
+                          void *data)
+{
+    /* struct nfgenmsg *nfmsg = NLMSG_DATA(nlh); */
+    int32_t  result = ntohl(nfnl_get_data(nfa, NFNL_COLO_COMPARE_RESULT,
+                                          int32_t));
+
+    atomic_set(&packet_compare_different, result);
+    trace_colo_rcv_pkt(result);
+    return 0;
+}
+
+static struct nfnl_callback colo_nic_cb = {
+    .call   = &__colo_rcv_pkt,
+    .attr_count = NFNL_COLO_KERNEL_NOTIFY_MAX,
+};
+
+static void colo_proxy_recv(void *opaque)
+{
+    unsigned char *buf = g_malloc0(2048);
+    int len;
+    int ret;
+
+    len = nfnl_recv(nfnlh, buf, 2048);
+    ret = nfnl_handle_packet(nfnlh, (char *)buf, len);
+    if (ret < 0) {/* Notify colo thread the error */
+        atomic_set(&packet_compare_different, -1);
+        error_report("call nfnl_handle_packet failed");
+    }
+    g_free(buf);
+}
+
 static int check_proxy_ack(void)
 {
     unsigned char *buf = g_malloc0(2048);
@@ -297,6 +331,11 @@ int colo_proxy_init(enum COLOMode mode)
         goto err_out;
     }
 
+    ret = nfnl_callback_register(nfnlssh, NFCOLO_KERNEL_NOTIFY, &colo_nic_cb);
+    if (ret < 0) {
+        goto err_out;
+    }
+
     /* Netlink is not a reliable protocol, So it is necessary to request proxy
      * module to acknowledge in the first time.
      */
@@ -316,6 +355,8 @@ int colo_proxy_init(enum COLOMode mode)
         goto err_out;
     }
 
+   qemu_set_fd_handler(nfnl_fd(nfnlh), colo_proxy_recv, NULL, NULL);
+
     return 0;
 err_out:
     nfnl_close(nfnlh);
@@ -326,6 +367,7 @@ err_out:
 void colo_proxy_destroy(enum COLOMode mode)
 {
     if (nfnlh) {
+        qemu_set_fd_handler(nfnl_fd(nfnlh), NULL, NULL, NULL);
         nfnl_close(nfnlh);
     }
     teardown_nic(mode, getpid());
diff --git a/trace-events b/trace-events
index e262c8a..a84a04b 100644
--- a/trace-events
+++ b/trace-events
@@ -1473,6 +1473,7 @@ colo_info_load(const char *msg) "%s"
 colo_vm_state_change(const char *old, const char *new) "Change '%s' => '%s'"
 colo_receive_message(const char *msg) "Receive '%s'"
 colo_do_failover(void) ""
+colo_rcv_pkt(int result) "Result of net packets comparing is different: %d"
 
 # kvm-all.c
 kvm_ioctl(int type, void *arg) "type 0x%x, arg %p"
-- 
1.7.12.4





reply via email to

[Prev in Thread] Current Thread [Next in Thread]