From nobody Sat May 11 04:40:37 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=1682533178; cv=none; d=zohomail.com; s=zohoarc; b=FeCHI0NFn+ldxptIxqdEpl5+E0yGnSloP/z12FzWgjvqH/vE06GZija8A2tvukaKeBkJrCXJZJ8F775rnAp/FPdznFQLemkGqHMTNC0c4iy4uKLNMZnjHAq3+rwqimGM3mnpOB/KDwZzHjqq29DRGEHVBPYuurglQoaF48kfwfQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682533178; 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=6WC45oisYHqoEu6QVmx4SBuRFuf282V6YK4H8AHjU+0=; b=gGX+VnangDFoS5Id5CLonXfO1Bss+vmw7wrWNFZlhkO/UerVxKUjtbDqHWelQR7PMKE/4/a81yt+7k4O5WCjJCR7JR0SocyQzUAQ1vIImizL5PKzH11/sh7oLhdp+UzsZ3u9t253mK3HbKsKa38DazGzXTIIn2euP0u89a86SYw= 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 1682533178840789.4929726615221; Wed, 26 Apr 2023 11:19:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1prjjY-0000QD-Cc; Wed, 26 Apr 2023 14:19:16 -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 1prjjW-0000Ph-UT for qemu-devel@nongnu.org; Wed, 26 Apr 2023 14:19:15 -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 1prjjV-0001x8-DD for qemu-devel@nongnu.org; Wed, 26 Apr 2023 14:19:14 -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-635-tKuSCTRRMMKuBGnU-OIymw-1; Wed, 26 Apr 2023 14:19:06 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B84D83806636; Wed, 26 Apr 2023 18:19:05 +0000 (UTC) Received: from secure.mitica (unknown [10.39.193.238]) by smtp.corp.redhat.com (Postfix) with ESMTP id 41F361415117; Wed, 26 Apr 2023 18:19:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682533152; 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=6WC45oisYHqoEu6QVmx4SBuRFuf282V6YK4H8AHjU+0=; b=dYBUtUT72kqzVUV7KJT8BVhPrzZX4YIufSj7dDfYEyf/N96FtVmQ7l11ShWqE78JLoLErT CqXpgrsiWgmaYo1pBRZwFM4+kSF7HMi92VU7Xu85YOt6+FB04fPIvHHIcfankSfIge2vvs pCKA6UQWU081nl1JcK28OsDSnlXSPQw= X-MC-Unique: tKuSCTRRMMKuBGnU-OIymw-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Peter Xu , Juan Quintela , Leonardo Bras , Yanan Wang , Eduardo Habkost , "Dr . David Alan Gilbert" Subject: [PATCH v9 1/3] multifd: Create property multifd-flush-after-each-section Date: Wed, 26 Apr 2023 20:18:59 +0200 Message-Id: <20230426181901.13574-2-quintela@redhat.com> In-Reply-To: <20230426181901.13574-1-quintela@redhat.com> References: <20230426181901.13574-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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.171, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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: 1682533180218100001 Content-Type: text/plain; charset="utf-8" We used to flush all channels at the end of each RAM section sent. That is not needed, so preparing to only flush after a full iteration through all the RAM. Default value of the property is false. But we return "true" in migrate_multifd_flush_after_each_section() until we implement the code in following patches. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert Acked-by: Peter Xu --- Rename each-iteration to after-each-section Rename multifd-sync-after-each-section to multifd-flush-after-each-section Move to machine-8.0 (peter) --- hw/core/machine.c | 4 +++- migration/migration.c | 2 ++ migration/migration.h | 12 ++++++++++++ migration/options.c | 11 +++++++++++ migration/options.h | 1 + 5 files changed, 29 insertions(+), 1 deletion(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 2ce97a5d3b..47a34841a5 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -39,7 +39,9 @@ #include "hw/virtio/virtio.h" #include "hw/virtio/virtio-pci.h" =20 -GlobalProperty hw_compat_8_0[] =3D {}; +GlobalProperty hw_compat_8_0[] =3D { + { "migration", "multifd-flush-after-each-section", "on"}, +}; const size_t hw_compat_8_0_len =3D G_N_ELEMENTS(hw_compat_8_0); =20 GlobalProperty hw_compat_7_2[] =3D { diff --git a/migration/migration.c b/migration/migration.c index 22e8586623..e82aa69842 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -3344,6 +3344,8 @@ static Property migration_properties[] =3D { send_section_footer, true), DEFINE_PROP_BOOL("decompress-error-check", MigrationState, decompress_error_check, true), + DEFINE_PROP_BOOL("multifd-flush-after-each-section", MigrationState, + multifd_flush_after_each_section, true), DEFINE_PROP_UINT8("x-clear-bitmap-shift", MigrationState, clear_bitmap_shift, CLEAR_BITMAP_SHIFT_DEFAULT), DEFINE_PROP_BOOL("x-preempt-pre-7-2", MigrationState, diff --git a/migration/migration.h b/migration/migration.h index 2b71df8617..e2247d708f 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -404,6 +404,18 @@ struct MigrationState { */ bool preempt_pre_7_2; =20 + /* + * flush every channel after each section sent. + * + * This assures that we can't mix pages from one iteration through + * ram pages with pages for the following iteration. We really + * only need to do this flush after we have go through all the + * dirty pages. For historical reasons, we do that after each + * section. This is suboptimal (we flush too many times). + * Default value is false. Setting this property has no effect + * until the patch that removes this comment. (since 8.1) + */ + bool multifd_flush_after_each_section; /* * This decides the size of guest memory chunk that will be used * to track dirty bitmap clearing. The size of memory chunk will diff --git a/migration/options.c b/migration/options.c index c6030587cf..b9d54b4ef7 100644 --- a/migration/options.c +++ b/migration/options.c @@ -217,6 +217,17 @@ bool migrate_zero_copy_send(void) =20 /* pseudo capabilities */ =20 +bool migrate_multifd_flush_after_each_section(void) +{ + MigrationState *s =3D migrate_get_current(); + + /* + * Until the patch that remove this comment, we always return that + * the property is enabled. + */ + return true || s->multifd_flush_after_each_section; +} + bool migrate_postcopy(void) { return migrate_postcopy_ram() || migrate_dirty_bitmaps(); diff --git a/migration/options.h b/migration/options.h index 89067e59a0..9b9ea0cde8 100644 --- a/migration/options.h +++ b/migration/options.h @@ -52,6 +52,7 @@ bool migrate_zero_copy_send(void); * check, but they are not a capability. */ =20 +bool migrate_multifd_flush_after_each_section(void); bool migrate_postcopy(void); bool migrate_tls(void); =20 --=20 2.40.0 From nobody Sat May 11 04:40:37 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=1682533181; cv=none; d=zohomail.com; s=zohoarc; b=AsZZkVE4F4/s4MPNtM4Qhv24hE09hnarWspLB8Ic9yFkmzRSVJgZVuYlTtrR/ik8tlww43/OGU6DS3iGG+aqrpoC2Hbc8K9CrZplX9901vx4EfQy6iTEoRJnVBEWrrmg3dXz+5kxQNp2UcoQC3lYcsO6iA7f34LtoSkwwB2XC9g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682533181; 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=T1cBJX1ouDMnbDsO+Ogp0Q8jRZ8ENZ0BxMiXIpx3+xg=; b=jd9oGXzluWxUCvFS2z0lk75weK+mideYq7bgF3L8hvKqXCD/aciZgpOcEUgb9KM4jDb3VsMY8ONvsIBBl2xMvSb3B+xTO/FYGE8kf3RBx6EU1EM/YvQ2RhXuw06uKzspJOlE4crNwkAAaETbYSK/+Yb+HDnoPZtLI1Vtw1TO0Ks= 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 1682533181892482.9088658141352; Wed, 26 Apr 2023 11:19:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1prjjX-0000Q2-Tu; Wed, 26 Apr 2023 14:19:15 -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 1prjjW-0000PY-7X for qemu-devel@nongnu.org; Wed, 26 Apr 2023 14:19:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1prjjU-0001x4-PY for qemu-devel@nongnu.org; Wed, 26 Apr 2023 14:19: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-280-I0F6YwIgPEC2GmPkB7dUwg-1; Wed, 26 Apr 2023 14:19:07 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7AFD2185A7A2; Wed, 26 Apr 2023 18:19:07 +0000 (UTC) Received: from secure.mitica (unknown [10.39.193.238]) by smtp.corp.redhat.com (Postfix) with ESMTP id 07BF114171B6; Wed, 26 Apr 2023 18:19:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682533151; 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=T1cBJX1ouDMnbDsO+Ogp0Q8jRZ8ENZ0BxMiXIpx3+xg=; b=iAYqoCdxVgntupIbSMjQhJ7vQf8NecSgFG8pJK36dPu2IPtLJXfFWZJK0IzAJXHiRyCLuY phQ6DZxBT+ldS0QgwVksVNJYIhWBiXkPEvdiufGEonPS/2QNnDvMfG4IPeNBhGMtUoDk11 d/Fw/yUsAzhWW/UANGrRZ2xm0jCid9A= X-MC-Unique: I0F6YwIgPEC2GmPkB7dUwg-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Peter Xu , Juan Quintela , Leonardo Bras , Yanan Wang , Eduardo Habkost , "Dr . David Alan Gilbert" Subject: [PATCH v9 2/3] multifd: Protect multifd_send_sync_main() calls Date: Wed, 26 Apr 2023 20:19:00 +0200 Message-Id: <20230426181901.13574-3-quintela@redhat.com> In-Reply-To: <20230426181901.13574-1-quintela@redhat.com> References: <20230426181901.13574-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: -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.171, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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: 1682533182436100005 Content-Type: text/plain; charset="utf-8" We only need to do that on the ram_save_iterate() call on sending and on destination when we get a RAM_SAVE_FLAG_EOS. In setup() and complete() we need to synch in both new and old cases, so don't add a check there. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert Acked-by: Peter Xu --- Remove the wrappers that we take out on patch 5. --- migration/ram.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 01356f60a4..1e2414d681 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3394,9 +3394,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->pss[RAM_CHANNEL_PRECOPY].pss_ch= annel); - if (ret < 0) { - return ret; + if (migrate_multifd_flush_after_each_section()) { + ret =3D multifd_send_sync_main(rs->pss[RAM_CHANNEL_PRECOPY].ps= s_channel); + if (ret < 0) { + return ret; + } } =20 qemu_put_be64(f, RAM_SAVE_FLAG_EOS); @@ -4153,7 +4155,9 @@ int ram_load_postcopy(QEMUFile *f, int channel) =20 case RAM_SAVE_FLAG_EOS: /* normal exit */ - multifd_recv_sync_main(); + if (migrate_multifd_flush_after_each_section()) { + multifd_recv_sync_main(); + } break; default: error_report("Unknown combination of migration flags: 0x%x" @@ -4424,7 +4428,9 @@ static int ram_load_precopy(QEMUFile *f) break; case RAM_SAVE_FLAG_EOS: /* normal exit */ - multifd_recv_sync_main(); + if (migrate_multifd_flush_after_each_section()) { + multifd_recv_sync_main(); + } break; default: if (flags & RAM_SAVE_FLAG_HOOK) { --=20 2.40.0 From nobody Sat May 11 04:40:37 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=1682533225; cv=none; d=zohomail.com; s=zohoarc; b=X369hfBWxMjW5k3BJ3xqJU27jVx/+Um5pZQXde30KGFNNAZ40wsnk0O8HZdo0dzncbKJUsCrwP8Gms8YyyI50uVXPgQ6vgw2LQSmJtYb4N7AdBXVVeDGqA0VQYAhbGEW6KhqEV0P0DmQayLp07cmqP33cBcu959KEeaHwmCs9GQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682533225; 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=TgDnnl9TIzKy2MBxl7JHJwYHSYXHWT5QCxoKTtTU98Y=; b=k7VUSXp5h8aB0Qk8+ZIi8EyDKnP357DUvzErcbw1DOijrZc+ZMtdBNMYA0R/01Ts844llcjq1oiezX2IKfrgRQ6aUr7OaP1o1ybv6WNXxqYRIAQQ9sy00AiGaPUg9AVdhHtWVwIrJ4c11JJInXe98Gzso2XkH2+urQCl6OMXgcA= 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 1682533225017418.6531933008108; Wed, 26 Apr 2023 11:20:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1prjjY-0000QF-TI; Wed, 26 Apr 2023 14:19:16 -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 1prjjX-0000Pp-LI for qemu-devel@nongnu.org; Wed, 26 Apr 2023 14:19:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1prjjV-0001xA-Fx for qemu-devel@nongnu.org; Wed, 26 Apr 2023 14:19:15 -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-558-dW73ROjWOB2pYe5vssbL8Q-1; Wed, 26 Apr 2023 14:19:09 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 37F8285C1A0; Wed, 26 Apr 2023 18:19:09 +0000 (UTC) Received: from secure.mitica (unknown [10.39.193.238]) by smtp.corp.redhat.com (Postfix) with ESMTP id BD06B14171B6; Wed, 26 Apr 2023 18:19:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1682533152; 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=TgDnnl9TIzKy2MBxl7JHJwYHSYXHWT5QCxoKTtTU98Y=; b=cJBl3S1y/Qt+f/MueBrhBVp73rVoXLem4QSYncAEToBiqjrpi+XxsJU+96pMqmZVD/x/mL KsIUpt2n6LX8MPeI+KIYsHoBvx8JF2KDl3GUoAUoo3JwLo2ppMDW8ZoY3HjI9e+h92/Jot ncN4NBAM8uZtkrn/1UZVyvWiBgexqNQ= X-MC-Unique: dW73ROjWOB2pYe5vssbL8Q-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcel Apfelbaum , Peter Xu , Juan Quintela , Leonardo Bras , Yanan Wang , Eduardo Habkost Subject: [PATCH v9 3/3] multifd: Only flush once each full round of memory Date: Wed, 26 Apr 2023 20:19:01 +0200 Message-Id: <20230426181901.13574-4-quintela@redhat.com> In-Reply-To: <20230426181901.13574-1-quintela@redhat.com> References: <20230426181901.13574-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: -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.171, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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: 1682533226670100003 Content-Type: text/plain; charset="utf-8" We need to add a new flag to mean to flush at that point. Notice that we still flush at the end of setup and at the end of complete stages. Signed-off-by: Juan Quintela Acked-by: Peter Xu --- Add missing qemu_fflush(), now it passes all tests always. In the previous version, the check that changes the default value to false got lost in some rebase. Get it back. --- migration/migration.c | 2 +- migration/migration.h | 3 +-- migration/options.c | 6 +----- migration/ram.c | 28 +++++++++++++++++++++++++++- 4 files changed, 30 insertions(+), 9 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index e82aa69842..e504f30c2e 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -3345,7 +3345,7 @@ static Property migration_properties[] =3D { DEFINE_PROP_BOOL("decompress-error-check", MigrationState, decompress_error_check, true), DEFINE_PROP_BOOL("multifd-flush-after-each-section", MigrationState, - multifd_flush_after_each_section, true), + multifd_flush_after_each_section, false), DEFINE_PROP_UINT8("x-clear-bitmap-shift", MigrationState, clear_bitmap_shift, CLEAR_BITMAP_SHIFT_DEFAULT), DEFINE_PROP_BOOL("x-preempt-pre-7-2", MigrationState, diff --git a/migration/migration.h b/migration/migration.h index e2247d708f..3a918514e7 100644 --- a/migration/migration.h +++ b/migration/migration.h @@ -412,8 +412,7 @@ struct MigrationState { * only need to do this flush after we have go through all the * dirty pages. For historical reasons, we do that after each * section. This is suboptimal (we flush too many times). - * Default value is false. Setting this property has no effect - * until the patch that removes this comment. (since 8.1) + * Default value is false. (since 8.1) */ bool multifd_flush_after_each_section; /* diff --git a/migration/options.c b/migration/options.c index b9d54b4ef7..78bfcc8ec0 100644 --- a/migration/options.c +++ b/migration/options.c @@ -221,11 +221,7 @@ bool migrate_multifd_flush_after_each_section(void) { MigrationState *s =3D migrate_get_current(); =20 - /* - * Until the patch that remove this comment, we always return that - * the property is enabled. - */ - return true || s->multifd_flush_after_each_section; + return s->multifd_flush_after_each_section; } =20 bool migrate_postcopy(void) diff --git a/migration/ram.c b/migration/ram.c index 1e2414d681..e9dcda8b9d 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -86,6 +86,7 @@ #define RAM_SAVE_FLAG_XBZRLE 0x40 /* 0x80 is reserved in qemu-file.h for RAM_SAVE_FLAG_HOOK */ #define RAM_SAVE_FLAG_COMPRESS_PAGE 0x100 +#define RAM_SAVE_FLAG_MULTIFD_FLUSH 0x200 /* We can't use any flag that is bigger than 0x200 */ =20 int (*xbzrle_encode_buffer_func)(uint8_t *, uint8_t *, int, @@ -1581,6 +1582,7 @@ retry: * associated with the search process. * * Returns: + * <0: An error happened * PAGE_ALL_CLEAN: no dirty page found, give up * PAGE_TRY_AGAIN: no dirty page found, retry for next block * PAGE_DIRTY_FOUND: dirty page found @@ -1608,6 +1610,15 @@ 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_flush_after_each_section()) { + QEMUFile *f =3D rs->pss[RAM_CHANNEL_PRECOPY].pss_channel; + int ret =3D multifd_send_sync_main(f); + if (ret < 0) { + return ret; + } + qemu_put_be64(f, RAM_SAVE_FLAG_MULTIFD_FLUSH); + qemu_fflush(f); + } /* * If memory migration starts over, we will meet a dirtied page * which may still exists in compression threads's ring, so we @@ -2600,6 +2611,9 @@ static int ram_find_and_save_block(RAMState *rs) break; } else if (res =3D=3D PAGE_TRY_AGAIN) { continue; + } else if (res < 0) { + pages =3D res; + break; } } } @@ -3286,6 +3300,10 @@ static int ram_save_setup(QEMUFile *f, void *opaque) return ret; } =20 + if (!migrate_multifd_flush_after_each_section()) { + qemu_put_be64(f, RAM_SAVE_FLAG_MULTIFD_FLUSH); + } + qemu_put_be64(f, RAM_SAVE_FLAG_EOS); qemu_fflush(f); =20 @@ -3471,6 +3489,9 @@ static int ram_save_complete(QEMUFile *f, void *opaqu= e) return ret; } =20 + if (!migrate_multifd_flush_after_each_section()) { + qemu_put_be64(f, RAM_SAVE_FLAG_MULTIFD_FLUSH); + } qemu_put_be64(f, RAM_SAVE_FLAG_EOS); qemu_fflush(f); =20 @@ -4152,7 +4173,9 @@ int ram_load_postcopy(QEMUFile *f, int channel) } decompress_data_with_multi_threads(f, page_buffer, len); break; - + case RAM_SAVE_FLAG_MULTIFD_FLUSH: + multifd_recv_sync_main(); + break; case RAM_SAVE_FLAG_EOS: /* normal exit */ if (migrate_multifd_flush_after_each_section()) { @@ -4426,6 +4449,9 @@ static int ram_load_precopy(QEMUFile *f) break; } break; + case RAM_SAVE_FLAG_MULTIFD_FLUSH: + multifd_recv_sync_main(); + break; case RAM_SAVE_FLAG_EOS: /* normal exit */ if (migrate_multifd_flush_after_each_section()) { --=20 2.40.0