From nobody Wed Nov 19 16:44:51 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1616640645; cv=none; d=zohomail.com; s=zohoarc; b=TO0v6Mt/cAj0/Klr82CB2fFuvcurCO05csxcOJbDzdZ5RjSOGGj2k+pqSc8Q2qpv4dBbkEi2hFPvb0LLQeGexG30FpKCp0RfNOzQ1/leXeNKyTdwsIcYcJUXHWMkoJU2v82YHQYE4vSBjJcrdz0NvyhGbLX7BvAgHqNrWTg0t48= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616640645; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=pqv4p0yEmYTI8WaQtZ7ERcJgkN47qdkY3uauhgGAFsQ=; b=mLJsjUzqm/HMENEnDv02bMr9pUJkmbHXoW6IP5m/YpT0oKOVoOI1+8u19BWiVNayDITapj4Dru8oZ7Cn/u6ZaE0h0X7IJ1Uh+hXEykRjWkYiUTxFjlASqfgm+9gr7oao3fEhOOplLZdH1y3H0wxHBUULJi0q35Ugp6pBPmofsIw= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161664064523415.94577195755437; Wed, 24 Mar 2021 19:50:45 -0700 (PDT) Received: from localhost ([::1]:52266 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lPG56-0002oH-4z for importer@patchew.org; Wed, 24 Mar 2021 22:50:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37678) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lPG2w-00016W-6O for qemu-devel@nongnu.org; Wed, 24 Mar 2021 22:48:30 -0400 Received: from mga07.intel.com ([134.134.136.100]:40272) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lPG2r-0001k6-9h for qemu-devel@nongnu.org; Wed, 24 Mar 2021 22:48:29 -0400 Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Mar 2021 19:48:23 -0700 Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([10.240.192.103]) by orsmga003.jf.intel.com with ESMTP; 24 Mar 2021 19:48:20 -0700 IronPort-SDR: PIevxM0swKIqz7MPQtMsylgGnsHcjVAV/QAfJanYTsOEkEobkx3C/d2rpYq3SK+HaO6XqCc0bw +ZEjEiGejx/Q== X-IronPort-AV: E=McAfee;i="6000,8403,9933"; a="254823136" X-IronPort-AV: E=Sophos;i="5.81,276,1610438400"; d="scan'208";a="254823136" IronPort-SDR: K2ahEwBUZnAselN9/zhy6pp34kbpm4/Is0ypqOxvBVsAnjtRe+yR6mIZTsihtPTjoLYsiAMqi6 LtBc2G5TF4DA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,276,1610438400"; d="scan'208";a="374881432" From: leirao To: chen.zhang@intel.com, lizhijian@cn.fujitsu.com, jasowang@redhat.com, quintela@redhat.com, dgilbert@redhat.com, pbonzini@redhat.com, lukasstraub2@web.de Subject: [PATCH v4 07/10] Reset the auto-converge counter at every checkpoint. Date: Thu, 25 Mar 2021 10:24:48 +0800 Message-Id: <1616639091-28279-8-git-send-email-lei.rao@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1616639091-28279-1-git-send-email-lei.rao@intel.com> References: <1616639091-28279-1-git-send-email-lei.rao@intel.com> Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=134.134.136.100; envelope-from=lei.rao@intel.com; helo=mga07.intel.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no 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: "Rao, Lei" , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: "Rao, Lei" if we don't reset the auto-converge counter, it will continue to run with COLO running, and eventually the system will hang due to the CPU throttle reaching DEFAULT_MIGRATE_MAX_CPU_THROTTLE. Signed-off-by: Lei Rao Reviewed-by: Dr. David Alan Gilbert --- migration/colo.c | 4 ++++ migration/ram.c | 9 +++++++++ migration/ram.h | 1 + 3 files changed, 14 insertions(+) diff --git a/migration/colo.c b/migration/colo.c index 1aaf316..723ffb8 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -459,6 +459,10 @@ static int colo_do_checkpoint_transaction(MigrationSta= te *s, if (ret < 0) { goto out; } + + if (migrate_auto_converge()) { + mig_throttle_counter_reset(); + } /* * Only save VM's live state, which not including device state. * TODO: We may need a timeout mechanism to prevent COLO process diff --git a/migration/ram.c b/migration/ram.c index 40e7895..c69a8e0 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -652,6 +652,15 @@ static void mig_throttle_guest_down(uint64_t bytes_dir= ty_period, } } =20 +void mig_throttle_counter_reset(void) +{ + RAMState *rs =3D ram_state; + + rs->time_last_bitmap_sync =3D qemu_clock_get_ms(QEMU_CLOCK_REALTIME); + rs->num_dirty_pages_period =3D 0; + rs->bytes_xfer_prev =3D ram_counters.transferred; +} + /** * xbzrle_cache_zero_page: insert a zero page in the XBZRLE cache * diff --git a/migration/ram.h b/migration/ram.h index 6378bb3..3f78175 100644 --- a/migration/ram.h +++ b/migration/ram.h @@ -50,6 +50,7 @@ bool ramblock_is_ignored(RAMBlock *block); int xbzrle_cache_resize(uint64_t new_size, Error **errp); uint64_t ram_bytes_remaining(void); uint64_t ram_bytes_total(void); +void mig_throttle_counter_reset(void); =20 uint64_t ram_pagesize_summary(void); int ram_save_queue_pages(const char *rbname, ram_addr_t start, ram_addr_t = len); --=20 1.8.3.1