From patchwork Sat Feb 6 09:28:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhanghailiang X-Patchwork-Id: 579794 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 269BE140BFA for ; Sat, 6 Feb 2016 20:45:11 +1100 (AEDT) Received: from localhost ([::1]:52708 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRzQT-0006H4-76 for incoming@patchwork.ozlabs.org; Sat, 06 Feb 2016 04:45:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38369) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRzBz-0003DQ-9r for qemu-devel@nongnu.org; Sat, 06 Feb 2016 04:30:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aRzBw-0001bF-6O for qemu-devel@nongnu.org; Sat, 06 Feb 2016 04:30:11 -0500 Received: from szxga02-in.huawei.com ([119.145.14.65]:19854) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aRzBv-0001Xw-Ef for qemu-devel@nongnu.org; Sat, 06 Feb 2016 04:30:08 -0500 Received: from 172.24.1.50 (EHLO szxeml434-hub.china.huawei.com) ([172.24.1.50]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DBA12017; Sat, 06 Feb 2016 17:29:54 +0800 (CST) Received: from localhost (10.177.24.212) by szxeml434-hub.china.huawei.com (10.82.67.225) with Microsoft SMTP Server id 14.3.235.1; Sat, 6 Feb 2016 17:29:45 +0800 From: zhanghailiang To: Date: Sat, 6 Feb 2016 17:28:47 +0800 Message-ID: <1454750932-7556-36-git-send-email-zhang.zhanghailiang@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1454750932-7556-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1454750932-7556-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.24.212] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020202.56B5BD12.0087, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: d8e0b7a82a928a1b7bb452c26c96b86b X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.65 Cc: xiecl.fnst@cn.fujitsu.com, lizhijian@cn.fujitsu.com, quintela@redhat.com, armbru@redhat.com, Jason Wang , yunhong.jiang@intel.com, eddie.dong@intel.com, peter.huangpeng@huawei.com, dgilbert@redhat.com, zhanghailiang , arei.gonglei@huawei.com, stefanha@redhat.com, amit.shah@redhat.com, zhangchen.fnst@cn.fujitsu.com, hongyang.yang@easystack.cn Subject: [Qemu-devel] [PATCH COLO-Frame v14 35/40] COLO/filter: add each netdev a buffer filter X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org For COLO periodic mode, it need to buffer packets that sent by VM, and we will not release these packets until finish a checkpoint. Here, we add each netdev a buffer-filter that will be controlled by COLO. It is disabled by default, and the packets will not pass through these filters. If users don't enable COLO while configure qemu, these buffer-filters will not be added. Signed-off-by: zhanghailiang Cc: Jason Wang Cc: Yang Hongyang --- v14: - New patch --- include/migration/colo.h | 2 ++ include/net/filter.h | 2 ++ migration/colo-comm.c | 5 +++++ migration/colo.c | 20 ++++++++++++++++++++ net/filter-buffer.c | 2 -- stubs/migration-colo.c | 4 ++++ 6 files changed, 33 insertions(+), 2 deletions(-) diff --git a/include/migration/colo.h b/include/migration/colo.h index 919b135..22b92c9 100644 --- a/include/migration/colo.h +++ b/include/migration/colo.h @@ -37,4 +37,6 @@ COLOMode get_colo_mode(void); void colo_do_failover(MigrationState *s); bool colo_shutdown(void); +void colo_add_buffer_filter(const char *netdev_id, void *opaque); + #endif diff --git a/include/net/filter.h b/include/net/filter.h index 0159080..0da0d97 100644 --- a/include/net/filter.h +++ b/include/net/filter.h @@ -22,6 +22,8 @@ #define NETFILTER_CLASS(klass) \ OBJECT_CLASS_CHECK(NetFilterClass, (klass), TYPE_NETFILTER) +#define TYPE_FILTER_BUFFER "filter-buffer" + typedef void (FilterSetup) (NetFilterState *nf, Error **errp); typedef void (FilterCleanup) (NetFilterState *nf); /* diff --git a/migration/colo-comm.c b/migration/colo-comm.c index 3943e94..91d873e 100644 --- a/migration/colo-comm.c +++ b/migration/colo-comm.c @@ -13,6 +13,7 @@ #include #include "trace.h" +#include typedef struct { bool colo_requested; @@ -58,6 +59,10 @@ static const VMStateDescription colo_state = { void colo_info_init(void) { vmstate_register(NULL, 0, &colo_state, &colo_info); + /* FIXME: Remove this after COLO switch to use colo-proxy */ + if (colo_supported()) { + netdev_init_add_handler(colo_add_buffer_filter, NULL); + } } bool migration_incoming_enable_colo(void) diff --git a/migration/colo.c b/migration/colo.c index 98a12fc..235578b 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -18,6 +18,8 @@ #include "qemu/error-report.h" #include "migration/failover.h" #include "qapi-event.h" +#include "net/net.h" +#include "net/filter.h" static bool vmstate_loading; @@ -380,6 +382,24 @@ static int colo_prepare_before_save(MigrationState *s) return ret; } +void colo_add_buffer_filter(const char *netdev_id, void *opaque) +{ + NetFilterState *nf; + char filter_name[128]; + Error *errp = NULL; + + snprintf(filter_name, sizeof(filter_name), + "%scolo", netdev_id); + nf = netdev_add_filter(netdev_id, TYPE_FILTER_BUFFER, filter_name, false, + &errp); + if (errp) { + error_report_err(errp); + return; + } + /* Only buffer the packets that sent out by VM */ + nf->direction = NET_FILTER_DIRECTION_RX; +} + static void colo_process_checkpoint(MigrationState *s) { QEMUSizedBuffer *buffer = NULL; diff --git a/net/filter-buffer.c b/net/filter-buffer.c index 58cea8f..e70d156 100644 --- a/net/filter-buffer.c +++ b/net/filter-buffer.c @@ -16,8 +16,6 @@ #include "qapi-visit.h" #include "qom/object.h" -#define TYPE_FILTER_BUFFER "filter-buffer" - #define FILTER_BUFFER(obj) \ OBJECT_CHECK(FilterBufferState, (obj), TYPE_FILTER_BUFFER) diff --git a/stubs/migration-colo.c b/stubs/migration-colo.c index 1996cd9..8e74acb 100644 --- a/stubs/migration-colo.c +++ b/stubs/migration-colo.c @@ -48,3 +48,7 @@ bool colo_shutdown(void) { return false; } + +void colo_add_buffer_filter(const char *netdev_id, void *opaque) +{ +}