From nobody Thu Nov 6 15:33:23 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 1489586184271717.9171643612884; Wed, 15 Mar 2017 06:56:24 -0700 (PDT) Received: from localhost ([::1]:37420 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1co9Pb-000373-0v for importer@patchew.org; Wed, 15 Mar 2017 09:56:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53624) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1co9K8-0007Jn-Ua for qemu-devel@nongnu.org; Wed, 15 Mar 2017 09:50:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1co9K7-0003N6-Ph for qemu-devel@nongnu.org; Wed, 15 Mar 2017 09:50:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48360) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1co9K7-0003MQ-H5 for qemu-devel@nongnu.org; Wed, 15 Mar 2017 09:50:43 -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 793DB201FB for ; Wed, 15 Mar 2017 13:50:43 +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 v2FDoNUh002305; Wed, 15 Mar 2017 09:50:42 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 793DB201FB 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 793DB201FB From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 15 Mar 2017 14:50:02 +0100 Message-Id: <20170315135021.6978-13-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:43 +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 12/31] ram: Move norm_pages to 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" Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/ram.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 468f042..58c7dc7 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -162,6 +162,8 @@ struct RAMState { /* Accounting fields */ /* number of zero pages. It used to be pages filled by the same char.= */ uint64_t zero_pages; + /* number of normal transferred pages */ + uint64_t norm_pages; }; typedef struct RAMState RAMState; =20 @@ -169,7 +171,6 @@ static RAMState ram_state; =20 /* accounting for migration statistics */ typedef struct AccountingInfo { - uint64_t norm_pages; uint64_t iterations; uint64_t xbzrle_bytes; uint64_t xbzrle_pages; @@ -192,12 +193,12 @@ uint64_t dup_mig_pages_transferred(void) =20 uint64_t norm_mig_bytes_transferred(void) { - return acct_info.norm_pages * TARGET_PAGE_SIZE; + return ram_state.norm_pages * TARGET_PAGE_SIZE; } =20 uint64_t norm_mig_pages_transferred(void) { - return acct_info.norm_pages; + return ram_state.norm_pages; } =20 uint64_t xbzrle_mig_bytes_transferred(void) @@ -782,7 +783,7 @@ static int ram_save_page(RAMState *rs, MigrationState *= ms, QEMUFile *f, if (ret !=3D RAM_SAVE_CONTROL_NOT_SUPP) { if (ret !=3D RAM_SAVE_CONTROL_DELAYED) { if (bytes_xmit > 0) { - acct_info.norm_pages++; + rs->norm_pages++; } else if (bytes_xmit =3D=3D 0) { rs->zero_pages++; } @@ -821,7 +822,7 @@ static int ram_save_page(RAMState *rs, MigrationState *= ms, QEMUFile *f, } *bytes_transferred +=3D TARGET_PAGE_SIZE; pages =3D 1; - acct_info.norm_pages++; + rs->norm_pages++; } =20 XBZRLE_cache_unlock(); @@ -888,8 +889,8 @@ static inline void set_compress_params(CompressParam *p= aram, RAMBlock *block, param->offset =3D offset; } =20 -static int compress_page_with_multi_thread(QEMUFile *f, RAMBlock *block, - ram_addr_t offset, +static int compress_page_with_multi_thread(RAMState *rs, QEMUFile *f, + RAMBlock *block, ram_addr_t off= set, uint64_t *bytes_transferred) { int idx, thread_count, bytes_xmit =3D -1, pages =3D -1; @@ -906,7 +907,7 @@ static int compress_page_with_multi_thread(QEMUFile *f,= RAMBlock *block, qemu_cond_signal(&comp_param[idx].cond); qemu_mutex_unlock(&comp_param[idx].mutex); pages =3D 1; - acct_info.norm_pages++; + rs->norm_pages++; *bytes_transferred +=3D bytes_xmit; break; } @@ -958,7 +959,7 @@ static int ram_save_compressed_page(RAMState *rs, Migra= tionState *ms, if (ret !=3D RAM_SAVE_CONTROL_NOT_SUPP) { if (ret !=3D RAM_SAVE_CONTROL_DELAYED) { if (bytes_xmit > 0) { - acct_info.norm_pages++; + rs->norm_pages++; } else if (bytes_xmit =3D=3D 0) { rs->zero_pages++; } @@ -981,7 +982,7 @@ static int ram_save_compressed_page(RAMState *rs, Migra= tionState *ms, migrate_compress_level()); if (blen > 0) { *bytes_transferred +=3D bytes_xmit + blen; - acct_info.norm_pages++; + rs->norm_pages++; pages =3D 1; } else { qemu_file_set_error(f, blen); @@ -995,7 +996,7 @@ static int ram_save_compressed_page(RAMState *rs, Migra= tionState *ms, offset |=3D RAM_SAVE_FLAG_CONTINUE; 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, + pages =3D compress_page_with_multi_thread(rs, f, block, of= fset, bytes_transferred); } else { ram_release_pages(ms, block->idstr, pss->offset, pages); @@ -1417,7 +1418,7 @@ void acct_update_position(QEMUFile *f, size_t size, b= ool zero) if (zero) { ram_state.zero_pages +=3D pages; } else { - acct_info.norm_pages +=3D pages; + ram_state.norm_pages +=3D pages; bytes_transferred +=3D size; qemu_update_position(f, size); } @@ -1929,6 +1930,7 @@ static int ram_save_init_globals(RAMState *rs) rs->dirty_rate_high_cnt =3D 0; rs->bitmap_sync_count =3D 0; rs->zero_pages =3D 0; + rs->norm_pages =3D 0; migration_bitmap_sync_init(rs); qemu_mutex_init(&migration_bitmap_mutex); =20 --=20 2.9.3