From nobody Tue May 21 15:30:30 2024 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=1655820436; cv=none; d=zohomail.com; s=zohoarc; b=CSFMsVuwd0ZyOot+QZazI8kt0DMVy7yf/pC4u5I+NpYXygphu5TWBjfJ5UBVwiG0mE8iq8ai/xwp8FB/zJMEEwRLtvQNAl1l0QzIXIc77MS1zlaIME3xqAZPTZoDegyI1B1+v8Lm/MkfcVng4FMcv20GtOjirmg59B4HfA1DyRo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655820436; 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=8TdNZZXtj2QIM3kSedxEwP9rkjospgZwtmzzqjlIALQ=; b=J03Extykk4Pm10TLhzZc0ZehOt55JJK/Q7GME9VlBoIgpr9I+xOHJoBfdJerBM2yTnkRbYYDGjNp48XFR2KeRhMeIKBChNEcMHCdjXimGBO9Uiwpg4j4/zcSlEc9VwmtkrVG5LYn0hxaOlf3ly5WFr6LIr/+dPymKxX2doUKIdo= 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 1655820436207307.6616210643085; Tue, 21 Jun 2022 07:07:16 -0700 (PDT) Received: from localhost ([::1]:51664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o3eXA-0004qT-R5 for importer@patchew.org; Tue, 21 Jun 2022 10:07:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3eVS-0002tT-32 for qemu-devel@nongnu.org; Tue, 21 Jun 2022 10:05:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:35887) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3eVO-0008WD-Pi for qemu-devel@nongnu.org; Tue, 21 Jun 2022 10:05:24 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-556-68PDCP9uNDO3Tm4f0SWk3A-1; Tue, 21 Jun 2022 10:05:19 -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 9EEB91C18277; Tue, 21 Jun 2022 14:05:18 +0000 (UTC) Received: from secure.laptop (unknown [10.39.192.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2F2B02166B29; Tue, 21 Jun 2022 14:05:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655820322; 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=8TdNZZXtj2QIM3kSedxEwP9rkjospgZwtmzzqjlIALQ=; b=T/gQhfGiynIVVjrTu/uMCrnaxoyjEIDulLmUCQSwhQe8khm2Lvez82hZ6y9nf+7d0FoQWi zku/ie3RIlWaqgKhu+wekQCWZ0lyv27qOCl5CyqOXbxfXzmwG1wpRAC4D0wrXOqDno1zHP 89tqeWjYYHyg8I6NFHycHwC8eFQb/qM= X-MC-Unique: 68PDCP9uNDO3Tm4f0SWk3A-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Juan Quintela , Leonardo Bras , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Eduardo Habkost , "Dr. David Alan Gilbert" , Yanan Wang Subject: [PATCH 1/5] multifd: Create property multifd-sync-each-iteration Date: Tue, 21 Jun 2022 16:05:03 +0200 Message-Id: <20220621140507.1246-2-quintela@redhat.com> In-Reply-To: <20220621140507.1246-1-quintela@redhat.com> References: <20220621140507.1246-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 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: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1655820441015100001 Content-Type: text/plain; charset="utf-8" We used to synchronize all channels at the end of each RAM section sent. That is not needed, so preparing to only synchronize once every full round in latests patches. Notice that we initialize the property as true. We will change the default when we introduce the new mechanism. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/migration.h | 6 ++++++ hw/core/machine.c | 1 + migration/migration.c | 10 ++++++++++ 3 files changed, 17 insertions(+) diff --git a/migration/migration.h b/migration/migration.h index 485d58b95f..70dae24516 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -332,6 +332,11 @@ struct MigrationState { * This save hostname when out-going migration starts */ char *hostname; + /* + * Synchronize channels after each iteration. + * We used to do that on the past, but it is suboptimal. + */ + bool multifd_sync_each_iteration; }; =20 void migrate_set_state(int *state, int old_state, int new_state); @@ -374,6 +379,7 @@ int migrate_multifd_channels(void); MultiFDCompression migrate_multifd_compression(void); int migrate_multifd_zlib_level(void); int migrate_multifd_zstd_level(void); +bool migrate_multifd_sync_each_iteration(void); =20 #ifdef CONFIG_LINUX bool migrate_use_zero_copy_send(void); diff --git a/hw/core/machine.c b/hw/core/machine.c index a673302cce..c8a60917e0 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -43,6 +43,7 @@ GlobalProperty hw_compat_7_0[] =3D { { "arm-gicv3-common", "force-8-bit-prio", "on" }, { "nvme-ns", "eui64-default", "on"}, + { "migration", "multifd-sync-each-iteration", "on"}, }; const size_t hw_compat_7_0_len =3D G_N_ELEMENTS(hw_compat_7_0); =20 diff --git a/migration/migration.c b/migration/migration.c index 31739b2af9..3f79df0b70 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2540,6 +2540,13 @@ bool migrate_use_multifd(void) return s->enabled_capabilities[MIGRATION_CAPABILITY_MULTIFD]; } =20 +bool migrate_multifd_sync_each_iteration(void) +{ + MigrationState *s =3D migrate_get_current(); + + return s->multifd_sync_each_iteration; +} + bool migrate_pause_before_switchover(void) { MigrationState *s; @@ -4274,6 +4281,9 @@ static Property migration_properties[] =3D { DEFINE_PROP_SIZE("announce-step", MigrationState, parameters.announce_step, DEFAULT_MIGRATE_ANNOUNCE_STEP), + /* We will change to false when we introduce the new mechanism */ + DEFINE_PROP_BOOL("multifd-sync-each-iteration", MigrationState, + multifd_sync_each_iteration, true), =20 /* Migration capabilities */ DEFINE_PROP_MIG_CAP("x-xbzrle", MIGRATION_CAPABILITY_XBZRLE), --=20 2.34.1 From nobody Tue May 21 15:30:30 2024 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=1655820713; cv=none; d=zohomail.com; s=zohoarc; b=TCAZGhZi0/q7Umpd0Sf7oDkBLc5o3WHIb0bxIAGRccjFHidFa34f58S+sOziT3M2Sm1ZO4zHeJzSP/3zsd+mwCdU/wh2caIAuosuNI1DnnOJBFs9bzW1LeTbkpc3Bfu5uOVcm7nAbjvwM6k5qDKBPWYwgRUk1QbFE/V2FftHLGs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655820713; 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=BI+tY8deCTJTQzfU3oZjQ7qJiYl+eJynuMihQ5Nq2lk=; b=bA5SsV7kZSZKjyu7PDsa6wxifEiPLTSemaJ1sdo6owmZRioU8dZVtvsSyPnySBbVTO6UQAWsAhQfVauDhyhQviLp6VDpI6HnL4dR5yWsM4eCQ4ktyeFEF0K2SYtPF0fbtf0DR1C889J+Fc2PgUamFzRoPio++XrOYyWlCfl4U+M= 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 1655820712848924.7524748625054; Tue, 21 Jun 2022 07:11:52 -0700 (PDT) Received: from localhost ([::1]:57750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o3ebf-0000dU-0m for importer@patchew.org; Tue, 21 Jun 2022 10:11:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3eVW-0002wC-Ff for qemu-devel@nongnu.org; Tue, 21 Jun 2022 10:05:30 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:40050) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3eVT-00006s-FA for qemu-devel@nongnu.org; Tue, 21 Jun 2022 10:05:28 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-615-VDVl_7AvMLmsC3y-ERH_6Q-1; Tue, 21 Jun 2022 10:05:23 -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 CCC9A382C967; Tue, 21 Jun 2022 14:05:22 +0000 (UTC) Received: from secure.laptop (unknown [10.39.192.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 88EC12166B29; Tue, 21 Jun 2022 14:05:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655820326; 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=BI+tY8deCTJTQzfU3oZjQ7qJiYl+eJynuMihQ5Nq2lk=; b=e1TiofrKimRB2jLwUOlOlEY67V4KBl67b9rsWeGgjCBEp8Og3yIs3WWFg2hjJkn0DwEm0T RtlQBWvsmvNVJ/WrnK+n61o1cPw2eAkT+dEw0gUDDRHMNB76OnhydNuNB/2yUxEkHyFpdy NxbiKlQgq6ESAF4VPYTXCR6nMKW4Dh4= X-MC-Unique: VDVl_7AvMLmsC3y-ERH_6Q-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Juan Quintela , Leonardo Bras , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Eduardo Habkost , "Dr. David Alan Gilbert" , Yanan Wang Subject: [PATCH 2/5] multifd: Put around all sync calls tests for each iteration Date: Tue, 21 Jun 2022 16:05:04 +0200 Message-Id: <20220621140507.1246-3-quintela@redhat.com> In-Reply-To: <20220621140507.1246-1-quintela@redhat.com> References: <20220621140507.1246-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 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.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1655820714025100001 Content-Type: text/plain; charset="utf-8" We will sync later in different places. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/ram.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 5f5e37f64d..35816a3a0a 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2944,11 +2944,12 @@ static int ram_save_setup(QEMUFile *f, void *opaque) ram_control_before_iterate(f, RAM_CONTROL_SETUP); ram_control_after_iterate(f, RAM_CONTROL_SETUP); =20 - ret =3D multifd_send_sync_main(f); - if (ret < 0) { - return ret; + if (migrate_multifd_sync_each_iteration()) { + ret =3D multifd_send_sync_main(f); + if (ret < 0) { + return ret; + } } - qemu_put_be64(f, RAM_SAVE_FLAG_EOS); qemu_fflush(f); =20 @@ -3057,9 +3058,11 @@ static int ram_save_iterate(QEMUFile *f, void *opaqu= e) out: if (ret >=3D 0 && migration_is_setup_or_active(migrate_get_current()->state)) { - ret =3D multifd_send_sync_main(rs->f); - if (ret < 0) { - return ret; + if (migrate_multifd_sync_each_iteration()) { + ret =3D multifd_send_sync_main(rs->f); + if (ret < 0) { + return ret; + } } =20 qemu_put_be64(f, RAM_SAVE_FLAG_EOS); @@ -3125,9 +3128,11 @@ static int ram_save_complete(QEMUFile *f, void *opaq= ue) return ret; } =20 - ret =3D multifd_send_sync_main(rs->f); - if (ret < 0) { - return ret; + if (migrate_multifd_sync_each_iteration()) { + ret =3D multifd_send_sync_main(rs->f); + if (ret < 0) { + return ret; + } } =20 qemu_put_be64(f, RAM_SAVE_FLAG_EOS); @@ -3799,7 +3804,9 @@ int ram_load_postcopy(QEMUFile *f) =20 case RAM_SAVE_FLAG_EOS: /* normal exit */ - multifd_recv_sync_main(); + if (migrate_multifd_sync_each_iteration()) { + multifd_recv_sync_main(); + } break; default: error_report("Unknown combination of migration flags: 0x%x" @@ -4075,7 +4082,9 @@ static int ram_load_precopy(QEMUFile *f) break; case RAM_SAVE_FLAG_EOS: /* normal exit */ - multifd_recv_sync_main(); + if (migrate_multifd_sync_each_iteration()) { + multifd_recv_sync_main(); + } break; default: if (flags & RAM_SAVE_FLAG_HOOK) { --=20 2.34.1 From nobody Tue May 21 15:30:30 2024 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=1655820508; cv=none; d=zohomail.com; s=zohoarc; b=AHQnW5tXzEtl2p2ur2ed0rqvkMY/g3MXymcWzPPNDLH4bcRNBXDOTE6eVKavjttd57kXKshcWxRMRQT+1Mxr+DxvgSIi3canFi0mCSw4I2vF81rW+rVVSu1fmELvo2rcteU/JTZYDiyVCPA0loyorADv94ZQxB+rMoPccjxyEqw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655820508; 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=5Ws13QdUcyYGFjbw70rrJhmkRqsVUGx4aeK7EIwM+OI=; b=WaWrNCdJcgWX1GnRa1MnUvUtsNI7nFuctuXazkfEzZiFRffm7QkPJwewqm7Sih06+OMer7YPVlrVgAgb3N4QT48YZnjVyL03OUy9NIw5arPuqfYydx8B0aCrDdYbdPrqoqZD7WwDpcAHz9IDvVAOVFj/0hkwivYxQsGNRtGOO+4= 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 165582050849791.42902412517196; Tue, 21 Jun 2022 07:08:28 -0700 (PDT) Received: from localhost ([::1]:52320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o3eYM-0005Hn-JX for importer@patchew.org; Tue, 21 Jun 2022 10:08:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42452) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3eVf-0003Ed-61 for qemu-devel@nongnu.org; Tue, 21 Jun 2022 10:05:39 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:36151) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3eVZ-00007a-0O for qemu-devel@nongnu.org; Tue, 21 Jun 2022 10:05:38 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-571-1Q2-BpvaOUG2rxKroddsmg-1; Tue, 21 Jun 2022 10:05:26 -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 280B43C17F14; Tue, 21 Jun 2022 14:05:26 +0000 (UTC) Received: from secure.laptop (unknown [10.39.192.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 750E42166B26; Tue, 21 Jun 2022 14:05:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655820332; 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=5Ws13QdUcyYGFjbw70rrJhmkRqsVUGx4aeK7EIwM+OI=; b=HaVB/QXXbNEn6OKZlwMwQj8vtpzLioGa9fAwOAkcFtnBRk4OPUSfnqMfc6CwrjD86gZCAK /slzI8WsIHprRNuN48Ydd3iGjk5b5qvrWGdHE+r6EN7Y2/6l5BNMOMpskcRk0KGdRjlEMQ C2ldKEGR2IkO384ceWXCwrykrqk9Sos= X-MC-Unique: 1Q2-BpvaOUG2rxKroddsmg-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Juan Quintela , Leonardo Bras , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Eduardo Habkost , "Dr. David Alan Gilbert" , Yanan Wang Subject: [PATCH 3/5] migration: Simplify ram_find_and_save_block() Date: Tue, 21 Jun 2022 16:05:05 +0200 Message-Id: <20220621140507.1246-4-quintela@redhat.com> In-Reply-To: <20220621140507.1246-1-quintela@redhat.com> References: <20220621140507.1246-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 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.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1655820509700100001 Content-Type: text/plain; charset="utf-8" We will need later that find_dirty_block() return errors, so simplify the loop. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/ram.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 35816a3a0a..1d4ff3185b 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2256,7 +2256,6 @@ static int ram_find_and_save_block(RAMState *rs) { PageSearchStatus pss; int pages =3D 0; - bool again, found; =20 /* No dirty page as there is zero RAM */ if (!ram_bytes_total()) { @@ -2272,18 +2271,17 @@ static int ram_find_and_save_block(RAMState *rs) } =20 do { - again =3D true; - found =3D get_queued_page(rs, &pss); - - if (!found) { + if (!get_queued_page(rs, &pss)) { /* priority queue empty, so just search for something dirty */ - found =3D find_dirty_block(rs, &pss, &again); + bool again =3D true; + if (!find_dirty_block(rs, &pss, &again)) { + if (!again) { + break; + } + } } - - if (found) { - pages =3D ram_save_host_page(rs, &pss); - } - } while (!pages && again); + pages =3D ram_save_host_page(rs, &pss); + } while (!pages); =20 rs->last_seen_block =3D pss.block; rs->last_page =3D pss.page; --=20 2.34.1 From nobody Tue May 21 15:30:30 2024 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=1655820878; cv=none; d=zohomail.com; s=zohoarc; b=OUQcQ6MkazdqC4xyr2dN+RzffXnBsRnxfSMXjjMOA902Lp+1CvgPoNWk2pRQy5JJG+06x2RNWpbac6Tie3NL2zwC7dpcXk7eGg0OxMh8/KiLkOlapIIuFFEksVJzxKqVhoqVhJvTg7zu1tOqymnYUIPwLEMRGktXR8/gBH+NbqI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655820878; 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=J/MUBigceGvRp2LjYKVzNQe71uwZfeB9qhBxJavgDwQ=; b=D+Ip0GoqmUokejVuMJ+CnM5F05DmkC54IFtSrm2KqF6cJaPm3bcm3+xEZXmTJkPARwZZYb3F15XNm3WO7z96+soeI1LYKpKRFh52TiHdJ2Qjs5C7JZWCFuc+3pMtsDsgMjDUM6HzJWR73Mb6n9D/5RgCEZHFFBN344Aq0E0igfk= 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 1655820878322775.5144750201601; Tue, 21 Jun 2022 07:14:38 -0700 (PDT) Received: from localhost ([::1]:34494 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o3eeI-00046r-S3 for importer@patchew.org; Tue, 21 Jun 2022 10:14:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3eVd-0003AK-AL for qemu-devel@nongnu.org; Tue, 21 Jun 2022 10:05:37 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:42063) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3eVb-00007n-My for qemu-devel@nongnu.org; Tue, 21 Jun 2022 10:05:36 -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-159-V-YPGMMUP2OOav77oRoI7g-1; Tue, 21 Jun 2022 10:05:29 -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 3950D80B70A; Tue, 21 Jun 2022 14:05:29 +0000 (UTC) Received: from secure.laptop (unknown [10.39.192.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id AD5222166B29; Tue, 21 Jun 2022 14:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655820335; 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=J/MUBigceGvRp2LjYKVzNQe71uwZfeB9qhBxJavgDwQ=; b=Qfza+HMlojvBSjCOmYhDJuvTbncm/S63OLnJ7Iwh4oEdPInipUSzlkdEOZjYA/JV/ySTW0 DmHqhxW8CLvJExfILMnigdYQEkAGkQVwXCNpLFiP5k+CmQpEmpjtNtdFXXFtz3wd1uE7+a XIt4bWUOq2g3KxnrKPOoWwygHjR6Iqs= X-MC-Unique: V-YPGMMUP2OOav77oRoI7g-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Juan Quintela , Leonardo Bras , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Eduardo Habkost , "Dr. David Alan Gilbert" , Yanan Wang Subject: [PATCH 4/5] migration: Make find_dirty_block() return a single parameter Date: Tue, 21 Jun 2022 16:05:06 +0200 Message-Id: <20220621140507.1246-5-quintela@redhat.com> In-Reply-To: <20220621140507.1246-1-quintela@redhat.com> References: <20220621140507.1246-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 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.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1655820879416100001 Content-Type: text/plain; charset="utf-8" We used to return two bools, just return a single int with the following meaning: old return / again / new return false false 0 false true 1 true true 2 /* We don't care about again at all */ Signed-off-by: Juan Quintela --- migration/ram.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 1d4ff3185b..2c7289edad 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -1481,13 +1481,16 @@ retry: * find_dirty_block: find the next dirty page and update any state * associated with the search process. * - * Returns true if a page is found + * Returns: + * 0: no page found, give up + * 1: no page found, retry + * 2: page found * * @rs: current RAM state * @pss: data about the state of the current dirty page scan * @again: set to false if the search has scanned the whole of RAM */ -static bool find_dirty_block(RAMState *rs, PageSearchStatus *pss, bool *ag= ain) +static int find_dirty_block(RAMState *rs, PageSearchStatus *pss) { /* This is not a postcopy requested page */ pss->postcopy_requested =3D false; @@ -1499,8 +1502,7 @@ static bool find_dirty_block(RAMState *rs, PageSearch= Status *pss, bool *again) * We've been once around the RAM and haven't found anything. * Give up. */ - *again =3D false; - return false; + return 0; } if (!offset_in_ramblock(pss->block, ((ram_addr_t)pss->page) << TARGET_PAGE_BITS)) { @@ -1529,13 +1531,10 @@ static bool find_dirty_block(RAMState *rs, PageSear= chStatus *pss, bool *again) } } /* Didn't find anything this time, but try again on the new block = */ - *again =3D true; - return false; + return 1; } else { - /* Can go around again, but... */ - *again =3D true; - /* We've found something so probably don't need to */ - return true; + /* We've found something */ + return 2; } } =20 @@ -2270,18 +2269,20 @@ static int ram_find_and_save_block(RAMState *rs) pss.block =3D QLIST_FIRST_RCU(&ram_list.blocks); } =20 - do { + while (true){ if (!get_queued_page(rs, &pss)) { /* priority queue empty, so just search for something dirty */ - bool again =3D true; - if (!find_dirty_block(rs, &pss, &again)) { - if (!again) { - break; - } - } + int res =3D find_dirty_block(rs, &pss); + if (res =3D=3D 0) { + break; + } else if (res =3D=3D 1) + continue; } pages =3D ram_save_host_page(rs, &pss); - } while (!pages); + if (pages) { + break; + } + } =20 rs->last_seen_block =3D pss.block; rs->last_page =3D pss.page; --=20 2.34.1 From nobody Tue May 21 15:30:30 2024 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=1655820719; cv=none; d=zohomail.com; s=zohoarc; b=hmmrVCw8FWebkU20OStlNs0WOVh3t98N0aVY8dUITVBFFMkbZ9qWcDDq7jjNzhJbpclsD4hekrCRcnb2OBM7G484LI7PN6dCeCpuDXszlNNwAO8miTgpp/lnQJF2tFVD0ZvhiR/c5b8ioC0ORes76ouUzJxFH5YbbAb4bhuFBcw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1655820719; 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=uJg/WFGZVTtU9gkUoEDGA71eYp5/Sv32u/ewLvjUnxA=; b=NfSjKInbZQ9KnFB0oYHCnbuOQ18eY6mPZlUSTG4lqRI76py/1h03DWaYNu0VsIaDKg1LV0zhFq67q+9KA+1ZKiWjxDn2glf1zmBJsdG6nRCEY322NKYtnWRPd2mjjZUuMHf8+5PGdOsRXGTNnLg9nj1zqG23Ggs/8ZOLGowM7VU= 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 1655820719349302.6050525579353; Tue, 21 Jun 2022 07:11:59 -0700 (PDT) Received: from localhost ([::1]:58294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o3ebl-00012I-G1 for importer@patchew.org; Tue, 21 Jun 2022 10:11:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3eVg-0003I5-IE for qemu-devel@nongnu.org; Tue, 21 Jun 2022 10:05:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:21444) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o3eVe-000084-Tx for qemu-devel@nongnu.org; Tue, 21 Jun 2022 10:05:40 -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-261-vGX8YB88O_CZ-pbxGFXSAQ-1; Tue, 21 Jun 2022 10:05:33 -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 83B4C101E986; Tue, 21 Jun 2022 14:05:32 +0000 (UTC) Received: from secure.laptop (unknown [10.39.192.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id A571E2166B26; Tue, 21 Jun 2022 14:05:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655820338; 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=uJg/WFGZVTtU9gkUoEDGA71eYp5/Sv32u/ewLvjUnxA=; b=Otm7FdKMfM4cJ1HftubTqkn9uTyCg/ehjnGS8laaQ0EjxRr56jDxPaUbjVgCvH3ib640FO ZWLqVz3i6bYwsLdOqnc/dxreSzT+0hnvvSiIX++UIDKqJtGX84C2vlUvAEoMSDpLUXab4X eqyjA07WbubkELqLGOC9e0bEwcP7xqc= X-MC-Unique: vGX8YB88O_CZ-pbxGFXSAQ-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Juan Quintela , Leonardo Bras , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Eduardo Habkost , "Dr. David Alan Gilbert" , Yanan Wang Subject: [PATCH 5/5] multifd: Only sync once each full round of memory Date: Tue, 21 Jun 2022 16:05:07 +0200 Message-Id: <20220621140507.1246-6-quintela@redhat.com> In-Reply-To: <20220621140507.1246-1-quintela@redhat.com> References: <20220621140507.1246-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 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.129.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1655820720156100001 Content-Type: text/plain; charset="utf-8" We need to add a new flag to mean to sync at that point. Notice that we still synchronize at the end of setup and at the end of complete stages. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/migration.c | 2 +- migration/ram.c | 42 ++++++++++++++++++++++++++++++------------ 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 3f79df0b70..6627787fc2 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -4283,7 +4283,7 @@ static Property migration_properties[] =3D { DEFAULT_MIGRATE_ANNOUNCE_STEP), /* We will change to false when we introduce the new mechanism */ DEFINE_PROP_BOOL("multifd-sync-each-iteration", MigrationState, - multifd_sync_each_iteration, true), + multifd_sync_each_iteration, false), =20 /* Migration capabilities */ DEFINE_PROP_MIG_CAP("x-xbzrle", MIGRATION_CAPABILITY_XBZRLE), diff --git a/migration/ram.c b/migration/ram.c index 2c7289edad..6792986565 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -81,6 +81,7 @@ #define RAM_SAVE_FLAG_XBZRLE 0x40 /* 0x80 is reserved in migration.h start with 0x100 next */ #define RAM_SAVE_FLAG_COMPRESS_PAGE 0x100 +#define RAM_SAVE_FLAG_MULTIFD_SYNC 0x200 =20 XBZRLECacheStats xbzrle_counters; =20 @@ -1482,6 +1483,7 @@ retry: * associated with the search process. * * Returns: + * <0: An error happened * 0: no page found, give up * 1: no page found, retry * 2: page found @@ -1510,6 +1512,13 @@ static int find_dirty_block(RAMState *rs, PageSearch= Status *pss) pss->page =3D 0; pss->block =3D QLIST_NEXT_RCU(pss->block, next); if (!pss->block) { + if (!migrate_multifd_sync_each_iteration()) { + int ret =3D multifd_send_sync_main(rs->f); + if (ret < 0) { + return ret; + } + qemu_put_be64(rs->f, RAM_SAVE_FLAG_MULTIFD_SYNC); + } /* * If memory migration starts over, we will meet a dirtied page * which may still exists in compression threads's ring, so we @@ -2273,7 +2282,8 @@ static int ram_find_and_save_block(RAMState *rs) if (!get_queued_page(rs, &pss)) { /* priority queue empty, so just search for something dirty */ int res =3D find_dirty_block(rs, &pss); - if (res =3D=3D 0) { + if (res <=3D 0) { + pages =3D res; break; } else if (res =3D=3D 1) continue; @@ -2943,11 +2953,13 @@ static int ram_save_setup(QEMUFile *f, void *opaque) ram_control_before_iterate(f, RAM_CONTROL_SETUP); ram_control_after_iterate(f, RAM_CONTROL_SETUP); =20 - if (migrate_multifd_sync_each_iteration()) { - ret =3D multifd_send_sync_main(f); - if (ret < 0) { - return ret; - } + ret =3D multifd_send_sync_main(f); + if (ret < 0) { + return ret; + } + + if (!migrate_multifd_sync_each_iteration()) { + qemu_put_be64(f, RAM_SAVE_FLAG_MULTIFD_SYNC); } qemu_put_be64(f, RAM_SAVE_FLAG_EOS); qemu_fflush(f); @@ -3127,13 +3139,14 @@ static int ram_save_complete(QEMUFile *f, void *opa= que) return ret; } =20 - if (migrate_multifd_sync_each_iteration()) { - ret =3D multifd_send_sync_main(rs->f); - if (ret < 0) { - return ret; - } + ret =3D multifd_send_sync_main(rs->f); + if (ret < 0) { + return ret; } =20 + if (migrate_multifd_sync_each_iteration()) { + qemu_put_be64(f, RAM_SAVE_FLAG_MULTIFD_SYNC); + } qemu_put_be64(f, RAM_SAVE_FLAG_EOS); qemu_fflush(f); =20 @@ -3800,7 +3813,9 @@ int ram_load_postcopy(QEMUFile *f) } decompress_data_with_multi_threads(f, page_buffer, len); break; - + case RAM_SAVE_FLAG_MULTIFD_SYNC: + multifd_recv_sync_main(); + break; case RAM_SAVE_FLAG_EOS: /* normal exit */ if (migrate_multifd_sync_each_iteration()) { @@ -4079,6 +4094,9 @@ static int ram_load_precopy(QEMUFile *f) break; } break; + case RAM_SAVE_FLAG_MULTIFD_SYNC: + multifd_recv_sync_main(); + break; case RAM_SAVE_FLAG_EOS: /* normal exit */ if (migrate_multifd_sync_each_iteration()) { --=20 2.34.1