From nobody Thu Nov 6 15:31:08 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1489586187153929.9666032789585; Wed, 15 Mar 2017 06:56:27 -0700 (PDT) Received: from localhost ([::1]:37421 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1co9Pe-00038x-1S for importer@patchew.org; Wed, 15 Mar 2017 09:56:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53604) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1co9K8-0007Iz-2I for qemu-devel@nongnu.org; Wed, 15 Mar 2017 09:50:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1co9K3-0003KY-7j for qemu-devel@nongnu.org; Wed, 15 Mar 2017 09:50:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48248) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1co9K3-0003JJ-04 for qemu-devel@nongnu.org; Wed, 15 Mar 2017 09:50:39 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ED8E7201FB for ; Wed, 15 Mar 2017 13:50:38 +0000 (UTC) Received: from secure.mitica (ovpn-116-230.ams2.redhat.com [10.36.116.230]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v2FDoNUe002305; Wed, 15 Mar 2017 09:50:37 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com ED8E7201FB Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=quintela@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com ED8E7201FB From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 15 Mar 2017 14:49:59 +0100 Message-Id: <20170315135021.6978-10-quintela@redhat.com> In-Reply-To: <20170315135021.6978-1-quintela@redhat.com> References: <20170315135021.6978-1-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 15 Mar 2017 13:50:39 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 09/31] ram: Move dup_pages into RAMState 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: amit.shah@redhat.com, dgilbert@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Once there rename it to its actual meaning, zero_pages. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/ram.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 6cdad06..059e9f1 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -159,6 +159,9 @@ struct RAMState { uint64_t xbzrle_cache_miss_prev; /* number of iterations at the beggining of period */ uint64_t iterations_prev; + /* Accounting fields */ + /* number of zero pages. It used to be pages filled by the same char.= */ + uint64_t zero_pages; }; typedef struct RAMState RAMState; =20 @@ -166,7 +169,6 @@ static RAMState ram_state; =20 /* accounting for migration statistics */ typedef struct AccountingInfo { - uint64_t dup_pages; uint64_t skipped_pages; uint64_t norm_pages; uint64_t iterations; @@ -186,12 +188,12 @@ static void acct_clear(void) =20 uint64_t dup_mig_bytes_transferred(void) { - return acct_info.dup_pages * TARGET_PAGE_SIZE; + return ram_state.zero_pages * TARGET_PAGE_SIZE; } =20 uint64_t dup_mig_pages_transferred(void) { - return acct_info.dup_pages; + return ram_state.zero_pages; } =20 uint64_t skipped_mig_bytes_transferred(void) @@ -718,13 +720,14 @@ static void migration_bitmap_sync(RAMState *rs) * @p: pointer to the page * @bytes_transferred: increase it with the number of transferred bytes */ -static int save_zero_page(QEMUFile *f, RAMBlock *block, ram_addr_t offset, +static int save_zero_page(RAMState *rs, QEMUFile *f, RAMBlock *block, + ram_addr_t offset, uint8_t *p, uint64_t *bytes_transferred) { int pages =3D -1; =20 if (is_zero_range(p, TARGET_PAGE_SIZE)) { - acct_info.dup_pages++; + rs->zero_pages++; *bytes_transferred +=3D save_page_header(f, block, offset | RAM_SAVE_FLAG_COMP= RESS); qemu_put_byte(f, 0); @@ -797,11 +800,11 @@ static int ram_save_page(RAMState *rs, MigrationState= *ms, QEMUFile *f, if (bytes_xmit > 0) { acct_info.norm_pages++; } else if (bytes_xmit =3D=3D 0) { - acct_info.dup_pages++; + rs->zero_pages++; } } } else { - pages =3D save_zero_page(f, block, offset, p, bytes_transferred); + pages =3D save_zero_page(rs, f, block, offset, p, bytes_transferre= d); if (pages > 0) { /* Must let xbzrle know, otherwise a previous (now 0'd) cached * page would be stale @@ -973,7 +976,7 @@ static int ram_save_compressed_page(RAMState *rs, Migra= tionState *ms, if (bytes_xmit > 0) { acct_info.norm_pages++; } else if (bytes_xmit =3D=3D 0) { - acct_info.dup_pages++; + rs->zero_pages++; } } } else { @@ -985,7 +988,7 @@ static int ram_save_compressed_page(RAMState *rs, Migra= tionState *ms, */ if (block !=3D rs->last_sent_block) { flush_compressed_data(f); - pages =3D save_zero_page(f, block, offset, p, bytes_transferre= d); + pages =3D save_zero_page(rs, f, block, offset, p, bytes_transf= erred); if (pages =3D=3D -1) { /* Make sure the first page is sent out before other pages= */ bytes_xmit =3D save_page_header(f, block, offset | @@ -1006,7 +1009,7 @@ static int ram_save_compressed_page(RAMState *rs, Mig= rationState *ms, } } else { offset |=3D RAM_SAVE_FLAG_CONTINUE; - pages =3D save_zero_page(f, block, offset, p, bytes_transferre= d); + pages =3D save_zero_page(rs, f, block, offset, p, bytes_transf= erred); if (pages =3D=3D -1) { pages =3D compress_page_with_multi_thread(f, block, offset, bytes_transferred); @@ -1428,7 +1431,7 @@ void acct_update_position(QEMUFile *f, size_t size, b= ool zero) { uint64_t pages =3D size / TARGET_PAGE_SIZE; if (zero) { - acct_info.dup_pages +=3D pages; + ram_state.zero_pages +=3D pages; } else { acct_info.norm_pages +=3D pages; bytes_transferred +=3D size; @@ -1941,6 +1944,7 @@ static int ram_save_init_globals(RAMState *rs) =20 rs->dirty_rate_high_cnt =3D 0; rs->bitmap_sync_count =3D 0; + rs->zero_pages =3D 0; migration_bitmap_sync_init(rs); qemu_mutex_init(&migration_bitmap_mutex); =20 --=20 2.9.3