From patchwork Fri May 15 04:28:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Chen" X-Patchwork-Id: 282695 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.7 required=3.0 tests=FROM_WSP_TRAIL, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7115EC433E7 for ; Fri, 15 May 2020 04:41:45 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 451F02065F for ; Fri, 15 May 2020 04:41:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 451F02065F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZSAK-0003fo-GT for qemu-devel@archiver.kernel.org; Fri, 15 May 2020 00:41:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZS7Z-0007hG-Lk for qemu-devel@nongnu.org; Fri, 15 May 2020 00:38:53 -0400 Received: from mga12.intel.com ([192.55.52.136]:45615) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZS7Y-0007ba-SZ for qemu-devel@nongnu.org; Fri, 15 May 2020 00:38:53 -0400 IronPort-SDR: 6uJ4RuuYXP6EPxfjVprHDOrraQl8bTfLtTcGM5oxp3syS+AifWobZeY3Rv3iZy8uXT1zHzdy81 cIlEneFBf+iQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 May 2020 21:38:52 -0700 IronPort-SDR: n09WbtQhRsoBAEGUiaJLXbb9LWzPvf/OHs/d38ePO15mz9yhF3tTgM0/OokPHh0Qijtteg8Gq1 aOgFKGbRWlmQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,394,1583222400"; d="scan'208";a="263069548" Received: from unknown (HELO localhost.localdomain) ([10.239.13.19]) by orsmga003.jf.intel.com with ESMTP; 14 May 2020 21:38:50 -0700 From: Zhang Chen To: "Dr . David Alan Gilbert" , Juan Quintela , Zhanghailiang , qemu-dev Subject: [PATCH 3/3] migration/colo: Merge multi checkpoint request into one. Date: Fri, 15 May 2020 12:28:18 +0800 Message-Id: <20200515042818.17908-4-chen.zhang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200515042818.17908-1-chen.zhang@intel.com> References: <20200515042818.17908-1-chen.zhang@intel.com> Received-SPF: pass client-ip=192.55.52.136; envelope-from=chen.zhang@intel.com; helo=mga12.intel.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/15 00:38:46 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 5.0 requ) BAYES_00=-1.9, FROM_ADDR_WS=2.999, FROM_WSP_TRAIL=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Zhang Chen , Jason Wang , Zhang Chen Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Zhang Chen When COLO guest occur issues, COLO-compare will catch lots of different network packet and trigger notification multi times, force periodic may happen at the same time. So this can be efficient merge checkpoint request within COLO_CHECKPOINT_INTERVAL. Signed-off-by: Zhang Chen --- migration/colo.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/migration/colo.c b/migration/colo.c index d5bced22cb..e6a7d8c6e2 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -47,6 +47,9 @@ static COLOMode last_colo_mode; #define COLO_BUFFER_BASE_SIZE (4 * 1024 * 1024) +/* Default COLO_CHECKPOINT_INTERVAL is 1000 ms */ +#define COLO_CHECKPOINT_INTERVAL 1000 + bool migration_in_colo_state(void) { MigrationState *s = migrate_get_current(); @@ -651,13 +654,20 @@ out: void colo_checkpoint_notify(void *opaque) { MigrationState *s = opaque; - int64_t next_notify_time; + int64_t now = qemu_clock_get_ms(QEMU_CLOCK_HOST); - qemu_sem_post(&s->colo_checkpoint_sem); - s->colo_checkpoint_time = qemu_clock_get_ms(QEMU_CLOCK_HOST); - next_notify_time = s->colo_checkpoint_time + - s->parameters.x_checkpoint_delay; - timer_mod(s->colo_delay_timer, next_notify_time); + /* + * When COLO guest occur issues, COLO-compare will catch lots of + * different network packet and trigger notification multi times, + * force periodic may happen at the same time. So this can be + * efficient merge checkpoint request within COLO_CHECKPOINT_INTERVAL. + */ + if (now > s->colo_checkpoint_time + COLO_CHECKPOINT_INTERVAL) { + qemu_sem_post(&s->colo_checkpoint_sem); + timer_mod(s->colo_delay_timer, now + + s->parameters.x_checkpoint_delay); + s->colo_checkpoint_time = now; + } } void migrate_start_colo_process(MigrationState *s)