From nobody Mon Feb 9 12:26:27 2026 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=1616124882; cv=none; d=zohomail.com; s=zohoarc; b=GXReybbgiQiPtA+VMYu1dBnw4EFQyb4agsnoPTfceAPEENb7V9gnpKxIFyS0jpX7ouYs9FaoMB7Oagt3/Sp/B4n48oxdrPAkkPuSqFOawvmNEB0/9aEe7MiH3bH5jHfl7bdk2yP1HkEQbajdbOU8lAXOYcfh+XF6tSI+ulFFUy0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616124882; 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=gs0g4DE+/WcB+1GOVC4nAI5GlQbf0bQBeU1LgRqmlo0=; b=A+TpaLlfX7qxo0eengS4rT1WMvkqw8tZoVlOJi2YCpVtR24ZTnhdqS/c5HWxtuHGGNWTO19Btg2+xpjIVfupkrFYNqjTlC/VG3ebp96O4LKepxcQyi1nOwJRQv7zIWQ8zrJk+avMS+f+c4/xjgrts8NCmx2JFOZKxjPqNe6r9Ic= 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 1616124882357859.398495105488; Thu, 18 Mar 2021 20:34:42 -0700 (PDT) Received: from localhost ([::1]:60250 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lN5uL-0005ZU-AK for importer@patchew.org; Thu, 18 Mar 2021 23:34:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34182) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lN5r5-00011k-3l for qemu-devel@nongnu.org; Thu, 18 Mar 2021 23:31:19 -0400 Received: from mga12.intel.com ([192.55.52.136]:34596) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lN5r1-00030p-6c for qemu-devel@nongnu.org; Thu, 18 Mar 2021 23:31:18 -0400 Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Mar 2021 20:31:11 -0700 Received: from unknown (HELO localhost.localdomain.bj.intel.com) ([10.240.192.103]) by fmsmga005.fm.intel.com with ESMTP; 18 Mar 2021 20:31:09 -0700 IronPort-SDR: bTRti6lPSjqUkg9HSQE975zoYwjFoHXytbVmOPHtqfqdTYU3lJVYY90W2onWayMgY4Lq1zDm2v oPgYwx1G+S7g== X-IronPort-AV: E=McAfee;i="6000,8403,9927"; a="169117149" X-IronPort-AV: E=Sophos;i="5.81,259,1610438400"; d="scan'208";a="169117149" IronPort-SDR: cPBUgrMs2GnMF1xUpYjIuSM7+kojd4lfBqLC8ZyhLx32+98yuZku0mHuXBd4iFrN6RpBeLyyil /gWz0UEKBfHA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,259,1610438400"; d="scan'208";a="606448984" 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 v3 08/10] Reduce the PVM stop time during Checkpoint Date: Fri, 19 Mar 2021 11:07:46 +0800 Message-Id: <1616123268-89517-9-git-send-email-lei.rao@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1616123268-89517-1-git-send-email-lei.rao@intel.com> References: <1616123268-89517-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=192.55.52.136; envelope-from=lei.rao@intel.com; helo=mga12.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_PASS=-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" When flushing memory from ram cache to ram during every checkpoint on secondary VM, we can copy continuous chunks of memory instead of 4096 bytes per time to reduce the time of VM stop during checkpoint. Signed-off-by: Lei Rao --- migration/ram.c | 45 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index e795a8d..2a8ee96 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -823,6 +823,39 @@ unsigned long migration_bitmap_find_dirty(RAMState *rs= , RAMBlock *rb, return next; } =20 +/* + * colo_bitmap_find_diry:find contiguous dirty pages from start + * + * Returns the page offset within memory region of the start of the contig= uout + * dirty page + * + * @rs: current RAM state + * @rb: RAMBlock where to search for dirty pages + * @start: page where we start the search + * @num: the number of contiguous dirty pages + */ +static inline +unsigned long colo_bitmap_find_dirty(RAMState *rs, RAMBlock *rb, + unsigned long start, unsigned long *n= um) +{ + unsigned long size =3D rb->used_length >> TARGET_PAGE_BITS; + unsigned long *bitmap =3D rb->bmap; + unsigned long first, next; + + if (ramblock_is_ignored(rb)) { + return size; + } + + first =3D find_next_bit(bitmap, size, start); + if (first >=3D size) { + return first; + } + next =3D find_next_zero_bit(bitmap, size, first + 1); + assert(next >=3D first); + *num =3D next - first; + return first; +} + static inline bool migration_bitmap_clear_dirty(RAMState *rs, RAMBlock *rb, unsigned long page) @@ -3669,6 +3702,8 @@ void colo_flush_ram_cache(void) void *dst_host; void *src_host; unsigned long offset =3D 0; + unsigned long num =3D 0; + unsigned long i =3D 0; =20 memory_global_dirty_log_sync(); WITH_RCU_READ_LOCK_GUARD() { @@ -3682,19 +3717,23 @@ void colo_flush_ram_cache(void) block =3D QLIST_FIRST_RCU(&ram_list.blocks); =20 while (block) { - offset =3D migration_bitmap_find_dirty(ram_state, block, offse= t); + offset =3D colo_bitmap_find_dirty(ram_state, block, offset, &n= um); =20 if (((ram_addr_t)offset) << TARGET_PAGE_BITS >=3D block->used_length) { offset =3D 0; + num =3D 0; block =3D QLIST_NEXT_RCU(block, next); } else { - migration_bitmap_clear_dirty(ram_state, block, offset); + for (i =3D 0; i < num; i++) { + migration_bitmap_clear_dirty(ram_state, block, offset = + i); + } dst_host =3D block->host + (((ram_addr_t)offset) << TARGET_PAGE_BITS); src_host =3D block->colo_cache + (((ram_addr_t)offset) << TARGET_PAGE_BITS); - memcpy(dst_host, src_host, TARGET_PAGE_SIZE); + memcpy(dst_host, src_host, TARGET_PAGE_SIZE * num); + offset +=3D num; } } } --=20 1.8.3.1