From nobody Tue Feb 10 18:59:23 2026 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=1653995621; cv=none; d=zohomail.com; s=zohoarc; b=PAfiGarvUa6IV8XT0s7f35SU4tplGLQ0y6nJ9SXwBtKRF7ZOyUOe35gis6jBJIlJFkVdBFjCArWU44SlcmEQnwgyJMfiAqQmyu38O0ZLg/ML4H0XAW06oPuWVqi3ESd0TVNg54iSL8mw6DZte5qGnlEDG4LqeRtkEclGn6gJnws= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1653995621; 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=IzwhjLoqScc49CkenZZj/4FIwnFGKi7Ccd80ETn04LQ=; b=Q269zVOgAjjtUxGnZwYXXvKiPmWRXLpPbfcruxtYVq8leNnP88OoK7AGHHooZSmeiK8wu4vgvH71I/nVUorKVkCEoZzedVV+IS7D9fGQizXpdV6uBauQJ2EypzPaJpa+x41Dal+OHv1m6ILlvmicVgXkzWRtlzMm/nBUsk+m/1E= 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 1653995621071817.9310024108022; Tue, 31 May 2022 04:13:41 -0700 (PDT) Received: from localhost ([::1]:51496 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nvzoh-0007s5-RI for importer@patchew.org; Tue, 31 May 2022 07:13:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46622) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvzM3-0004DT-W8 for qemu-devel@nongnu.org; Tue, 31 May 2022 06:44:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:45078) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nvzM2-0004hs-Cw for qemu-devel@nongnu.org; Tue, 31 May 2022 06:44:03 -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-213-fuj6YzJFNFmeFjPwNHGQAQ-1; Tue, 31 May 2022 06:43:51 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9506185A5BC; Tue, 31 May 2022 10:43:50 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.225]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA10C1131A; Tue, 31 May 2022 10:43:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653993841; 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=IzwhjLoqScc49CkenZZj/4FIwnFGKi7Ccd80ETn04LQ=; b=fRYrLgli8f7iakozXgLoEDvorQQp7f5L6n3bq7XtepTD0xnf3k7UC7I8f1+2Qp02zMmNWi UbYpbDzrIEKjVAg1hLSsoK8lWeWTS8WIVBCTrCLzW9n1cSrDPbEcsJP+YS899VkmMrtGV3 X1ig72qmM376E1SsH7uxxvJj1I4E3ZU= X-MC-Unique: fuj6YzJFNFmeFjPwNHGQAQ-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Marcel Apfelbaum , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yanan Wang , "Dr. David Alan Gilbert" , Juan Quintela , Eduardo Habkost , Peter Xu , Leonardo Bras Subject: [PATCH v7 13/13] migration: Use multifd before we check for the zero page Date: Tue, 31 May 2022 12:43:18 +0200 Message-Id: <20220531104318.7494-14-quintela@redhat.com> In-Reply-To: <20220531104318.7494-1-quintela@redhat.com> References: <20220531104318.7494-1-quintela@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 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, 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: 1653995622147100001 Content-Type: text/plain; charset="utf-8" So we use multifd to transmit zero pages. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- - Check zero_page property before using new code (Dave) --- migration/ram.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/migration/ram.c b/migration/ram.c index 7ceef7976b..f9959262fa 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2181,6 +2181,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 * @@ -2945,7 +2971,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 - (*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; + } + ret =3D multifd_send_sync_main(f); if (ret < 0) { return ret; --=20 2.35.3