From: zhanghailiang <zhang.zhanghailiang@huawei.com>
To: qemu-devel@nongnu.org
Cc: lizhijian@cn.fujitsu.com, quintela@redhat.com,
yunhong.jiang@intel.com, eddie.dong@intel.com,
peter.huangpeng@huawei.com, dgilbert@redhat.com,
arei.gonglei@huawei.com, stefanha@redhat.com,
amit.shah@redhat.com,
zhanghailiang <zhang.zhanghailiang@huawei.com>
Subject: [Qemu-devel] [PATCH COLO-Frame v10 37/38] colo: Use the netfilter to buffer and release packets
Date: Tue, 3 Nov 2015 19:56:55 +0800 [thread overview]
Message-ID: <1446551816-15768-38-git-send-email-zhang.zhanghailiang@huawei.com> (raw)
In-Reply-To: <1446551816-15768-1-git-send-email-zhang.zhanghailiang@huawei.com>
Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
---
v10: Use the new API
---
migration/colo.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/migration/colo.c b/migration/colo.c
index 36f737a..25335db 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -21,6 +21,8 @@
#include "qapi-event.h"
#include "qmp-commands.h"
#include "qapi-types.h"
+#include "net/filter.h"
+#include "net/net.h"
/*
* The delay time before qemu begin the procedure of default failover treatment.
@@ -59,6 +61,24 @@ static bool colo_runstate_is_stopped(void)
return runstate_check(RUN_STATE_COLO) || !runstate_is_running();
}
+static int colo_init_filter_buffers(void)
+{
+ Error *local_err = NULL;
+
+ qemu_auto_add_filter_buffer(NET_FILTER_DIRECTION_RX, &local_err);
+ if (local_err) {
+ error_report_err(local_err);
+ return -1;
+ }
+ filter_buffer_del_all_timers();
+ return 0;
+}
+
+static void colo_cleanup_filter_buffers(void)
+{
+ qemu_auto_del_filter_buffer(NULL);
+}
+
static void secondary_vm_do_failover(void)
{
int old_state;
@@ -123,6 +143,7 @@ static void primary_vm_do_failover(void)
if (s->to_dst_file) {
qemu_file_shutdown(s->to_dst_file);
}
+ colo_cleanup_filter_buffers();
vm_start();
@@ -291,6 +312,8 @@ static int colo_do_checkpoint_transaction(MigrationState *s,
goto out;
}
+ filter_buffer_release_all();
+
if (colo_shutdown) {
colo_ctl_put(s->to_dst_file, COLO_COMMAND_GUEST_SHUTDOWN, 0);
qemu_fflush(s->to_dst_file);
@@ -339,6 +362,12 @@ static void colo_process_checkpoint(MigrationState *s)
failover_init_state();
+ ret = colo_init_filter_buffers();
+ if (ret < 0) {
+ ret = -EINVAL;
+ goto out;
+ }
+
/* Dup the fd of to_dst_file */
fd = dup(qemu_get_fd(s->to_dst_file));
if (fd == -1) {
--
1.8.3.1
next prev parent reply other threads:[~2015-11-03 12:01 UTC|newest]
Thread overview: 100+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-03 11:56 [Qemu-devel] [PATCH COLO-Frame v10 00/38] COarse-grain LOck-stepping(COLO) Virtual Machines for Non-stop Service (FT) zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 01/38] configure: Add parameter for configure to enable/disable COLO support zhanghailiang
2015-11-05 14:52 ` Eric Blake
2015-11-06 7:36 ` zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 02/38] migration: Introduce capability 'x-colo' to migration zhanghailiang
2015-11-13 16:01 ` Eric Blake
2015-11-16 8:35 ` zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 03/38] COLO: migrate colo related info to secondary node zhanghailiang
2015-11-06 16:36 ` Dr. David Alan Gilbert
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 04/38] migration: Add state records for migration incoming zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 05/38] migration: Integrate COLO checkpoint process into migration zhanghailiang
2015-11-06 16:48 ` Dr. David Alan Gilbert
2015-11-13 16:42 ` Eric Blake
2015-11-16 13:00 ` zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 06/38] migration: Integrate COLO checkpoint process into loadvm zhanghailiang
2015-11-06 17:29 ` Dr. David Alan Gilbert
2015-11-09 6:09 ` zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 07/38] migration: Rename the'file' member of MigrationState and MigrationIncomingState zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 08/38] COLO/migration: establish a new communication path from destination to source zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 09/38] COLO: Implement colo checkpoint protocol zhanghailiang
2015-11-06 18:26 ` Dr. David Alan Gilbert
2015-11-09 6:51 ` zhanghailiang
2015-11-09 7:33 ` zhanghailiang
2015-11-13 16:46 ` Eric Blake
2015-11-17 7:04 ` zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 10/38] COLO: Add a new RunState RUN_STATE_COLO zhanghailiang
2015-11-06 18:28 ` Dr. David Alan Gilbert
2015-11-13 16:47 ` Eric Blake
2015-11-17 7:15 ` zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 11/38] QEMUSizedBuffer: Introduce two help functions for qsb zhanghailiang
2015-11-06 18:30 ` Dr. David Alan Gilbert
2015-11-09 8:14 ` zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 12/38] COLO: Save PVM state to secondary side when do checkpoint zhanghailiang
2015-11-06 18:59 ` Dr. David Alan Gilbert
2015-11-09 9:17 ` zhanghailiang
2015-11-13 18:53 ` Dr. David Alan Gilbert
2015-11-17 10:20 ` zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 13/38] COLO: Load PVM's dirty pages into SVM's RAM cache temporarily zhanghailiang
2015-11-13 15:39 ` Dr. David Alan Gilbert
2015-11-16 7:57 ` zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 14/38] COLO: Load VMState into qsb before restore it zhanghailiang
2015-11-13 16:02 ` Dr. David Alan Gilbert
2015-11-16 8:46 ` zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 15/38] ram/COLO: Record pages received from PVM by re-using migration dirty bitmap zhanghailiang
2015-11-13 16:19 ` Dr. David Alan Gilbert
2015-11-16 9:07 ` zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 16/38] COLO: Flush PVM's cached RAM into SVM's memory zhanghailiang
2015-11-13 16:38 ` Dr. David Alan Gilbert
2015-11-16 12:46 ` zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 17/38] COLO: synchronize PVM's state to SVM periodically zhanghailiang
2015-11-13 18:34 ` Dr. David Alan Gilbert
2015-11-17 9:11 ` zhanghailiang
2015-11-17 10:08 ` Dr. David Alan Gilbert
2015-11-17 10:29 ` zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 18/38] COLO failover: Introduce a new command to trigger a failover zhanghailiang
2015-11-13 16:59 ` Eric Blake
2015-11-17 8:03 ` zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 19/38] COLO failover: Introduce state to record failover process zhanghailiang
2015-11-20 15:51 ` Dr. David Alan Gilbert
2015-11-23 5:56 ` zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 20/38] COLO: Implement failover work for Primary VM zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 21/38] COLO: Implement failover work for Secondary VM zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 22/38] COLO: implement default failover treatment zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 23/38] qmp event: Add event notification for COLO error zhanghailiang
2015-11-20 21:50 ` Eric Blake
2015-11-23 6:01 ` zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 24/38] COLO failover: Shutdown related socket fd when do failover zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 25/38] COLO failover: Don't do failover during loading VM's state zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 26/38] COLO: Control the checkpoint delay time by migrate-set-parameters command zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 27/38] COLO: Process shutdown command for VM in COLO state zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 28/38] COLO: Update the global runstate after going into colo state zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 29/38] savevm: Split load vm state function qemu_loadvm_state zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 30/38] COLO: Separate the process of saving/loading ram and device state zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 31/38] COLO: Split qemu_savevm_state_begin out of checkpoint process zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 32/38] netfilter: Add a public API to release all the buffered packets zhanghailiang
2015-11-03 12:39 ` Yang Hongyang
2015-11-03 13:19 ` zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 33/38] netfilter: Introduce an API to delete the timer of all buffer-filters zhanghailiang
2015-11-03 12:41 ` Yang Hongyang
2015-11-03 13:07 ` zhanghailiang
2015-11-04 2:51 ` Jason Wang
2015-11-04 3:08 ` zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 34/38] filter-buffer: Accept zero interval zhanghailiang
2015-11-03 12:43 ` Yang Hongyang
2015-11-04 2:52 ` Jason Wang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 35/38] netfilter: Introduce a API to automatically add filter-buffer for each netdev zhanghailiang
2015-11-03 12:57 ` Yang Hongyang
2015-11-03 13:16 ` zhanghailiang
2015-11-04 2:56 ` Jason Wang
2015-11-04 3:07 ` zhanghailiang
2015-11-05 7:43 ` zhanghailiang
2015-11-05 8:52 ` Wen Congyang
2015-11-05 9:21 ` Jason Wang
2015-11-05 9:33 ` Wen Congyang
2015-11-05 9:19 ` Jason Wang
2015-11-05 10:58 ` zhanghailiang
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 36/38] netfilter: Introduce an API to delete all the automatically added netfilters zhanghailiang
2015-11-03 12:58 ` Yang Hongyang
2015-11-03 11:56 ` zhanghailiang [this message]
2015-11-03 11:56 ` [Qemu-devel] [PATCH COLO-Frame v10 38/38] COLO: Add block replication into colo process zhanghailiang
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=1446551816-15768-38-git-send-email-zhang.zhanghailiang@huawei.com \
--to=zhang.zhanghailiang@huawei.com \
--cc=amit.shah@redhat.com \
--cc=arei.gonglei@huawei.com \
--cc=dgilbert@redhat.com \
--cc=eddie.dong@intel.com \
--cc=lizhijian@cn.fujitsu.com \
--cc=peter.huangpeng@huawei.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=stefanha@redhat.com \
--cc=yunhong.jiang@intel.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).