From nobody Mon May 20 23:50:19 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=1676480790; cv=none; d=zohomail.com; s=zohoarc; b=lfWyvhzYpfbXZUIjSIhgO7ZDGqYSFYQWJ1PEN4LLiFS9BUyA08gOhJ6VKQI7mSnK8wVadfKL/wSFI9ht7Bb3HgOSqc7F//6zvrs10Thj4eYrO8vB3vvPJnh+THIdWvrEI7vlwKR0dBtS9nejq+7QWh7+of6V7DQM9ZNy9y+MtZU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676480790; 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=siPZL72ITvBTQKVA4mzWJSVeV7O7g/iWR4WaF8nMpu4=; b=W9YUpH2lKT7w0F9GBdq+WXjCHnP31DjBoLzUhMNDfj0gj51vcjF3PffWlE36mK2Vnf8T9nePcYj97yz5tVy0ZdkLpyUaZTLbtps5tEhAKDP61saFqPKPcF55h3WWwuiJ07W0M2jllPRLG8fpIjQkh9IAQDf6pIm4dog86eGSrk0= 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 16764807907941014.3070771396123; Wed, 15 Feb 2023 09:06:30 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pSLDc-0002Uh-1x; Wed, 15 Feb 2023 12:05:20 -0500 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 1pSLDZ-0002RS-40 for qemu-devel@nongnu.org; Wed, 15 Feb 2023 12:05:17 -0500 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 1pSLDX-0003mu-EK for qemu-devel@nongnu.org; Wed, 15 Feb 2023 12:05:16 -0500 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-183-a1IzfLBcOkSLoP-OLunDug-1; Wed, 15 Feb 2023 12:05:11 -0500 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 03600882857; Wed, 15 Feb 2023 17:03:53 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 285C0140EBF4; Wed, 15 Feb 2023 17:03:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676480714; 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=siPZL72ITvBTQKVA4mzWJSVeV7O7g/iWR4WaF8nMpu4=; b=hUF19a8aOLIfvujCAdq5cF/4oW96Vxd9RxmSjG9T8OEgRgxtK4bNrjhHjCAPNYoo3XQU89 HN2syNjBdznjPpYfTzdwTlj9XCOICxtQNXv/rklcG2SarE+tAE63yxb3i2hoMfxrLb7e+g Cv1df6Iw19oet5Zx0iUlmkOl4nz1Xqw= X-MC-Unique: a1IzfLBcOkSLoP-OLunDug-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: John Snow , Halil Pasic , Juan Quintela , Christian Borntraeger , Fam Zheng , Vladimir Sementsov-Ogievskiy , Alex Williamson , qemu-s390x@nongnu.org, Thomas Huth , Eric Farman , Stefan Hajnoczi , Eric Blake , Richard Henderson , qemu-block@nongnu.org, "Dr. David Alan Gilbert" , Ilya Leoshkevich , David Hildenbrand Subject: [PATCH v2 1/3] migration: In case of postcopy, the memory ends in res_postcopy_only Date: Wed, 15 Feb 2023 18:03:43 +0100 Message-Id: <20230215170345.6220-2-quintela@redhat.com> In-Reply-To: <20230215170345.6220-1-quintela@redhat.com> References: <20230215170345.6220-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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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 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: 1676480791876100003 Content-Type: text/plain; charset="utf-8" So remove last assignation of res_compatible. Signed-off-by: Juan Quintela Reviewed-by: Vladimir Sementsov-Ogievskiy --- migration/ram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/migration/ram.c b/migration/ram.c index 521912385d..ecf697a58d 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3528,7 +3528,7 @@ static void ram_state_pending_exact(void *opaque, =20 if (migrate_postcopy_ram()) { /* We can do postcopy, and all the data is postcopiable */ - *res_compatible +=3D remaining_size; + *res_postcopy_only +=3D remaining_size; } else { *res_precopy_only +=3D remaining_size; } --=20 2.39.1 From nobody Mon May 20 23:50:19 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=1676481681; cv=none; d=zohomail.com; s=zohoarc; b=BmBM6UKxAFXCcWPkU6SwKZ/awqtJNbTqLAw/FCEri5z9Cdg+0kxTBdL5Z69tc3bfkb6Xtu+5elVmCz5666BsWkzVJAnGZumDyzl7R3P2JzMAmt740ruJFQoIpXm5kKLtJzNXmHBMIzTyG6EzmnjTWIFKRiv5m3vOjZkr1HL9dAw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676481681; 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=zOowvfzGgXt+UcVuOPc3vxAmBlT/P1dNDh3tuKEwU/s=; b=ID2un3GjCndBTyDCb5O+hCfVLz3RUpFsH7J3y8+ZryA5Sj/nF7HGivRp5t/tDWI6YPcenM00F4ZYqrdiOC33g8p5SM0/kFvtCr9XFd4xyqv+ZNzPbmvd40CczUxtYaVsZz3qQ7arykdcuAFJgDnc1KBA7o/dIxXViJkPsmfV6r4= 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 1676481681195845.2485481785075; Wed, 15 Feb 2023 09:21:21 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pSLSp-0001Lf-SD; Wed, 15 Feb 2023 12:21:03 -0500 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 1pSLSo-0001L6-6Z for qemu-devel@nongnu.org; Wed, 15 Feb 2023 12:21:02 -0500 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 1pSLSl-0003Ky-Sq for qemu-devel@nongnu.org; Wed, 15 Feb 2023 12:21:01 -0500 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-265-fMg1jW2eN5OHz1Ee1ADpxg-1; Wed, 15 Feb 2023 12:06:46 -0500 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 433591C29D55; Wed, 15 Feb 2023 17:03:56 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 47C20140EBF4; Wed, 15 Feb 2023 17:03:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676481658; 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=zOowvfzGgXt+UcVuOPc3vxAmBlT/P1dNDh3tuKEwU/s=; b=IOqpsj856KBeOz1yFPC9dWcH4ld2sikrNzNveZnBxVPl3Y+Qy0+xpg0F/aVt78jWKhymsQ n7R2SPNMKdGaOutnwzPkTgPetSO7I1xMzk/mrWeh4uoN8thzAKdSLWGcoe1aeywIqpTaO1 yO9Fkbhu81Vgyu8FG5wC4C2jI8lDzu8= X-MC-Unique: fMg1jW2eN5OHz1Ee1ADpxg-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: John Snow , Halil Pasic , Juan Quintela , Christian Borntraeger , Fam Zheng , Vladimir Sementsov-Ogievskiy , Alex Williamson , qemu-s390x@nongnu.org, Thomas Huth , Eric Farman , Stefan Hajnoczi , Eric Blake , Richard Henderson , qemu-block@nongnu.org, "Dr. David Alan Gilbert" , Ilya Leoshkevich , David Hildenbrand Subject: [PATCH v2 2/3] migration: Remove unused res_compatible Date: Wed, 15 Feb 2023 18:03:44 +0100 Message-Id: <20230215170345.6220-3-quintela@redhat.com> In-Reply-To: <20230215170345.6220-1-quintela@redhat.com> References: <20230215170345.6220-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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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 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: 1676481682165100003 Content-Type: text/plain; charset="utf-8" Nothing assigns to it after previous commit. Reviewed-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Juan Quintela --- include/migration/register.h | 7 ++----- migration/savevm.h | 2 -- hw/s390x/s390-stattrib.c | 1 - hw/vfio/migration.c | 3 +-- migration/block-dirty-bitmap.c | 1 - migration/block.c | 1 - migration/migration.c | 18 ++++++++---------- migration/ram.c | 2 -- migration/savevm.c | 8 ++------ hw/vfio/trace-events | 2 +- migration/trace-events | 4 ++-- 11 files changed, 16 insertions(+), 33 deletions(-) diff --git a/include/migration/register.h b/include/migration/register.h index b91a0cdbf8..a958a92a0f 100644 --- a/include/migration/register.h +++ b/include/migration/register.h @@ -49,22 +49,19 @@ typedef struct SaveVMHandlers { /* Note for save_live_pending: * - res_precopy_only is for data which must be migrated in precopy ph= ase * or in stopped state, in other words - before target vm start - * - res_compatible is for data which may be migrated in any phase * - res_postcopy_only is for data which must be migrated in postcopy = phase * or in stopped state, in other words - after source vm stop * - * Sum of res_postcopy_only, res_compatible and res_postcopy_only is t= he - * whole amount of pending data. + * Sum of res_postcopy_only and res_postcopy_only is the whole + * amount of pending data. */ /* This estimates the remaining data to transfer */ void (*state_pending_estimate)(void *opaque, uint64_t *res_precopy_only, - uint64_t *res_compatible, uint64_t *res_postcopy_only); /* This calculate the exact remaining data to transfer */ void (*state_pending_exact)(void *opaque, uint64_t *res_precopy_only, - uint64_t *res_compatible, uint64_t *res_postcopy_only); LoadStateHandler *load_state; int (*load_setup)(QEMUFile *f, void *opaque); diff --git a/migration/savevm.h b/migration/savevm.h index b1901e68d5..bd625a644b 100644 --- a/migration/savevm.h +++ b/migration/savevm.h @@ -41,10 +41,8 @@ void qemu_savevm_state_complete_postcopy(QEMUFile *f); int qemu_savevm_state_complete_precopy(QEMUFile *f, bool iterable_only, bool inactivate_disks); void qemu_savevm_state_pending_exact(uint64_t *res_precopy_only, - uint64_t *res_compatible, uint64_t *res_postcopy_only); void qemu_savevm_state_pending_estimate(uint64_t *res_precopy_only, - uint64_t *res_compatible, uint64_t *res_postcopy_only); void qemu_savevm_send_ping(QEMUFile *f, uint32_t value); void qemu_savevm_send_open_return_path(QEMUFile *f); diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c index 3e32002eab..c7ae9184ab 100644 --- a/hw/s390x/s390-stattrib.c +++ b/hw/s390x/s390-stattrib.c @@ -184,7 +184,6 @@ static int cmma_save_setup(QEMUFile *f, void *opaque) =20 static void cmma_state_pending(void *opaque, uint64_t *res_precopy_only, - uint64_t *res_compatible, uint64_t *res_postcopy_only) { S390StAttribState *sas =3D S390_STATTRIB(opaque); diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c index b3318f0f20..fb0dd9571d 100644 --- a/hw/vfio/migration.c +++ b/hw/vfio/migration.c @@ -458,7 +458,6 @@ static void vfio_save_cleanup(void *opaque) =20 static void vfio_state_pending(void *opaque, uint64_t *res_precopy_only, - uint64_t *res_compatible, uint64_t *res_postcopy_only) { VFIODevice *vbasedev =3D opaque; @@ -473,7 +472,7 @@ static void vfio_state_pending(void *opaque, *res_precopy_only +=3D migration->pending_bytes; =20 trace_vfio_state_pending(vbasedev->name, *res_precopy_only, - *res_postcopy_only, *res_compatible); + *res_postcopy_only); } =20 static int vfio_save_iterate(QEMUFile *f, void *opaque) diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c index 5a621419d3..9c6655e11a 100644 --- a/migration/block-dirty-bitmap.c +++ b/migration/block-dirty-bitmap.c @@ -764,7 +764,6 @@ static int dirty_bitmap_save_complete(QEMUFile *f, void= *opaque) =20 static void dirty_bitmap_state_pending(void *opaque, uint64_t *res_precopy_only, - uint64_t *res_compatible, uint64_t *res_postcopy_only) { DBMSaveState *s =3D &((DBMState *)opaque)->save; diff --git a/migration/block.c b/migration/block.c index 29f69025af..99d149904c 100644 --- a/migration/block.c +++ b/migration/block.c @@ -865,7 +865,6 @@ static int block_save_complete(QEMUFile *f, void *opaqu= e) =20 static void block_state_pending(void *opaque, uint64_t *res_precopy_only, - uint64_t *res_compatible, uint64_t *res_postcopy_only) { /* Estimate pending number of bytes to send */ diff --git a/migration/migration.c b/migration/migration.c index 90fca70cb7..296f7fe768 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -3863,20 +3863,18 @@ typedef enum { */ static MigIterateState migration_iteration_run(MigrationState *s) { - uint64_t pend_pre, pend_compat, pend_post; + uint64_t pend_pre, pend_post; bool in_postcopy =3D s->state =3D=3D MIGRATION_STATUS_POSTCOPY_ACTIVE; =20 - qemu_savevm_state_pending_estimate(&pend_pre, &pend_compat, &pend_post= ); - uint64_t pending_size =3D pend_pre + pend_compat + pend_post; + qemu_savevm_state_pending_estimate(&pend_pre, &pend_post); + uint64_t pending_size =3D pend_pre + pend_post; =20 - trace_migrate_pending_estimate(pending_size, - pend_pre, pend_compat, pend_post); + trace_migrate_pending_estimate(pending_size, pend_pre, pend_post); =20 - if (pend_pre + pend_compat <=3D s->threshold_size) { - qemu_savevm_state_pending_exact(&pend_pre, &pend_compat, &pend_pos= t); - pending_size =3D pend_pre + pend_compat + pend_post; - trace_migrate_pending_exact(pending_size, - pend_pre, pend_compat, pend_post); + if (pend_pre <=3D s->threshold_size) { + qemu_savevm_state_pending_exact(&pend_pre, &pend_post); + pending_size =3D pend_pre + pend_post; + trace_migrate_pending_exact(pending_size, pend_pre, pend_post); } =20 if (!pending_size || pending_size < s->threshold_size) { diff --git a/migration/ram.c b/migration/ram.c index ecf697a58d..178f92a77f 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3491,7 +3491,6 @@ static int ram_save_complete(QEMUFile *f, void *opaqu= e) =20 static void ram_state_pending_estimate(void *opaque, uint64_t *res_precopy_only, - uint64_t *res_compatible, uint64_t *res_postcopy_only) { RAMState **temp =3D opaque; @@ -3509,7 +3508,6 @@ static void ram_state_pending_estimate(void *opaque, =20 static void ram_state_pending_exact(void *opaque, uint64_t *res_precopy_only, - uint64_t *res_compatible, uint64_t *res_postcopy_only) { RAMState **temp =3D opaque; diff --git a/migration/savevm.c b/migration/savevm.c index b5e6962bb6..80b7f1222a 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1542,13 +1542,11 @@ flush: * for units that can't do postcopy. */ void qemu_savevm_state_pending_estimate(uint64_t *res_precopy_only, - uint64_t *res_compatible, uint64_t *res_postcopy_only) { SaveStateEntry *se; =20 *res_precopy_only =3D 0; - *res_compatible =3D 0; *res_postcopy_only =3D 0; =20 QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { @@ -1561,19 +1559,17 @@ void qemu_savevm_state_pending_estimate(uint64_t *r= es_precopy_only, } } se->ops->state_pending_estimate(se->opaque, - res_precopy_only, res_compatible, + res_precopy_only, res_postcopy_only); } } =20 void qemu_savevm_state_pending_exact(uint64_t *res_precopy_only, - uint64_t *res_compatible, uint64_t *res_postcopy_only) { SaveStateEntry *se; =20 *res_precopy_only =3D 0; - *res_compatible =3D 0; *res_postcopy_only =3D 0; =20 QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { @@ -1586,7 +1582,7 @@ void qemu_savevm_state_pending_exact(uint64_t *res_pr= ecopy_only, } } se->ops->state_pending_exact(se->opaque, - res_precopy_only, res_compatible, + res_precopy_only, res_postcopy_only); } } diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events index 52de1c84f8..90a8aecb37 100644 --- a/hw/vfio/trace-events +++ b/hw/vfio/trace-events @@ -157,7 +157,7 @@ vfio_save_cleanup(const char *name) " (%s)" vfio_save_buffer(const char *name, uint64_t data_offset, uint64_t data_siz= e, uint64_t pending) " (%s) Offset 0x%"PRIx64" size 0x%"PRIx64" pending 0x%= "PRIx64 vfio_update_pending(const char *name, uint64_t pending) " (%s) pending 0x%= "PRIx64 vfio_save_device_config_state(const char *name) " (%s)" -vfio_state_pending(const char *name, uint64_t precopy, uint64_t postcopy, = uint64_t compatible) " (%s) precopy 0x%"PRIx64" postcopy 0x%"PRIx64" compat= ible 0x%"PRIx64 +vfio_state_pending(const char *name, uint64_t precopy, uint64_t postcopy) = " (%s) precopy 0x%"PRIx64" postcopy 0x%"PRIx64 vfio_save_iterate(const char *name, int data_size) " (%s) data_size %d" vfio_save_complete_precopy(const char *name) " (%s)" vfio_load_device_config_state(const char *name) " (%s)" diff --git a/migration/trace-events b/migration/trace-events index 67b65a70ff..422823b1db 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -150,8 +150,8 @@ migrate_fd_cleanup(void) "" migrate_fd_error(const char *error_desc) "error=3D%s" migrate_fd_cancel(void) "" migrate_handle_rp_req_pages(const char *rbname, size_t start, size_t len) = "in %s at 0x%zx len 0x%zx" -migrate_pending_exact(uint64_t size, uint64_t pre, uint64_t compat, uint64= _t post) "exact pending size %" PRIu64 " (pre =3D %" PRIu64 " compat=3D%" P= RIu64 " post=3D%" PRIu64 ")" -migrate_pending_estimate(uint64_t size, uint64_t pre, uint64_t compat, uin= t64_t post) "estimate pending size %" PRIu64 " (pre =3D %" PRIu64 " compat= =3D%" PRIu64 " post=3D%" PRIu64 ")" +migrate_pending_exact(uint64_t size, uint64_t pre, uint64_t post) "exact p= ending size %" PRIu64 " (pre =3D %" PRIu64 " post=3D%" PRIu64 ")" +migrate_pending_estimate(uint64_t size, uint64_t pre, uint64_t post) "esti= mate pending size %" PRIu64 " (pre =3D %" PRIu64 " post=3D%" PRIu64 ")" migrate_send_rp_message(int msg_type, uint16_t len) "%d: len %d" migrate_send_rp_recv_bitmap(char *name, int64_t size) "block '%s' size 0x%= "PRIi64 migration_completion_file_err(void) "" --=20 2.39.1 From nobody Mon May 20 23:50:19 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=1676480790; cv=none; d=zohomail.com; s=zohoarc; b=gcAO37jYyAZ44nDaFgqQFA8h7cQkjF39bHLoOx/PVkBcc1zSjd3J1/WUPCWy/QJsMc5TPn6LdhPpEqiImdj0itG02r6XO07JSfPpHp32KY6F3QGanFyFl2NumZelo79KFEuIaw+frCKNBlURWlq37a0t9syE/0ot30wnn3juHek= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676480790; 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=2a6gtPOe29EWggjQ/VL+Al5iCsiK1u97RJkzWBqpLXQ=; b=DDHBod9xJXqZTOaqr+Vqn1bUOagrzLdWjpLfcp6XxE3gh+ewnX3a/IAhXG3BqtrRASfqzL4DN/IHApUx6Mt5Fy3JqNJ0wGy+NREVmE9z899bPrjG5+Ne4oAlnKWMRYaVarrkDiZUc5SpDOn6D6YCP0/orhvMlTw2q+l8zDR6rR0= 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 1676480790095548.7572640138598; Wed, 15 Feb 2023 09:06:30 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pSLDZ-0002Ra-Ub; Wed, 15 Feb 2023 12:05:18 -0500 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 1pSLDX-0002R2-NF for qemu-devel@nongnu.org; Wed, 15 Feb 2023 12:05:15 -0500 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 1pSLDV-0003mN-MG for qemu-devel@nongnu.org; Wed, 15 Feb 2023 12:05:15 -0500 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-593-sYa3xRxFO0WHNK4Q68pYvg-1; Wed, 15 Feb 2023 12:05:02 -0500 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 826F38871F5; Wed, 15 Feb 2023 17:03:59 +0000 (UTC) Received: from secure.mitica (unknown [10.39.192.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87139140006B; Wed, 15 Feb 2023 17:03:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676480713; 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=2a6gtPOe29EWggjQ/VL+Al5iCsiK1u97RJkzWBqpLXQ=; b=W6wGvEy2uNI7EDS1mz/eLpsftGasemrtjLiPB7GN0E2lDB8tYwrT133nDgjLQmIVx5jbuO atqUHNpDhNsGcpmGqtUxF+flnc75vJBtfbqVdSAmZVQr4VdpaRRPrFPgHrCNPF1mXsJttQ gtS1T93fc0ih1Yk8SqjwQ+No/WKED24= X-MC-Unique: sYa3xRxFO0WHNK4Q68pYvg-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: John Snow , Halil Pasic , Juan Quintela , Christian Borntraeger , Fam Zheng , Vladimir Sementsov-Ogievskiy , Alex Williamson , qemu-s390x@nongnu.org, Thomas Huth , Eric Farman , Stefan Hajnoczi , Eric Blake , Richard Henderson , qemu-block@nongnu.org, "Dr. David Alan Gilbert" , Ilya Leoshkevich , David Hildenbrand Subject: [PATCH v2 3/3] migration: Rename res_{postcopy,precopy}_only Date: Wed, 15 Feb 2023 18:03:45 +0100 Message-Id: <20230215170345.6220-4-quintela@redhat.com> In-Reply-To: <20230215170345.6220-1-quintela@redhat.com> References: <20230215170345.6220-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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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 autolearn=unavailable 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: 1676480791922100005 Content-Type: text/plain; charset="utf-8" Once that res_compatible is removed, they don't make sense anymore. We remove the _only preffix. And to make things clearer we rename them to must_precopy and can_postcopy. Signed-off-by: Juan Quintela Reviewed-by: Vladimir Sementsov-Ogievskiy --- include/migration/register.h | 27 +++++++++++++++------------ migration/savevm.h | 8 ++++---- hw/s390x/s390-stattrib.c | 7 +++---- hw/vfio/migration.c | 10 ++++------ migration/block-dirty-bitmap.c | 6 +++--- migration/block.c | 7 +++---- migration/migration.c | 18 +++++++++--------- migration/ram.c | 18 ++++++++---------- migration/savevm.c | 24 ++++++++++-------------- 9 files changed, 59 insertions(+), 66 deletions(-) diff --git a/include/migration/register.h b/include/migration/register.h index a958a92a0f..a8dfd8fefd 100644 --- a/include/migration/register.h +++ b/include/migration/register.h @@ -47,22 +47,25 @@ typedef struct SaveVMHandlers { /* This runs outside the iothread lock! */ int (*save_setup)(QEMUFile *f, void *opaque); /* Note for save_live_pending: - * - res_precopy_only is for data which must be migrated in precopy ph= ase - * or in stopped state, in other words - before target vm start - * - res_postcopy_only is for data which must be migrated in postcopy = phase - * or in stopped state, in other words - after source vm stop + * must_precopy: + * - must be migrated in precopy or in stopped state + * - i.e. must be migrated before target start * - * Sum of res_postcopy_only and res_postcopy_only is the whole - * amount of pending data. + * can_postcopy: + * - can migrate in postcopy or in stopped state + * - i.e. can migrate after target start + * - some can also be migrated during precopy (RAM) + * - some must be migrated after source stops (block-dirty-bitmap) + * + * Sum of can_postcopy and must_postcopy is the whole amount of + * pending data. */ /* This estimates the remaining data to transfer */ - void (*state_pending_estimate)(void *opaque, - uint64_t *res_precopy_only, - uint64_t *res_postcopy_only); + void (*state_pending_estimate)(void *opaque, uint64_t *must_precopy, + uint64_t *can_postcopy); /* This calculate the exact remaining data to transfer */ - void (*state_pending_exact)(void *opaque, - uint64_t *res_precopy_only, - uint64_t *res_postcopy_only); + void (*state_pending_exact)(void *opaque, uint64_t *must_precopy, + uint64_t *can_postcopy); LoadStateHandler *load_state; int (*load_setup)(QEMUFile *f, void *opaque); int (*load_cleanup)(void *opaque); diff --git a/migration/savevm.h b/migration/savevm.h index bd625a644b..fb636735f0 100644 --- a/migration/savevm.h +++ b/migration/savevm.h @@ -40,10 +40,10 @@ void qemu_savevm_state_cleanup(void); void qemu_savevm_state_complete_postcopy(QEMUFile *f); int qemu_savevm_state_complete_precopy(QEMUFile *f, bool iterable_only, bool inactivate_disks); -void qemu_savevm_state_pending_exact(uint64_t *res_precopy_only, - uint64_t *res_postcopy_only); -void qemu_savevm_state_pending_estimate(uint64_t *res_precopy_only, - uint64_t *res_postcopy_only); +void qemu_savevm_state_pending_exact(uint64_t *must_precopy, + uint64_t *can_postcopy); +void qemu_savevm_state_pending_estimate(uint64_t *must_precopy, + uint64_t *can_postcopy); void qemu_savevm_send_ping(QEMUFile *f, uint32_t value); void qemu_savevm_send_open_return_path(QEMUFile *f); int qemu_savevm_send_packaged(QEMUFile *f, const uint8_t *buf, size_t len); diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c index c7ae9184ab..aed919ad7d 100644 --- a/hw/s390x/s390-stattrib.c +++ b/hw/s390x/s390-stattrib.c @@ -182,16 +182,15 @@ static int cmma_save_setup(QEMUFile *f, void *opaque) return 0; } =20 -static void cmma_state_pending(void *opaque, - uint64_t *res_precopy_only, - uint64_t *res_postcopy_only) +static void cmma_state_pending(void *opaque, uint64_t *must_precopy, + uint64_t *can_postcopy) { S390StAttribState *sas =3D S390_STATTRIB(opaque); S390StAttribClass *sac =3D S390_STATTRIB_GET_CLASS(sas); long long res =3D sac->get_dirtycount(sas); =20 if (res >=3D 0) { - *res_precopy_only +=3D res; + *must_precopy +=3D res; } } =20 diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c index fb0dd9571d..83d2d44080 100644 --- a/hw/vfio/migration.c +++ b/hw/vfio/migration.c @@ -456,9 +456,8 @@ static void vfio_save_cleanup(void *opaque) trace_vfio_save_cleanup(vbasedev->name); } =20 -static void vfio_state_pending(void *opaque, - uint64_t *res_precopy_only, - uint64_t *res_postcopy_only) +static void vfio_state_pending(void *opaque, uint64_t *must_precopy, + uint64_t *can_postcopy) { VFIODevice *vbasedev =3D opaque; VFIOMigration *migration =3D vbasedev->migration; @@ -469,10 +468,9 @@ static void vfio_state_pending(void *opaque, return; } =20 - *res_precopy_only +=3D migration->pending_bytes; + *must_precopy +=3D migration->pending_bytes; =20 - trace_vfio_state_pending(vbasedev->name, *res_precopy_only, - *res_postcopy_only); + trace_vfio_state_pending(vbasedev->name, *must_precopy, *can_postcopy); } =20 static int vfio_save_iterate(QEMUFile *f, void *opaque) diff --git a/migration/block-dirty-bitmap.c b/migration/block-dirty-bitmap.c index 9c6655e11a..fe73aa94b1 100644 --- a/migration/block-dirty-bitmap.c +++ b/migration/block-dirty-bitmap.c @@ -763,8 +763,8 @@ static int dirty_bitmap_save_complete(QEMUFile *f, void= *opaque) } =20 static void dirty_bitmap_state_pending(void *opaque, - uint64_t *res_precopy_only, - uint64_t *res_postcopy_only) + uint64_t *must_precopy, + uint64_t *can_postcopy) { DBMSaveState *s =3D &((DBMState *)opaque)->save; SaveBitmapState *dbms; @@ -784,7 +784,7 @@ static void dirty_bitmap_state_pending(void *opaque, =20 trace_dirty_bitmap_state_pending(pending); =20 - *res_postcopy_only +=3D pending; + *can_postcopy +=3D pending; } =20 /* First occurrence of this bitmap. It should be created if doesn't exist = */ diff --git a/migration/block.c b/migration/block.c index 99d149904c..64cecbe5df 100644 --- a/migration/block.c +++ b/migration/block.c @@ -863,9 +863,8 @@ static int block_save_complete(QEMUFile *f, void *opaqu= e) return 0; } =20 -static void block_state_pending(void *opaque, - uint64_t *res_precopy_only, - uint64_t *res_postcopy_only) +static void block_state_pending(void *opaque, uint64_t *must_precopy, + uint64_t *can_postcopy) { /* Estimate pending number of bytes to send */ uint64_t pending; @@ -886,7 +885,7 @@ static void block_state_pending(void *opaque, =20 trace_migration_block_state_pending(pending); /* We don't do postcopy */ - *res_precopy_only +=3D pending; + *must_precopy +=3D pending; } =20 static int block_load(QEMUFile *f, void *opaque, int version_id) diff --git a/migration/migration.c b/migration/migration.c index 296f7fe768..ae2025d9d8 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -3863,18 +3863,18 @@ typedef enum { */ static MigIterateState migration_iteration_run(MigrationState *s) { - uint64_t pend_pre, pend_post; + uint64_t must_precopy, can_postcopy; bool in_postcopy =3D s->state =3D=3D MIGRATION_STATUS_POSTCOPY_ACTIVE; =20 - qemu_savevm_state_pending_estimate(&pend_pre, &pend_post); - uint64_t pending_size =3D pend_pre + pend_post; + qemu_savevm_state_pending_estimate(&must_precopy, &can_postcopy); + uint64_t pending_size =3D must_precopy + can_postcopy; =20 - trace_migrate_pending_estimate(pending_size, pend_pre, pend_post); + trace_migrate_pending_estimate(pending_size, must_precopy, can_postcop= y); =20 - if (pend_pre <=3D s->threshold_size) { - qemu_savevm_state_pending_exact(&pend_pre, &pend_post); - pending_size =3D pend_pre + pend_post; - trace_migrate_pending_exact(pending_size, pend_pre, pend_post); + if (must_precopy <=3D s->threshold_size) { + qemu_savevm_state_pending_exact(&must_precopy, &can_postcopy); + pending_size =3D must_precopy + can_postcopy; + trace_migrate_pending_exact(pending_size, must_precopy, can_postco= py); } =20 if (!pending_size || pending_size < s->threshold_size) { @@ -3884,7 +3884,7 @@ static MigIterateState migration_iteration_run(Migrat= ionState *s) } =20 /* Still a significant amount to transfer */ - if (!in_postcopy && pend_pre <=3D s->threshold_size && + if (!in_postcopy && must_precopy <=3D s->threshold_size && qatomic_read(&s->start_postcopy)) { if (postcopy_start(s)) { error_report("%s: postcopy failed to start", __func__); diff --git a/migration/ram.c b/migration/ram.c index 178f92a77f..96e8a19a58 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3489,9 +3489,8 @@ static int ram_save_complete(QEMUFile *f, void *opaqu= e) return 0; } =20 -static void ram_state_pending_estimate(void *opaque, - uint64_t *res_precopy_only, - uint64_t *res_postcopy_only) +static void ram_state_pending_estimate(void *opaque, uint64_t *must_precop= y, + uint64_t *can_postcopy) { RAMState **temp =3D opaque; RAMState *rs =3D *temp; @@ -3500,15 +3499,14 @@ static void ram_state_pending_estimate(void *opaque, =20 if (migrate_postcopy_ram()) { /* We can do postcopy, and all the data is postcopiable */ - *res_postcopy_only +=3D remaining_size; + *can_postcopy +=3D remaining_size; } else { - *res_precopy_only +=3D remaining_size; + *must_precopy +=3D remaining_size; } } =20 -static void ram_state_pending_exact(void *opaque, - uint64_t *res_precopy_only, - uint64_t *res_postcopy_only) +static void ram_state_pending_exact(void *opaque, uint64_t *must_precopy, + uint64_t *can_postcopy) { RAMState **temp =3D opaque; RAMState *rs =3D *temp; @@ -3526,9 +3524,9 @@ static void ram_state_pending_exact(void *opaque, =20 if (migrate_postcopy_ram()) { /* We can do postcopy, and all the data is postcopiable */ - *res_postcopy_only +=3D remaining_size; + *can_postcopy +=3D remaining_size; } else { - *res_precopy_only +=3D remaining_size; + *must_precopy +=3D remaining_size; } } =20 diff --git a/migration/savevm.c b/migration/savevm.c index 80b7f1222a..aa54a67fda 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1541,13 +1541,13 @@ flush: * the result is split into the amount for units that can and * for units that can't do postcopy. */ -void qemu_savevm_state_pending_estimate(uint64_t *res_precopy_only, - uint64_t *res_postcopy_only) +void qemu_savevm_state_pending_estimate(uint64_t *must_precopy, + uint64_t *can_postcopy) { SaveStateEntry *se; =20 - *res_precopy_only =3D 0; - *res_postcopy_only =3D 0; + *must_precopy =3D 0; + *can_postcopy =3D 0; =20 QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { if (!se->ops || !se->ops->state_pending_estimate) { @@ -1558,19 +1558,17 @@ void qemu_savevm_state_pending_estimate(uint64_t *r= es_precopy_only, continue; } } - se->ops->state_pending_estimate(se->opaque, - res_precopy_only, - res_postcopy_only); + se->ops->state_pending_estimate(se->opaque, must_precopy, can_post= copy); } } =20 -void qemu_savevm_state_pending_exact(uint64_t *res_precopy_only, - uint64_t *res_postcopy_only) +void qemu_savevm_state_pending_exact(uint64_t *must_precopy, + uint64_t *can_postcopy) { SaveStateEntry *se; =20 - *res_precopy_only =3D 0; - *res_postcopy_only =3D 0; + *must_precopy =3D 0; + *can_postcopy =3D 0; =20 QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { if (!se->ops || !se->ops->state_pending_exact) { @@ -1581,9 +1579,7 @@ void qemu_savevm_state_pending_exact(uint64_t *res_pr= ecopy_only, continue; } } - se->ops->state_pending_exact(se->opaque, - res_precopy_only, - res_postcopy_only); + se->ops->state_pending_exact(se->opaque, must_precopy, can_postcop= y); } } =20 --=20 2.39.1