From: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
To: qemu devel <qemu-devel@nongnu.org>, Jason Wang <jasowang@redhat.com>
Cc: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>,
zhanghailiang <zhang.zhanghailiang@huawei.com>
Subject: [Qemu-devel] [PATCH V2 3/3] COLO-compare: Add remote initialization and checkpoint notification
Date: Fri, 26 May 2017 19:22:07 +0800 [thread overview]
Message-ID: <1495797727-16695-4-git-send-email-zhangchen.fnst@cn.fujitsu.com> (raw)
In-Reply-To: <1495797727-16695-1-git-send-email-zhangchen.fnst@cn.fujitsu.com>
Initialize remote communication socket and make a handshack with remote colo-frame.
Then use this way to notify remote colo-frame do checkpoint.
Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
---
net/colo-compare.c | 34 +++++++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/net/colo-compare.c b/net/colo-compare.c
index c968597..34e31e1 100644
--- a/net/colo-compare.c
+++ b/net/colo-compare.c
@@ -100,6 +100,12 @@ enum {
SECONDARY_IN,
};
+typedef enum ProxyRemoteRequest {
+ USERSPACE_PROXY_INIT = 0,
+ USERSPACE_PROXY_GET_REMOTE_INIT = 1,
+ USERSPACE_PROXY_NOTIFY_CHECKPOINT = 2
+} ProxyRemoteRequest;
+
static int compare_chr_send(CharBackend *out,
const uint8_t *buf,
uint32_t size);
@@ -498,6 +504,18 @@ static void colo_compare_connection(void *opaque, void *user_data)
trace_colo_compare_main("packet different");
g_queue_push_tail(&conn->primary_list, pkt);
/* TODO: colo_notify_checkpoint();*/
+ /*
+ * If we have notify_dev that means COLO didn't running on KVM,
+ * So we use remote checkpoint notify, Xen is the first user.
+ */
+ if (s->notify_dev) {
+ ProxyRemoteRequest msg = USERSPACE_PROXY_NOTIFY_CHECKPOINT;
+ ret = compare_chr_send(&s->chr_notify_dev, (uint8_t *)msg,
+ sizeof(msg));
+ if (ret < 0) {
+ error_report("Notify remote COLO-frame failed");
+ }
+ }
break;
}
}
@@ -713,7 +731,21 @@ static void compare_sec_rs_finalize(SocketReadState *sec_rs)
static void compare_notify_rs_finalize(SocketReadState *notify_rs)
{
+ CompareState *s = container_of(notify_rs, CompareState, notify_rs);
+
/* Get remote colo-frame's notify and handle the message */
+ char *data = g_memdup(notify_rs->buf, notify_rs->packet_len);
+ ProxyRemoteRequest msg = USERSPACE_PROXY_GET_REMOTE_INIT;
+ ProxyRemoteRequest msg_recv = *data;
+ int ret;
+
+ if (msg_recv == USERSPACE_PROXY_INIT) {
+ ret = compare_chr_send(&s->chr_notify_dev, (uint8_t *)msg,
+ sizeof(msg));
+ if (ret < 0) {
+ error_report("Notify remote COLO-frame INIT failed");
+ }
+ }
}
/*
@@ -784,7 +816,7 @@ static void colo_compare_complete(UserCreatable *uc, Error **errp)
!qemu_chr_fe_init(&s->chr_notify_dev, chr, errp)) {
return;
}
- net_socket_rs_init(&s->notify_dev, compare_notify_rs_finalize);
+ net_socket_rs_init(&s->notify_rs, compare_notify_rs_finalize);
}
net_socket_rs_init(&s->pri_rs, compare_pri_rs_finalize);
--
2.7.4
next prev parent reply other threads:[~2017-05-26 11:22 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-26 11:22 [Qemu-devel] [PATCH V2 0/3] COLO-compare: Make COLO-compare support remote COLO-frame Zhang Chen
2017-05-26 11:22 ` [Qemu-devel] [PATCH V2 1/3] COLO-compare: Add new parameter for communicate with remote colo-frame Zhang Chen
2017-05-26 11:22 ` [Qemu-devel] [PATCH V2 2/3] COLO-compare: Add remote checkpoint notify chardev socket handler frame Zhang Chen
2017-05-26 11:22 ` Zhang Chen [this message]
2017-05-26 12:05 ` [Qemu-devel] [PATCH V2 0/3] COLO-compare: Make COLO-compare support remote COLO-frame no-reply
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=1495797727-16695-4-git-send-email-zhangchen.fnst@cn.fujitsu.com \
--to=zhangchen.fnst@cn.fujitsu.com \
--cc=jasowang@redhat.com \
--cc=qemu-devel@nongnu.org \
--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).