From nobody Thu Nov 13 18:05:17 2025 Delivered-To: importer@patchew.org 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; 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 ARC-Seal: i=1; a=rsa-sha256; t=1582527364; cv=none; d=zohomail.com; s=zohoarc; b=fDD131f/LaHN5VP7O4foFY09Szd9WIBRqFyVhItlAZHRJjif1BM/TCPJZC08UiS81HaZNXfNPg7CY7CUe9/bNdoiG5s2l0U43mL/on543liLnJnG58vrr8ziR69YXBYnn7LEZm4Z5KPcce5nVmeBgg45ZKQD8hWg8VNmrY5Xi/0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582527364; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8qOBXmAnBJ+gMVMCMcP9ammcr+5fCQipzwkcCpVmDPE=; b=T2O3KQtZIz1U5MauvdLR6Se0+34ARheQc//P2uLrbifLXK8juKPKE/RVEFkob6LWAxN+ZsmUR3/5hLuhhSzeXA2LLDOOX6vnnSOROltCJzxxbM+McJvmhP0nDdyKF6aXVD07VLyQRTOxTB/2ype59qF5dV1w/klq8iW8n/fjYrk= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1582527364597915.7204753840052; Sun, 23 Feb 2020 22:56:04 -0800 (PST) Received: from localhost ([::1]:60632 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j67er-0004zE-Ki for importer@patchew.org; Mon, 24 Feb 2020 01:56:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48113) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j67dk-0003Fx-Hr for qemu-devel@nongnu.org; Mon, 24 Feb 2020 01:54:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j67dj-0006CC-D3 for qemu-devel@nongnu.org; Mon, 24 Feb 2020 01:54:52 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:52408 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j67dj-00064q-1H for qemu-devel@nongnu.org; Mon, 24 Feb 2020 01:54:51 -0500 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 1485A79627075DC5B3B5; Mon, 24 Feb 2020 14:54:46 +0800 (CST) Received: from huawei.com (10.133.214.142) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.439.0; Mon, 24 Feb 2020 14:54:40 +0800 From: zhanghailiang To: Subject: [PATCH V2 5/8] ram/colo: only record bitmap of dirty pages in COLO stage Date: Mon, 24 Feb 2020 14:54:11 +0800 Message-ID: <20200224065414.36524-6-zhang.zhanghailiang@huawei.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20200224065414.36524-1-zhang.zhanghailiang@huawei.com> References: <20200224065414.36524-1-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.133.214.142] X-CFilter-Loop: Reflected Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.32 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: danielcho@qnap.com, zhanghailiang , dgilbert@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" It is only need to record bitmap of dirty pages while goes into COLO stage. Signed-off-by: zhanghailiang Reviewed-by: Dr. David Alan Gilbert --- migration/ram.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index ebf9e6ba51..1b3f423351 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2735,7 +2735,7 @@ static inline void *host_from_ram_block_offset(RAMBlo= ck *block, } =20 static inline void *colo_cache_from_block_offset(RAMBlock *block, - ram_addr_t offset) + ram_addr_t offset, bool record_bitmap) { if (!offset_in_ramblock(block, offset)) { return NULL; @@ -2751,7 +2751,8 @@ static inline void *colo_cache_from_block_offset(RAMB= lock *block, * It help us to decide which pages in ram cache should be flushed * into VM's RAM later. */ - if (!test_and_set_bit(offset >> TARGET_PAGE_BITS, block->bmap)) { + if (record_bitmap && + !test_and_set_bit(offset >> TARGET_PAGE_BITS, block->bmap)) { ram_state->migration_dirty_pages++; } return block->colo_cache + offset; @@ -3408,13 +3409,13 @@ static int ram_load_precopy(QEMUFile *f) if (migration_incoming_colo_enabled()) { if (migration_incoming_in_colo_state()) { /* In COLO stage, put all pages into cache temporarily= */ - host =3D colo_cache_from_block_offset(block, addr); + host =3D colo_cache_from_block_offset(block, addr, tru= e); } else { /* * In migration stage but before COLO stage, * Put all pages into both cache and SVM's memory. */ - host_bak =3D colo_cache_from_block_offset(block, addr); + host_bak =3D colo_cache_from_block_offset(block, addr,= false); } } if (!host) { --=20 2.21.0