From nobody Sun May 5 13:24:30 2024 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; dkim=fail; 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1564736833; cv=none; d=zoho.com; s=zohoarc; b=JPYYw3fuIBimi6NPdxu5CtFBANtEWSReDnK46wz8NANsv0iG6idgj4Y+fWmg2/NMnJWfqz3Fg4a1oOjzB+PkBSchIAqlHI8WciwuyPJ4DTJmeB09PLTZnqBYoMKR7qq6GmBu6XmCWPD6ddnmLazuuhzz8DaIPQpFBdu8FtvVuys= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564736833; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=HjaiaePE62sPbbhP/TIjCkGtxZeFziWMl3+zzS8KihA=; b=fu56+hSstp8QjEYEfuH6m108SmmWRe/th6+AdnSwI4IZPswMGRrvUpifWsUspEJRrG2D0eP4kwZVUYVvxBkGrlVNprdOjYZ3ZUwRKZbwvzxJm6K1N89qoMDnMCgIb1n7by1a3nCJJ3CseONGlALRythrQwOZD9GMz2UzwZYvwUI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; 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 1564736833441150.8905416585502; Fri, 2 Aug 2019 02:07:13 -0700 (PDT) Received: from localhost ([::1]:32860 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1htTWq-0004rh-H9 for importer@patchew.org; Fri, 02 Aug 2019 05:07:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48484) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1htTWG-00049J-Rt for qemu-devel@nongnu.org; Fri, 02 Aug 2019 05:06:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1htTWF-0003ak-IQ for qemu-devel@nongnu.org; Fri, 02 Aug 2019 05:06:36 -0400 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:34918) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1htTWF-0003aO-Ce for qemu-devel@nongnu.org; Fri, 02 Aug 2019 05:06:35 -0400 Received: by mail-pf1-x444.google.com with SMTP id u14so35720745pfn.2 for ; Fri, 02 Aug 2019 02:06:34 -0700 (PDT) Received: from VM_85_204_centos.localdomain ([129.226.55.250]) by smtp.gmail.com with ESMTPSA id l124sm74813252pgl.54.2019.08.02.02.06.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Aug 2019 02:06:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=HjaiaePE62sPbbhP/TIjCkGtxZeFziWMl3+zzS8KihA=; b=G3opLxESJ2r8fRXj0+ULvc6QGlVw0cEn9q33Y3yQVWpcYEke7SDFRWJU9kK7m2GI3E R1XIv2Zbcv4FknKwYQkP2JdZ0DgxKX7BUA8cUaE0Bnmx3l2PJ30NggkvVRoeX3pT5Jrf 3zyMt4w51qHBaVTvIg0bTsCyGtP6aGyHFI25Y4IrUMMnHLKhZ3HTFGv61cJN2L3/H2U/ CyJvTvLDgUPQhep06p3rDqNPQ89L6HgKADJAdY9zZj/YFjslFBCIyUmkqTUSY9iFWp/5 cjSkUOo2uvIEVdxMy8ItzlZcz2iP9rEv/xcE2hw4rA0WMQemNnlDQH6EL2icS1P16AaY wdfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=HjaiaePE62sPbbhP/TIjCkGtxZeFziWMl3+zzS8KihA=; b=bGGOU9mpf139eNl/E9ySpjTbfVAMCNrWVDg5guCo+mboHxUwQLprv7S/QDrWdhgm3r ZKd6KS5W1+wyk+nOZ+NddjfVxgjjyU6QG8VoFe3c8RUExEVsc9t5vQTaINckf9AeNBEH rIsLIdJ9v/ZxEYB79fipbSTAKc3GDZCe/x9Rcu+7ITV+fDAShcKjviEGp6glu7BiWuCk DKoEqSWTd/tzM+2QpzmKsLgow591klbiGgDb/5Aeoteb4j6N8Ju8RTHlLSJC5Mb0Ygrx F0Dq4NtE7g3gn7rPFJ1R1OoSkNH6EoogENvCZkzmweTl9EtLtSfvmRssve3mk2dKO6kz bZhQ== X-Gm-Message-State: APjAAAV5BCdlmcsJyCtvjLYJQsGmUEjoaDJGePdi5krzP2SfsJpsE0vQ oSna9s+mevR1MBaPy6DURhQ= X-Google-Smtp-Source: APXvYqxAc8Fqv4TIMvXcNE182ht2UgF4ITSxJN5dKHaUZ7nA65pY+5TtKVvyQjtlxlAdAHBuNxfuOQ== X-Received: by 2002:a63:ff20:: with SMTP id k32mr123738479pgi.445.1564736793596; Fri, 02 Aug 2019 02:06:33 -0700 (PDT) From: Ivan Ren X-Google-Original-From: Ivan Ren To: quintela@redhat.com, dgilbert@redhat.com Date: Fri, 2 Aug 2019 17:06:26 +0800 Message-Id: <1564736786-26495-1-git-send-email-ivanren@tencent.com> X-Mailer: git-send-email 1.8.3.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::444 Subject: [Qemu-devel] [PATCH v2] migration: always initial 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: richardw.yang@linux.intel.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 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 Suggested-by: Wei Yang --- v1->v2: - Add interface update_iteration_initial_status to update statistic fields at the same time to avoid info mismatch lead wrong calculation result. 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 8a607fe1e2..5db62ef9c8 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1908,6 +1908,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; } @@ -3025,6 +3030,17 @@ static void migration_calculate_complete(MigrationSt= ate *s) } } =20 +static 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) { @@ -3060,9 +3076,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); @@ -3186,7 +3200,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 @@ -3251,8 +3265,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 79ed44d475..480c511b19 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1424,6 +1424,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.17.2 (Apple Git-113)