From nobody Mon Feb 9 18:18:37 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1646927216424746.2593902935334; Thu, 10 Mar 2022 07:46:56 -0800 (PST) Received: from localhost ([::1]:38952 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nSL0B-0005ns-9X for importer@patchew.org; Thu, 10 Mar 2022 10:46:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36190) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nSKp2-0003h3-PI for qemu-devel@nongnu.org; Thu, 10 Mar 2022 10:35:26 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:29402) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nSKp0-0004N8-5y for qemu-devel@nongnu.org; Thu, 10 Mar 2022 10:35:24 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-541-6MYqeiKtPYOmQZzJ5zK_VA-1; Thu, 10 Mar 2022 10:35:18 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 68497801DDB; Thu, 10 Mar 2022 15:35:17 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id 61D7B7DE43; Thu, 10 Mar 2022 15:35:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646926521; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=h9ZbnAkRz5RqH5RpwJz8Auv9cqc1VYbhAksKZy/oBc0=; b=EKm7PCXj9jgBjZpMnxtZ/VXXpGDl150K+x6FjyDs2ABu9VOQoj/BQZIRQacAZe7Bq0Hu8d zuCaGlDARQNeTtD6/bq4JbvcYUg3MgX/vJeYExm4g8vtzPXfzkjio3CXUV7AS0fXwy/B9/ 0HOZaGytOm5bH0KIpQJI3l0TFnp9gjo= X-MC-Unique: 6MYqeiKtPYOmQZzJ5zK_VA-1 From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v5 8/8] migration: Use multifd before we check for the zero page Date: Thu, 10 Mar 2022 16:34:54 +0100 Message-Id: <20220310153454.3929-9-quintela@redhat.com> In-Reply-To: <20220310153454.3929-1-quintela@redhat.com> References: <20220310153454.3929-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=quintela@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 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_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: Eduardo Habkost , Juan Quintela , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Xu , "Dr. David Alan Gilbert" , Yanan Wang , Leonardo Bras Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1646927218378100001 Content-Type: text/plain; charset="utf-8" So we use multifd to transmit zero pages. Signed-off-by: Juan Quintela --- - Check zero_page property before using new code (Dave) --- migration/ram.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/migration/ram.c b/migration/ram.c index 141817d6a7..628b5554ba 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2175,6 +2175,32 @@ static int ram_save_target_page_legacy(RAMState *rs,= PageSearchStatus *pss) return ram_save_page(rs, pss); } =20 +/** + * ram_save_target_page_multifd: save one target page + * + * Returns the number of pages written + * + * @rs: current RAM state + * @pss: data about the page we want to send + */ +static int ram_save_target_page_multifd(RAMState *rs, PageSearchStatus *ps= s) +{ + RAMBlock *block =3D pss->block; + ram_addr_t offset =3D ((ram_addr_t)pss->page) << TARGET_PAGE_BITS; + int res; + + if (!migration_in_postcopy()) { + return ram_save_multifd_page(rs, block, offset); + } + + res =3D save_zero_page(rs, block, offset); + if (res > 0) { + return res; + } + + return ram_save_page(rs, pss); +} + /** * ram_save_host_page: save a whole host page * @@ -2938,7 +2964,11 @@ 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 - (*rsp)->ram_save_target_page =3D ram_save_target_page_legacy; + if (migrate_use_multifd() && migrate_use_multifd_zero_page()) { + (*rsp)->ram_save_target_page =3D ram_save_target_page_multifd; + } else { + (*rsp)->ram_save_target_page =3D ram_save_target_page_legacy; + } multifd_send_sync_main(f); qemu_put_be64(f, RAM_SAVE_FLAG_EOS); qemu_fflush(f); --=20 2.34.1