From nobody Mon Feb 9 18:46:13 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1683551501; cv=none; d=zohomail.com; s=zohoarc; b=TY/McpeOP8+bJ5Kdw0YAh8XdLM1P5L2h/1Jy9LjXfOFbsnYOajiaFRbInNQq81J4gSlkfu6ZBZ2OaT9cEuZ6vT2hhZH+y5D82zqvZqLr5z3KnbZV348mOnP4RSjteNjbdCUS6pYGl8ldXcOOSSEvXTnmc1FLZlNBN75MSSrY6KI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683551501; h=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=GB/E/hAWcVrYzDkJg8/L6PWbVxUIBoKyVIoYkxWecV8=; b=bF8lvfqYSrk3ywfD8alz/5mV02FUqzOD0edwgKYHpZtDPueCf8wy3hzK8Ew4VRHicb2mvMg+VKbG3APDiV0SuSrK08rQ7sgv6WeLoaurgd7h8gtjgMVxEDQ8edepscQC9NQTYWFq+I0MwboN9Dz+a5NrAl0yvcn8lTnjjv7D/c4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1683551501524405.82029860307216; Mon, 8 May 2023 06:11:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pw0e9-00050P-BN; Mon, 08 May 2023 09:11:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pw0d8-0003nM-D4 for qemu-devel@nongnu.org; Mon, 08 May 2023 09:10:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pw0d5-00011Y-Cr for qemu-devel@nongnu.org; Mon, 08 May 2023 09:10:17 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-590-NG_VgO9WPfaxggjCILkf3A-1; Mon, 08 May 2023 09:10:10 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5CD97181E06C; Mon, 8 May 2023 13:10:09 +0000 (UTC) Received: from secure.mitica (unknown [10.39.193.236]) by smtp.corp.redhat.com (Postfix) with ESMTP id 76F142166B40; Mon, 8 May 2023 13:10:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683551413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GB/E/hAWcVrYzDkJg8/L6PWbVxUIBoKyVIoYkxWecV8=; b=VU0dNLTKql7piKeJp8k2F4ykSncYsvi6R4rCTZM4qAhMv9xyXVic/tKCNvnfdfAGmevn+z NtZLiiCbixtPU1Utf5irIYqdfQ1nZTc/TRr51oKhtaJO6CZ5pbQhf5+Abrgeia8d17JjpH iEst/84OfrttXpIdWGT17wYh43ZXTqQ= X-MC-Unique: NG_VgO9WPfaxggjCILkf3A-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Daniel Henrique Barboza , Christian Borntraeger , David Hildenbrand , Stefan Hajnoczi , qemu-block@nongnu.org, Eric Blake , Vladimir Sementsov-Ogievskiy , John Snow , Juan Quintela , Halil Pasic , Peter Xu , Richard Henderson , David Gibson , Harsh Prateek Bora , Eric Farman , Greg Kurz , qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, Fam Zheng , Thomas Huth , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Leonardo Bras , Ilya Leoshkevich Subject: [PATCH 07/21] migration: Correct transferred bytes value Date: Mon, 8 May 2023 15:08:55 +0200 Message-Id: <20230508130909.65420-8-quintela@redhat.com> In-Reply-To: <20230508130909.65420-1-quintela@redhat.com> References: <20230508130909.65420-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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=170.10.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1683551502132100007 Content-Type: text/plain; charset="utf-8" We forget several places to add to trasferred amount of data. With this fixes I get: qemu_file_transferred() + multifd_bytes =3D=3D transferred The only place whrer this is not true is during devices sending. But going all through the full tree searching for devices that use QEMUFile directly is a bit too much. Multifd, precopy and xbzrle work as expected. Postocpy still misses 35 bytes, but searching for them is getting complicated, so I stop here. Signed-off-by: Juan Quintela --- migration/meson.build | 2 +- migration/ram.c | 14 ++++++++++++++ migration/savevm.c | 19 +++++++++++++++++-- migration/vmstate.c | 3 +++ 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/migration/meson.build b/migration/meson.build index da1897fadf..b27fc9eeb6 100644 --- a/migration/meson.build +++ b/migration/meson.build @@ -1,5 +1,6 @@ # Files needed by unit tests migration_files =3D files( + 'migration-stats.c', 'page_cache.c', 'xbzrle.c', 'vmstate-types.c', @@ -19,7 +20,6 @@ softmmu_ss.add(files( 'fd.c', 'global_state.c', 'migration-hmp-cmds.c', - 'migration-stats.c', 'migration.c', 'multifd.c', 'multifd-zlib.c', diff --git a/migration/ram.c b/migration/ram.c index 5e7bf20ca5..5ae1fdba45 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -337,6 +337,7 @@ int64_t ramblock_recv_bitmap_send(QEMUFile *file, =20 g_free(le_bitmap); =20 + stat64_add(&mig_stats.transferred, 8 + size + 8); if (qemu_file_get_error(file)) { return qemu_file_get_error(file); } @@ -1617,6 +1618,7 @@ static int find_dirty_block(RAMState *rs, PageSearchS= tatus *pss) return ret; } qemu_put_be64(f, RAM_SAVE_FLAG_MULTIFD_FLUSH); + stat64_add(&mig_stats.transferred, 8); qemu_fflush(f); } /* @@ -3245,6 +3247,7 @@ static int ram_save_setup(QEMUFile *f, void *opaque) RAMState **rsp =3D opaque; RAMBlock *block; int ret; + size_t size =3D 0; =20 if (compress_threads_save_setup()) { return -1; @@ -3263,16 +3266,20 @@ static int ram_save_setup(QEMUFile *f, void *opaque) qemu_put_be64(f, ram_bytes_total_with_ignored() | RAM_SAVE_FLAG_MEM_SIZE); =20 + size +=3D 8; RAMBLOCK_FOREACH_MIGRATABLE(block) { qemu_put_byte(f, strlen(block->idstr)); qemu_put_buffer(f, (uint8_t *)block->idstr, strlen(block->idst= r)); qemu_put_be64(f, block->used_length); + size +=3D 1 + strlen(block->idstr) + 8; if (migrate_postcopy_ram() && block->page_size !=3D qemu_host_page_size) { qemu_put_be64(f, block->page_size); + size +=3D 8; } if (migrate_ignore_shared()) { qemu_put_be64(f, block->mr->addr); + size +=3D 8; } } } @@ -3289,11 +3296,14 @@ static int ram_save_setup(QEMUFile *f, void *opaque) =20 if (!migrate_multifd_flush_after_each_section()) { qemu_put_be64(f, RAM_SAVE_FLAG_MULTIFD_FLUSH); + size +=3D 8; } =20 qemu_put_be64(f, RAM_SAVE_FLAG_EOS); + size +=3D 8; qemu_fflush(f); =20 + stat64_add(&mig_stats.transferred, size); return 0; } =20 @@ -3434,6 +3444,7 @@ static int ram_save_complete(QEMUFile *f, void *opaqu= e) RAMState **temp =3D opaque; RAMState *rs =3D *temp; int ret =3D 0; + size_t size =3D 0; =20 rs->last_stage =3D !migration_in_colo_state(); =20 @@ -3478,8 +3489,11 @@ static int ram_save_complete(QEMUFile *f, void *opaq= ue) =20 if (!migrate_multifd_flush_after_each_section()) { qemu_put_be64(f, RAM_SAVE_FLAG_MULTIFD_FLUSH); + size +=3D 8; } qemu_put_be64(f, RAM_SAVE_FLAG_EOS); + size +=3D 8; + stat64_add(&mig_stats.transferred, size); qemu_fflush(f); =20 return 0; diff --git a/migration/savevm.c b/migration/savevm.c index e33788343a..c7af9050c2 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -952,6 +952,7 @@ static void save_section_header(QEMUFile *f, SaveStateE= ntry *se, qemu_put_byte(f, section_type); qemu_put_be32(f, se->section_id); =20 + size_t size =3D 1 + 4; if (section_type =3D=3D QEMU_VM_SECTION_FULL || section_type =3D=3D QEMU_VM_SECTION_START) { /* ID string */ @@ -961,7 +962,9 @@ static void save_section_header(QEMUFile *f, SaveStateE= ntry *se, =20 qemu_put_be32(f, se->instance_id); qemu_put_be32(f, se->version_id); + size +=3D 1 + len + 4 + 4; } + stat64_add(&mig_stats.transferred, size); } =20 /* @@ -973,6 +976,7 @@ static void save_section_footer(QEMUFile *f, SaveStateE= ntry *se) if (migrate_get_current()->send_section_footer) { qemu_put_byte(f, QEMU_VM_SECTION_FOOTER); qemu_put_be32(f, se->section_id); + stat64_add(&mig_stats.transferred, 1 + 4); } } =20 @@ -1032,6 +1036,7 @@ static void qemu_savevm_command_send(QEMUFile *f, qemu_put_be16(f, (uint16_t)command); qemu_put_be16(f, len); qemu_put_buffer(f, data, len); + stat64_add(&mig_stats.transferred, 1 + 2 + 2 + len); qemu_fflush(f); } =20 @@ -1212,11 +1217,13 @@ void qemu_savevm_state_header(QEMUFile *f) trace_savevm_state_header(); qemu_put_be32(f, QEMU_VM_FILE_MAGIC); qemu_put_be32(f, QEMU_VM_FILE_VERSION); - + size_t size =3D 4 + 4; if (migrate_get_current()->send_configuration) { qemu_put_byte(f, QEMU_VM_CONFIGURATION); + size +=3D 1; vmstate_save_state(f, &vmstate_configuration, &savevm_state, 0); } + stat64_add(&mig_stats.transferred, size); } =20 bool qemu_savevm_state_guest_unplug_pending(void) @@ -1384,6 +1391,7 @@ void qemu_savevm_state_complete_postcopy(QEMUFile *f) { SaveStateEntry *se; int ret; + size_t size =3D 0; =20 QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { if (!se->ops || !se->ops->save_live_complete_postcopy) { @@ -1398,7 +1406,7 @@ void qemu_savevm_state_complete_postcopy(QEMUFile *f) /* Section type */ qemu_put_byte(f, QEMU_VM_SECTION_END); qemu_put_be32(f, se->section_id); - + size +=3D 1 + 4; ret =3D se->ops->save_live_complete_postcopy(f, se->opaque); trace_savevm_section_end(se->idstr, se->section_id, ret); save_section_footer(f, se); @@ -1409,6 +1417,8 @@ void qemu_savevm_state_complete_postcopy(QEMUFile *f) } =20 qemu_put_byte(f, QEMU_VM_EOF); + size +=3D 1; + stat64_add(&mig_stats.transferred, size); qemu_fflush(f); } =20 @@ -1484,6 +1494,7 @@ int qemu_savevm_state_complete_precopy_non_iterable(Q= EMUFile *f, if (!in_postcopy) { /* Postcopy stream will still be going */ qemu_put_byte(f, QEMU_VM_EOF); + stat64_add(&mig_stats.transferred, 1); } =20 json_writer_end_array(vmdesc); @@ -1664,15 +1675,18 @@ void qemu_savevm_live_state(QEMUFile *f) /* save QEMU_VM_SECTION_END section */ qemu_savevm_state_complete_precopy(f, true, false); qemu_put_byte(f, QEMU_VM_EOF); + stat64_add(&mig_stats.transferred, 1); } =20 int qemu_save_device_state(QEMUFile *f) { SaveStateEntry *se; + size_t size =3D 0; =20 if (!migration_in_colo_state()) { qemu_put_be32(f, QEMU_VM_FILE_MAGIC); qemu_put_be32(f, QEMU_VM_FILE_VERSION); + size =3D 4 + 4; } cpu_synchronize_all_states(); =20 @@ -1690,6 +1704,7 @@ int qemu_save_device_state(QEMUFile *f) =20 qemu_put_byte(f, QEMU_VM_EOF); =20 + stat64_add(&mig_stats.transferred, size + 1); return qemu_file_get_error(f); } =20 diff --git a/migration/vmstate.c b/migration/vmstate.c index af01d54b6f..ee3b70a6a8 100644 --- a/migration/vmstate.c +++ b/migration/vmstate.c @@ -12,6 +12,7 @@ =20 #include "qemu/osdep.h" #include "migration.h" +#include "migration-stats.h" #include "migration/vmstate.h" #include "savevm.h" #include "qapi/qmp/json-writer.h" @@ -394,6 +395,7 @@ int vmstate_save_state_v(QEMUFile *f, const VMStateDesc= ription *vmsd, written_bytes =3D qemu_file_transferred_fast(f) - old_offs= et; vmsd_desc_field_end(vmsd, vmdesc_loop, field, written_byte= s, i); =20 + stat64_add(&mig_stats.transferred, written_bytes); /* Compressed arrays only care about the first element */ if (vmdesc_loop && vmsd_can_compress(field)) { vmdesc_loop =3D NULL; @@ -517,6 +519,7 @@ static int vmstate_subsection_save(QEMUFile *f, const V= MStateDescription *vmsd, qemu_put_byte(f, len); qemu_put_buffer(f, (uint8_t *)vmsdsub->name, len); qemu_put_be32(f, vmsdsub->version_id); + stat64_add(&mig_stats.transferred, 1 + 1 + len + 4); ret =3D vmstate_save_state(f, vmsdsub, opaque, vmdesc); if (ret) { return ret; --=20 2.40.0