From nobody Wed Oct 29 17:12:36 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.zohomail.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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1524656660637766.9535018857515; Wed, 25 Apr 2018 04:44:20 -0700 (PDT) Received: from localhost ([::1]:35928 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fBIqN-0007sU-BZ for importer@patchew.org; Wed, 25 Apr 2018 07:44:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34294) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fBIaO-0002tg-Td for qemu-devel@nongnu.org; Wed, 25 Apr 2018 07:27:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fBIaO-00058i-0P for qemu-devel@nongnu.org; Wed, 25 Apr 2018 07:27:44 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:45566 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fBIaN-000585-SY for qemu-devel@nongnu.org; Wed, 25 Apr 2018 07:27:43 -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 mx1.redhat.com (Postfix) with ESMTPS id 781D84023155 for ; Wed, 25 Apr 2018 11:27:43 +0000 (UTC) Received: from secure.mitica (ovpn-117-169.ams2.redhat.com [10.36.117.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7068A215CDD1; Wed, 25 Apr 2018 11:27:42 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 25 Apr 2018 13:27:15 +0200 Message-Id: <20180425112723.1111-14-quintela@redhat.com> In-Reply-To: <20180425112723.1111-1-quintela@redhat.com> References: <20180425112723.1111-1-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 25 Apr 2018 11:27:43 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 25 Apr 2018 11:27:43 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'quintela@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v12 13/21] migration: Calculate transferred ram correctly 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: lvivier@redhat.com, dgilbert@redhat.com, peterx@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" On multifd we send data from more places that main channel. Signed-off-by: Juan Quintela --- migration/migration.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 9b510a809a..75d30661e9 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2246,12 +2246,19 @@ static void migration_update_counters(MigrationStat= e *s, { uint64_t transferred, time_spent; double bandwidth; + uint64_t now; =20 if (current_time < s->iteration_start_time + BUFFER_DELAY) { return; } =20 - transferred =3D qemu_ftell(s->to_dst_file) - s->iteration_initial_byte= s; + if (migrate_use_multifd()) { + now =3D ram_counters.normal * qemu_target_page_size() + + qemu_ftell(s->to_dst_file); + } else { + now =3D qemu_ftell(s->to_dst_file); + } + transferred =3D now - s->iteration_initial_bytes; time_spent =3D current_time - s->iteration_start_time; bandwidth =3D (double)transferred / time_spent; s->threshold_size =3D bandwidth * s->parameters.downtime_limit; @@ -2271,7 +2278,7 @@ static void migration_update_counters(MigrationState = *s, qemu_file_reset_rate_limit(s->to_dst_file); =20 s->iteration_start_time =3D current_time; - s->iteration_initial_bytes =3D qemu_ftell(s->to_dst_file); + s->iteration_initial_bytes =3D now; =20 trace_migrate_transferred(transferred, time_spent, bandwidth, s->threshold_size); --=20 2.17.0