From patchwork Wed Jul 19 07:29:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 790856 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) 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 3xC7x63s3tz9sNV for ; Wed, 19 Jul 2017 17:30:50 +1000 (AEST) Received: from localhost ([::1]:60228 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXjRY-0000Zx-3e for incoming@patchwork.ozlabs.org; Wed, 19 Jul 2017 03:30:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41326) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXjOe-0006Mo-Pk for qemu-devel@nongnu.org; Wed, 19 Jul 2017 03:27:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dXjOd-0000fC-VM for qemu-devel@nongnu.org; Wed, 19 Jul 2017 03:27:48 -0400 Received: from [59.151.112.132] (port=35077 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXjOc-0000e7-NG for qemu-devel@nongnu.org; Wed, 19 Jul 2017 03:27:47 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="21494193" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 19 Jul 2017 15:27:33 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id 57E5746B527F; Wed, 19 Jul 2017 15:27:31 +0800 (CST) Received: from localhost.localdomain (10.167.226.56) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 19 Jul 2017 15:27:30 +0800 From: Zhang Chen To: qemu devel , Jason Wang Date: Wed, 19 Jul 2017 15:29:56 +0800 Message-ID: <1500449399-19107-2-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1500449399-19107-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1500449399-19107-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-ID: 57E5746B527F.AB9FA X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: zhangchen.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH V3 1/4] net/colo-compare.c: Add checkpoint min period to optimize performance X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Li Zhijian , zhanghailiang , Zhang Chen , "Dr . David Alan Gilbert" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" If colo-compare find out the first different packet that means the following packet almost is different. we needn't do a lot of checkpoint in this time, so we set the no-need-checkpoint peroid, default just set 3 second. Signed-off-by: Zhang Chen --- net/colo-compare.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index ca67c68..5313e74 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -40,6 +40,9 @@ /* TODO: Should be configurable */ #define REGULAR_PACKET_CHECK_MS 3000 +/* TODO: Should be configurable */ +#define CHECKPOINT_MIN_TIME 3000 + /* + CompareState ++ | | @@ -75,6 +78,9 @@ typedef struct CompareState { SocketReadState sec_rs; bool vnet_hdr; + /* Record the last checkpoint time */ + int64_t checkpoint_time_ms; + /* connection list: the connections belonged to this NIC could be found * in this list. * element type: Connection @@ -507,7 +513,19 @@ 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 (pkt->creation_ms - s->checkpoint_time_ms > + CHECKPOINT_MIN_TIME) { + /* + * TODO: Notify colo frame to do checkpoint. + * colo_compare_inconsistent_notify(); + * + * TODO: Reset s->checkpoint_time_ms after finish + * checkpoint(when colo-compare get notify from colo-frame, + * in another independent patch). + */ + s->checkpoint_time_ms = pkt->creation_ms; + } break; } } @@ -803,6 +821,7 @@ static void colo_compare_complete(UserCreatable *uc, Error **errp) colo_compare_thread, s, QEMU_THREAD_JOINABLE); compare_id++; + s->checkpoint_time_ms = 0; return; }