From nobody Mon Feb 9 18:00:10 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=1685472072; cv=none; d=zohomail.com; s=zohoarc; b=RoE5BqFnXdxSGkB5FVa5LNIKAYcPSzuN7tvdCcDX3AKjc+4kVKTDZNYeskSGx6Azx02RywrIZQoJk19Fu+twm5bQzkGz0H5uqP2/R8qofboAy6C83yjjzP8gkdumS2SVYGU/2OkWl5vDPSFLWJCC5T59/OKOrTJU2y+1HnwFU5c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1685472072; 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=lBy7DnnRDOpRwmwUlyk+/SRtpjv5VyW95uTcUoEaF7I=; b=U1D/1bWxTQjJeLWErA3eD9fK1pX3gIY3OHiCEtlj3mill/olrEW4A0zWV3IVsaIdIonVtNXiVBiSALkRS6dZMBLWfowhQ/DzI/sOtxKqy4UQIEb+Qm8IdsgsWf+aHYiy1Tp9TFLN6cRwJJpfqr6ea+nH1SbDdvVj0Uz/ufOkbKM= 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 1685472072517381.17580230015074; Tue, 30 May 2023 11:41:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q44Gh-0000oV-7k; Tue, 30 May 2023 14:40:27 -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 1q44GV-0000b2-PG for qemu-devel@nongnu.org; Tue, 30 May 2023 14:40:20 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q44GT-0004PD-68 for qemu-devel@nongnu.org; Tue, 30 May 2023 14:40:14 -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-219-zaDOT5_OO_KPaTgxliHnyA-1; Tue, 30 May 2023 14:40:11 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A2338811E86; Tue, 30 May 2023 18:40:10 +0000 (UTC) Received: from secure.mitica (unknown [10.39.195.148]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1DD44C154D1; Tue, 30 May 2023 18:40:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685472012; 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=lBy7DnnRDOpRwmwUlyk+/SRtpjv5VyW95uTcUoEaF7I=; b=e7N+/M92pYuJw3S1h2u2uDc4NkVj6whYa9pmzmVanKfNvKZNHBn6dvEE00tUYtaHAWB40Q AypQgufIiNQfEdMl0CjkHR+CYreg9PJAR8eLbq6wVRHho+7Zfr+cqZPeK8Hx9E60otFnhA nwMnBIQ4uDzNaqnSW0xYjFft7hhiTDQ= X-MC-Unique: zaDOT5_OO_KPaTgxliHnyA-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Leonardo Bras , Hailiang Zhang , Fiona Ebner , Peter Xu , Stefan Hajnoczi , qemu-block@nongnu.org, Juan Quintela , Fam Zheng Subject: [PATCH v2 13/20] migration: Use migration_transferred_bytes() Date: Tue, 30 May 2023 20:39:34 +0200 Message-Id: <20230530183941.7223-14-quintela@redhat.com> In-Reply-To: <20230530183941.7223-1-quintela@redhat.com> References: <20230530183941.7223-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.167, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: 1685472074530100003 Content-Type: text/plain; charset="utf-8" There are only two differnces with the old value: - the amount of QEMUFile that hasn't yet been flushed. It can be discussed what is more exact, the new or the old one. - the amount of transferred bytes that we forgot to account for (the newer is better, i.e. exact). Notice that this two values are used to: a - present to the user b - calculate the rate_limit So a few KB here and there is not going to make a difference. Signed-off-by: Juan Quintela --- migration/migration.c | 2 +- migration/ram.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index ab8254e433..6ed55d618a 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -912,7 +912,7 @@ static void populate_ram_info(MigrationInfo *info, Migr= ationState *s) size_t page_size =3D qemu_target_page_size(); =20 info->ram =3D g_malloc0(sizeof(*info->ram)); - info->ram->transferred =3D stat64_get(&mig_stats.transferred); + info->ram->transferred =3D migration_transferred_bytes(); info->ram->total =3D ram_bytes_total(); info->ram->duplicate =3D stat64_get(&mig_stats.zero_pages); /* legacy value. It is not used anymore */ diff --git a/migration/ram.c b/migration/ram.c index 87fc504674..0675421f4e 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -552,7 +552,7 @@ void mig_throttle_counter_reset(void) =20 rs->time_last_bitmap_sync =3D qemu_clock_get_ms(QEMU_CLOCK_REALTIME); rs->num_dirty_pages_period =3D 0; - rs->bytes_xfer_prev =3D stat64_get(&mig_stats.transferred); + rs->bytes_xfer_prev =3D migration_transferred_bytes(); } =20 /** @@ -988,7 +988,7 @@ static void migration_trigger_throttle(RAMState *rs) { uint64_t threshold =3D migrate_throttle_trigger_threshold(); uint64_t bytes_xfer_period =3D - stat64_get(&mig_stats.transferred) - rs->bytes_xfer_prev; + migration_transferred_bytes() - rs->bytes_xfer_prev; uint64_t bytes_dirty_period =3D rs->num_dirty_pages_period * TARGET_PA= GE_SIZE; uint64_t bytes_dirty_threshold =3D bytes_xfer_period * threshold / 100; =20 @@ -1051,7 +1051,7 @@ static void migration_bitmap_sync(RAMState *rs, bool = last_stage) /* reset period counters */ rs->time_last_bitmap_sync =3D end_time; rs->num_dirty_pages_period =3D 0; - rs->bytes_xfer_prev =3D stat64_get(&mig_stats.transferred); + rs->bytes_xfer_prev =3D migration_transferred_bytes(); } if (migrate_events()) { uint64_t generation =3D stat64_get(&mig_stats.dirty_sync_count); --=20 2.40.1