From nobody Tue Nov 11 21:15:49 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565888370; cv=none; d=zoho.com; s=zohoarc; b=OgZH59wUNnUjvhSGOpE/hQ70tZwuKR+bpFmxep98PolL1yLymutiaS2nRkvp8+TR4Jm2iiJVliDy44JD4Afz5kmnlWLHo9Yz0dyXTNtE7q/JcvxjvykxA+kCRFc3dfpWAiAFKS2TpZyRcF9s7fpAC6BBjR5w2wRGQo8YmCzw0Ps= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565888370; 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:ARC-Authentication-Results; bh=BnsFMZ50I1yDRxlWof1T9G+R9Nz8EhUKC/0PSDEXmPc=; b=ciQKKkV6C11vuse7IAwQ9M51nZxe29wnMw4PbHt2huFb1ZATazn3jHBIvHQNdOlgxbijJLxTzq0Xr3wuzQJijN42z9aX5DxdpiYqWq9pr91kD/Iu9zoHb04z5jEiHXcdVg5P6/aNcRdgh/4JUQKr7oR19y5qBWEn5EL7d4G9e4U= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1565888370865156.71911585490693; Thu, 15 Aug 2019 09:59:30 -0700 (PDT) Received: from localhost ([::1]:44562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyJ61-000518-PB for importer@patchew.org; Thu, 15 Aug 2019 12:59:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47474) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hyIjw-0002z2-4w for qemu-devel@nongnu.org; Thu, 15 Aug 2019 12:36:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hyIjs-0003Oj-4U for qemu-devel@nongnu.org; Thu, 15 Aug 2019 12:36:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39416) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hyIjr-0003NN-TP for qemu-devel@nongnu.org; Thu, 15 Aug 2019 12:36:36 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 31F0F3001D30; Thu, 15 Aug 2019 16:36:35 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-117-19.ams2.redhat.com [10.36.117.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC9A6BAAC; Thu, 15 Aug 2019 16:36:33 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org Date: Thu, 15 Aug 2019 17:34:55 +0100 Message-Id: <20190815163504.18937-25-dgilbert@redhat.com> In-Reply-To: <20190815163504.18937-1-dgilbert@redhat.com> References: <20190815163504.18937-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 15 Aug 2019 16:36:35 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 24/33] migration: always initialise ram_counters for a new migration X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: quintela@redhat.com, yury-kotov@yandex-team.ru, richardw.yang@linux.intel.com, marcandre.lureau@redhat.com, ivanren@tencent.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Ivan Ren This patch fix a multifd migration bug in migration speed calculation, this problem can be reproduced as follows: 1. start a vm and give a heavy memory write stress to prevent the vm be successfully migrated to destination 2. begin a migration with multifd 3. migrate for a long time [actually, this can be measured by transferred b= ytes] 4. migrate cancel 5. begin a new migration with multifd, the migration will directly run into migration_completion phase Reason as follows: Migration update bandwidth and s->threshold_size in function migration_update_counters after BUFFER_DELAY time: current_bytes =3D migration_total_bytes(s); transferred =3D current_bytes - 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; In multifd migration, migration_total_bytes function return qemu_ftell(s->to_dst_file) + ram_counters.multifd_bytes. s->iteration_initial_bytes will be initialized to 0 at every new migration, but ram_counters is a global variable, and history migration data will be accumulated. So if the ram_counters.multifd_bytes is big enough, it may lead pending_size >=3D s->threshold_size become false in migration_iteration_run after the first migration_update_counters. Signed-off-by: Ivan Ren Reviewed-by: Juan Quintela Reviewed-by: Wei Yang Suggested-by: Wei Yang Message-Id: <1564741121-1840-1-git-send-email-ivanren@tencent.com> Signed-off-by: Dr. David Alan Gilbert --- migration/migration.c | 25 +++++++++++++++++++------ migration/savevm.c | 1 + 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 12b8e5dbe5..c49e9dc035 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1911,6 +1911,11 @@ static bool migrate_prepare(MigrationState *s, bool = blk, bool blk_inc, } =20 migrate_init(s); + /* + * set ram_counters memory to zero for a + * new migration + */ + memset(&ram_counters, 0, sizeof(ram_counters)); =20 return true; } @@ -3034,6 +3039,17 @@ static void migration_calculate_complete(MigrationSt= ate *s) } } =20 +static void update_iteration_initial_status(MigrationState *s) +{ + /* + * Update these three fields at the same time to avoid mismatch info l= ead + * wrong speed calculation. + */ + s->iteration_start_time =3D qemu_clock_get_ms(QEMU_CLOCK_REALTIME); + s->iteration_initial_bytes =3D migration_total_bytes(s); + s->iteration_initial_pages =3D ram_get_total_transferred_pages(); +} + static void migration_update_counters(MigrationState *s, int64_t current_time) { @@ -3069,9 +3085,7 @@ static void migration_update_counters(MigrationState = *s, =20 qemu_file_reset_rate_limit(s->to_dst_file); =20 - s->iteration_start_time =3D current_time; - s->iteration_initial_bytes =3D current_bytes; - s->iteration_initial_pages =3D ram_get_total_transferred_pages(); + update_iteration_initial_status(s); =20 trace_migrate_transferred(transferred, time_spent, bandwidth, s->threshold_size); @@ -3194,7 +3208,7 @@ static void *migration_thread(void *opaque) rcu_register_thread(); =20 object_ref(OBJECT(s)); - s->iteration_start_time =3D qemu_clock_get_ms(QEMU_CLOCK_REALTIME); + update_iteration_initial_status(s); =20 qemu_savevm_state_header(s->to_dst_file); =20 @@ -3259,8 +3273,7 @@ static void *migration_thread(void *opaque) * the local variables. This is important to avoid * breaking transferred_bytes and bandwidth calculation */ - s->iteration_start_time =3D qemu_clock_get_ms(QEMU_CLOCK_REALT= IME); - s->iteration_initial_bytes =3D 0; + update_iteration_initial_status(s); } =20 current_time =3D qemu_clock_get_ms(QEMU_CLOCK_REALTIME); diff --git a/migration/savevm.c b/migration/savevm.c index 412768216c..1ac15301ad 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1456,6 +1456,7 @@ static int qemu_savevm_state(QEMUFile *f, Error **err= p) } =20 migrate_init(ms); + memset(&ram_counters, 0, sizeof(ram_counters)); ms->to_dst_file =3D f; =20 qemu_mutex_unlock_iothread(); --=20 2.21.0