From nobody Fri Apr 26 10:56:37 2024 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 1637748571782108.59121955689875; Wed, 24 Nov 2021 02:09:31 -0800 (PST) Received: from localhost ([::1]:58872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mppDV-00045V-ER for importer@patchew.org; Wed, 24 Nov 2021 05:09:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppAa-0007aw-F8 for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:06:30 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:22770) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppAX-0006eu-1y for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:06:26 -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-208-w74ShoQVN56wPdMoxHV2lQ-1; Wed, 24 Nov 2021 05:06:22 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0E634102C7E9 for ; Wed, 24 Nov 2021 10:06:22 +0000 (UTC) Received: from redhat.mitica.com (unknown [10.39.193.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9D83260843; Wed, 24 Nov 2021 10:06:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637748383; 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=YoCZGdg8jPnZ4FJ9H5tQajzuxhFrzLy+nqeqCxQdqEQ=; b=R1D1Ehyyn2B3PLMhUACMRSjyoj4T3ZG6ZbdTm2TlEQ9OUnNwdRSCmFfOLSd4ymidqf6tLm g9yWFWXzpYEMAV/co0kv3SpnZDhhwQG1Zzkfw96h8C79lyOb++53xYdXe0uUypSYs6TQHL PwBOaK3bJs2+98b07CkvF9yxeHz6uiU= X-MC-Unique: w74ShoQVN56wPdMoxHV2lQ-1 From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v3 01/23] multifd: Delete useless operation Date: Wed, 24 Nov 2021 11:05:55 +0100 Message-Id: <20211124100617.19786-2-quintela@redhat.com> In-Reply-To: <20211124100617.19786-1-quintela@redhat.com> References: <20211124100617.19786-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: , Cc: Leonardo Bras , "Dr. David Alan Gilbert" , Peter Xu , Juan Quintela 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: 1637748573362100001 Content-Type: text/plain; charset="utf-8" We are divining by page_size to multiply again in the only use. Once there, impreve the comments. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/multifd-zlib.c | 13 ++++--------- migration/multifd-zstd.c | 13 ++++--------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c index ab4ba75d75..3fc7813b44 100644 --- a/migration/multifd-zlib.c +++ b/migration/multifd-zlib.c @@ -42,7 +42,6 @@ struct zlib_data { */ static int zlib_send_setup(MultiFDSendParams *p, Error **errp) { - uint32_t page_count =3D MULTIFD_PACKET_SIZE / qemu_target_page_size(); struct zlib_data *z =3D g_malloc0(sizeof(struct zlib_data)); z_stream *zs =3D &z->zs; =20 @@ -54,9 +53,8 @@ static int zlib_send_setup(MultiFDSendParams *p, Error **= errp) error_setg(errp, "multifd %d: deflate init failed", p->id); return -1; } - /* We will never have more than page_count pages */ - z->zbuff_len =3D page_count * qemu_target_page_size(); - z->zbuff_len *=3D 2; + /* To be safe, we reserve twice the size of the packet */ + z->zbuff_len =3D MULTIFD_PACKET_SIZE * 2; z->zbuff =3D g_try_malloc(z->zbuff_len); if (!z->zbuff) { deflateEnd(&z->zs); @@ -180,7 +178,6 @@ static int zlib_send_write(MultiFDSendParams *p, uint32= _t used, Error **errp) */ static int zlib_recv_setup(MultiFDRecvParams *p, Error **errp) { - uint32_t page_count =3D MULTIFD_PACKET_SIZE / qemu_target_page_size(); struct zlib_data *z =3D g_malloc0(sizeof(struct zlib_data)); z_stream *zs =3D &z->zs; =20 @@ -194,10 +191,8 @@ static int zlib_recv_setup(MultiFDRecvParams *p, Error= **errp) error_setg(errp, "multifd %d: inflate init failed", p->id); return -1; } - /* We will never have more than page_count pages */ - z->zbuff_len =3D page_count * qemu_target_page_size(); - /* We know compression "could" use more space */ - z->zbuff_len *=3D 2; + /* To be safe, we reserve twice the size of the packet */ + z->zbuff_len =3D MULTIFD_PACKET_SIZE * 2; z->zbuff =3D g_try_malloc(z->zbuff_len); if (!z->zbuff) { inflateEnd(zs); diff --git a/migration/multifd-zstd.c b/migration/multifd-zstd.c index 693bddf8c9..cc3b8869c0 100644 --- a/migration/multifd-zstd.c +++ b/migration/multifd-zstd.c @@ -47,7 +47,6 @@ struct zstd_data { */ static int zstd_send_setup(MultiFDSendParams *p, Error **errp) { - uint32_t page_count =3D MULTIFD_PACKET_SIZE / qemu_target_page_size(); struct zstd_data *z =3D g_new0(struct zstd_data, 1); int res; =20 @@ -67,9 +66,8 @@ static int zstd_send_setup(MultiFDSendParams *p, Error **= errp) p->id, ZSTD_getErrorName(res)); return -1; } - /* We will never have more than page_count pages */ - z->zbuff_len =3D page_count * qemu_target_page_size(); - z->zbuff_len *=3D 2; + /* To be safe, we reserve twice the size of the packet */ + z->zbuff_len =3D MULTIFD_PACKET_SIZE * 2; z->zbuff =3D g_try_malloc(z->zbuff_len); if (!z->zbuff) { ZSTD_freeCStream(z->zcs); @@ -191,7 +189,6 @@ static int zstd_send_write(MultiFDSendParams *p, uint32= _t used, Error **errp) */ static int zstd_recv_setup(MultiFDRecvParams *p, Error **errp) { - uint32_t page_count =3D MULTIFD_PACKET_SIZE / qemu_target_page_size(); struct zstd_data *z =3D g_new0(struct zstd_data, 1); int ret; =20 @@ -212,10 +209,8 @@ static int zstd_recv_setup(MultiFDRecvParams *p, Error= **errp) return -1; } =20 - /* We will never have more than page_count pages */ - z->zbuff_len =3D page_count * qemu_target_page_size(); - /* We know compression "could" use more space */ - z->zbuff_len *=3D 2; + /* To be safe, we reserve twice the size of the packet */ + z->zbuff_len =3D MULTIFD_PACKET_SIZE * 2; z->zbuff =3D g_try_malloc(z->zbuff_len); if (!z->zbuff) { ZSTD_freeDStream(z->zds); --=20 2.33.1 From nobody Fri Apr 26 10:56:37 2024 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 1637748973045249.76329819305602; Wed, 24 Nov 2021 02:16:13 -0800 (PST) Received: from localhost ([::1]:49116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mppJy-0008HR-Si for importer@patchew.org; Wed, 24 Nov 2021 05:16:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41304) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppAd-0007cK-WF for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:06:33 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:31664) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppAZ-0006gI-68 for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:06:30 -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-295-vYzXu_fTM2msa3NYjyYuIQ-1; Wed, 24 Nov 2021 05:06:24 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B9DD583DD20 for ; Wed, 24 Nov 2021 10:06:23 +0000 (UTC) Received: from redhat.mitica.com (unknown [10.39.193.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5318960843; Wed, 24 Nov 2021 10:06:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637748386; 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=HWvUReG9PBYfl0CBgjMfHAgClU2nxHR6oMGRiZua6v4=; b=P8EglN9ivj3MvTrgwBb5bmwb3ESXeQjVai5nLr6srwN9uwWvFRMDT0ECM+SVcDkHfUJUha RIKMnUyt1dsAtafATt7mEygCKcJ6kxO5e9jxZM+NMwg/fKZQ05E5uGnSO3RWcAzDm82ec5 fPLfEbp1DTecjG1kIvWJtvCF2DULu38= X-MC-Unique: vYzXu_fTM2msa3NYjyYuIQ-1 From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v3 02/23] migration: Never call twice qemu_target_page_size() Date: Wed, 24 Nov 2021 11:05:56 +0100 Message-Id: <20211124100617.19786-3-quintela@redhat.com> In-Reply-To: <20211124100617.19786-1-quintela@redhat.com> References: <20211124100617.19786-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: Leonardo Bras , "Dr. David Alan Gilbert" , Peter Xu , Juan Quintela 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: 1637748974871100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/migration.c | 7 ++++--- migration/multifd.c | 7 ++++--- migration/savevm.c | 5 +++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 2c1edb2cb9..3de11ae921 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -996,6 +996,8 @@ static void populate_time_info(MigrationInfo *info, Mig= rationState *s) =20 static void populate_ram_info(MigrationInfo *info, MigrationState *s) { + size_t page_size =3D qemu_target_page_size(); + info->has_ram =3D true; info->ram =3D g_malloc0(sizeof(*info->ram)); info->ram->transferred =3D ram_counters.transferred; @@ -1004,12 +1006,11 @@ static void populate_ram_info(MigrationInfo *info, = MigrationState *s) /* legacy value. It is not used anymore */ info->ram->skipped =3D 0; info->ram->normal =3D ram_counters.normal; - info->ram->normal_bytes =3D ram_counters.normal * - qemu_target_page_size(); + info->ram->normal_bytes =3D ram_counters.normal * page_size; info->ram->mbps =3D s->mbps; info->ram->dirty_sync_count =3D ram_counters.dirty_sync_count; info->ram->postcopy_requests =3D ram_counters.postcopy_requests; - info->ram->page_size =3D qemu_target_page_size(); + info->ram->page_size =3D page_size; info->ram->multifd_bytes =3D ram_counters.multifd_bytes; info->ram->pages_per_second =3D s->pages_per_second; =20 diff --git a/migration/multifd.c b/migration/multifd.c index 7c9deb1921..8125d0015c 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -289,7 +289,8 @@ static void multifd_send_fill_packet(MultiFDSendParams = *p) static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp) { MultiFDPacket_t *packet =3D p->packet; - uint32_t pages_max =3D MULTIFD_PACKET_SIZE / qemu_target_page_size(); + size_t page_size =3D qemu_target_page_size(); + uint32_t pages_max =3D MULTIFD_PACKET_SIZE / page_size; RAMBlock *block; int i; =20 @@ -358,14 +359,14 @@ static int multifd_recv_unfill_packet(MultiFDRecvPara= ms *p, Error **errp) for (i =3D 0; i < p->pages->used; i++) { uint64_t offset =3D be64_to_cpu(packet->offset[i]); =20 - if (offset > (block->used_length - qemu_target_page_size())) { + if (offset > (block->used_length - page_size)) { error_setg(errp, "multifd: offset too long %" PRIu64 " (max " RAM_ADDR_FMT ")", offset, block->used_length); return -1; } p->pages->iov[i].iov_base =3D block->host + offset; - p->pages->iov[i].iov_len =3D qemu_target_page_size(); + p->pages->iov[i].iov_len =3D page_size; } =20 return 0; diff --git a/migration/savevm.c b/migration/savevm.c index d59e976d50..0bef031acb 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1685,6 +1685,7 @@ static int loadvm_postcopy_handle_advise(MigrationInc= omingState *mis, { PostcopyState ps =3D postcopy_state_set(POSTCOPY_INCOMING_ADVISE); uint64_t remote_pagesize_summary, local_pagesize_summary, remote_tps; + size_t page_size =3D qemu_target_page_size(); Error *local_err =3D NULL; =20 trace_loadvm_postcopy_handle_advise(); @@ -1741,13 +1742,13 @@ static int loadvm_postcopy_handle_advise(MigrationI= ncomingState *mis, } =20 remote_tps =3D qemu_get_be64(mis->from_src_file); - if (remote_tps !=3D qemu_target_page_size()) { + if (remote_tps !=3D page_size) { /* * Again, some differences could be dealt with, but for now keep it * simple. */ error_report("Postcopy needs matching target page sizes (s=3D%d d= =3D%zd)", - (int)remote_tps, qemu_target_page_size()); + (int)remote_tps, page_size); return -1; } =20 --=20 2.33.1 From nobody Fri Apr 26 10:56:37 2024 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 1637749499313912.6551847743162; Wed, 24 Nov 2021 02:24:59 -0800 (PST) Received: from localhost ([::1]:43316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mppST-00072b-1s for importer@patchew.org; Wed, 24 Nov 2021 05:24:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppAq-0007hB-9e for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:06:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:45979) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppAb-0006hD-EH for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:06:32 -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-212-iVQ4MlHSOAO0_dV_eAmLbA-1; Wed, 24 Nov 2021 05:06:26 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 73A1881EE60 for ; Wed, 24 Nov 2021 10:06:25 +0000 (UTC) Received: from redhat.mitica.com (unknown [10.39.193.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 242F160843; Wed, 24 Nov 2021 10:06:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637748387; 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=I5yl7RraBVeWxI7Mcwgc7ke4eCRwkzgx0TzpPRkGWrQ=; b=F4jaQejQG+8Y1nTmyGgeAJJE4w0oyolPKNDfSMQAgcW37VuoPgKK0RO5veLM/goZ5jPVjU 7AhZ34pKDW0gjjMhRi0Pf1MOQ4OH+iuDS+yLRqDknvqebN+i8BFzzsbLud4WWsswrs+kDt Dk4Rq0ZMBwhnIYkxQw4Gl5Bg8RUR87A= X-MC-Unique: iVQ4MlHSOAO0_dV_eAmLbA-1 From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v3 03/23] multifd: Rename used field to num Date: Wed, 24 Nov 2021 11:05:57 +0100 Message-Id: <20211124100617.19786-4-quintela@redhat.com> In-Reply-To: <20211124100617.19786-1-quintela@redhat.com> References: <20211124100617.19786-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: , Cc: Leonardo Bras , "Dr. David Alan Gilbert" , Peter Xu , Juan Quintela 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: 1637749500081100001 Content-Type: text/plain; charset="utf-8" We will need to split it later in zero_num (number of zero pages) and normal_num (number of normal pages). This name is better. Signed-off-by: Juan Quintela --- migration/multifd.h | 2 +- migration/multifd.c | 38 +++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/migration/multifd.h b/migration/multifd.h index 15c50ca0b2..86820dd028 100644 --- a/migration/multifd.h +++ b/migration/multifd.h @@ -55,7 +55,7 @@ typedef struct { =20 typedef struct { /* number of used pages */ - uint32_t used; + uint32_t num; /* number of allocated pages */ uint32_t allocated; /* global number of generated multifd packets */ diff --git a/migration/multifd.c b/migration/multifd.c index 8125d0015c..8ea86d81dc 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -252,7 +252,7 @@ static MultiFDPages_t *multifd_pages_init(size_t size) =20 static void multifd_pages_clear(MultiFDPages_t *pages) { - pages->used =3D 0; + pages->num =3D 0; pages->allocated =3D 0; pages->packet_num =3D 0; pages->block =3D NULL; @@ -270,7 +270,7 @@ static void multifd_send_fill_packet(MultiFDSendParams = *p) =20 packet->flags =3D cpu_to_be32(p->flags); packet->pages_alloc =3D cpu_to_be32(p->pages->allocated); - packet->pages_used =3D cpu_to_be32(p->pages->used); + packet->pages_used =3D cpu_to_be32(p->pages->num); packet->next_packet_size =3D cpu_to_be32(p->next_packet_size); packet->packet_num =3D cpu_to_be64(p->packet_num); =20 @@ -278,7 +278,7 @@ static void multifd_send_fill_packet(MultiFDSendParams = *p) strncpy(packet->ramblock, p->pages->block->idstr, 256); } =20 - for (i =3D 0; i < p->pages->used; i++) { + for (i =3D 0; i < p->pages->num; i++) { /* there are architectures where ram_addr_t is 32 bit */ uint64_t temp =3D p->pages->offset[i]; =20 @@ -332,18 +332,18 @@ static int multifd_recv_unfill_packet(MultiFDRecvPara= ms *p, Error **errp) p->pages =3D multifd_pages_init(packet->pages_alloc); } =20 - p->pages->used =3D be32_to_cpu(packet->pages_used); - if (p->pages->used > packet->pages_alloc) { + p->pages->num =3D be32_to_cpu(packet->pages_used); + if (p->pages->num > packet->pages_alloc) { error_setg(errp, "multifd: received packet " "with %d pages and expected maximum pages are %d", - p->pages->used, packet->pages_alloc) ; + p->pages->num, packet->pages_alloc) ; return -1; } =20 p->next_packet_size =3D be32_to_cpu(packet->next_packet_size); p->packet_num =3D be64_to_cpu(packet->packet_num); =20 - if (p->pages->used =3D=3D 0) { + if (p->pages->num =3D=3D 0) { return 0; } =20 @@ -356,7 +356,7 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams= *p, Error **errp) return -1; } =20 - for (i =3D 0; i < p->pages->used; i++) { + for (i =3D 0; i < p->pages->num; i++) { uint64_t offset =3D be64_to_cpu(packet->offset[i]); =20 if (offset > (block->used_length - page_size)) { @@ -443,13 +443,13 @@ static int multifd_send_pages(QEMUFile *f) } qemu_mutex_unlock(&p->mutex); } - assert(!p->pages->used); + assert(!p->pages->num); assert(!p->pages->block); =20 p->packet_num =3D multifd_send_state->packet_num++; multifd_send_state->pages =3D p->pages; p->pages =3D pages; - transferred =3D ((uint64_t) pages->used) * qemu_target_page_size() + transferred =3D ((uint64_t) pages->num) * qemu_target_page_size() + p->packet_len; qemu_file_update_transfer(f, transferred); ram_counters.multifd_bytes +=3D transferred; @@ -469,12 +469,12 @@ int multifd_queue_page(QEMUFile *f, RAMBlock *block, = ram_addr_t offset) } =20 if (pages->block =3D=3D block) { - pages->offset[pages->used] =3D offset; - pages->iov[pages->used].iov_base =3D block->host + offset; - pages->iov[pages->used].iov_len =3D qemu_target_page_size(); - pages->used++; + pages->offset[pages->num] =3D offset; + pages->iov[pages->num].iov_base =3D block->host + offset; + pages->iov[pages->num].iov_len =3D qemu_target_page_size(); + pages->num++; =20 - if (pages->used < pages->allocated) { + if (pages->num < pages->allocated) { return 1; } } @@ -586,7 +586,7 @@ void multifd_send_sync_main(QEMUFile *f) if (!migrate_use_multifd()) { return; } - if (multifd_send_state->pages->used) { + if (multifd_send_state->pages->num) { if (multifd_send_pages(f) < 0) { error_report("%s: multifd_send_pages fail", __func__); return; @@ -649,7 +649,7 @@ static void *multifd_send_thread(void *opaque) qemu_mutex_lock(&p->mutex); =20 if (p->pending_job) { - uint32_t used =3D p->pages->used; + uint32_t used =3D p->pages->num; uint64_t packet_num =3D p->packet_num; flags =3D p->flags; =20 @@ -665,7 +665,7 @@ static void *multifd_send_thread(void *opaque) p->flags =3D 0; p->num_packets++; p->num_pages +=3D used; - p->pages->used =3D 0; + p->pages->num =3D 0; p->pages->block =3D NULL; qemu_mutex_unlock(&p->mutex); =20 @@ -1091,7 +1091,7 @@ static void *multifd_recv_thread(void *opaque) break; } =20 - used =3D p->pages->used; + used =3D p->pages->num; flags =3D p->flags; /* recv methods don't know how to handle the SYNC flag */ p->flags &=3D ~MULTIFD_FLAG_SYNC; --=20 2.33.1 From nobody Fri Apr 26 10:56:37 2024 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 1637749317875394.33806358599975; Wed, 24 Nov 2021 02:21:57 -0800 (PST) Received: from localhost ([::1]:37308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mppPX-0002pg-RU for importer@patchew.org; Wed, 24 Nov 2021 05:21:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41400) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppAq-0007hF-AR for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:06:45 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:42228) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppAc-0006hV-7u for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:06:32 -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-483-tu9JHYPJOgeaslc3hIJmhQ-1; Wed, 24 Nov 2021 05:06:28 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2BECB83DD2D for ; Wed, 24 Nov 2021 10:06:27 +0000 (UTC) Received: from redhat.mitica.com (unknown [10.39.193.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id C985314104; Wed, 24 Nov 2021 10:06:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637748389; 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=iPYxMrCOWugGC2Ig3skogvxaOmXOSxKYsh8Dbjvo4MY=; b=cXn0NFL2VLBUZQYueuKrteEAQC437k487w0UfmTzYvOD0C7e8UvDJd/9nuSYD4KwslFGKb bdQicqaGUJR3iw8Jn+SOn6izenhkff20r3jdt53Oo/BUQzacoJghVchm3GbkWIPD75x7pf Uvlb7l4ZDZ6G/KWj0zRERoa33zGFByc= X-MC-Unique: tu9JHYPJOgeaslc3hIJmhQ-1 From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v3 04/23] multifd: Add missing documention Date: Wed, 24 Nov 2021 11:05:58 +0100 Message-Id: <20211124100617.19786-5-quintela@redhat.com> In-Reply-To: <20211124100617.19786-1-quintela@redhat.com> References: <20211124100617.19786-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: Leonardo Bras , "Dr. David Alan Gilbert" , Peter Xu , Juan Quintela 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: 1637749319053100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Juan Quintela --- migration/multifd-zlib.c | 2 ++ migration/multifd-zstd.c | 2 ++ migration/multifd.c | 1 + 3 files changed, 5 insertions(+) diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c index 3fc7813b44..d0437cce2a 100644 --- a/migration/multifd-zlib.c +++ b/migration/multifd-zlib.c @@ -72,6 +72,7 @@ static int zlib_send_setup(MultiFDSendParams *p, Error **= errp) * Close the channel and return memory. * * @p: Params for the channel that we are using + * @errp: pointer to an error */ static void zlib_send_cleanup(MultiFDSendParams *p, Error **errp) { @@ -94,6 +95,7 @@ static void zlib_send_cleanup(MultiFDSendParams *p, Error= **errp) * * @p: Params for the channel that we are using * @used: number of pages used + * @errp: pointer to an error */ static int zlib_send_prepare(MultiFDSendParams *p, uint32_t used, Error **= errp) { diff --git a/migration/multifd-zstd.c b/migration/multifd-zstd.c index cc3b8869c0..09ae1cf91a 100644 --- a/migration/multifd-zstd.c +++ b/migration/multifd-zstd.c @@ -84,6 +84,7 @@ static int zstd_send_setup(MultiFDSendParams *p, Error **= errp) * Close the channel and return memory. * * @p: Params for the channel that we are using + * @errp: pointer to an error */ static void zstd_send_cleanup(MultiFDSendParams *p, Error **errp) { @@ -107,6 +108,7 @@ static void zstd_send_cleanup(MultiFDSendParams *p, Err= or **errp) * * @p: Params for the channel that we are using * @used: number of pages used + * @errp: pointer to an error */ static int zstd_send_prepare(MultiFDSendParams *p, uint32_t used, Error **= errp) { diff --git a/migration/multifd.c b/migration/multifd.c index 8ea86d81dc..cdeffdc4c5 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -66,6 +66,7 @@ static int nocomp_send_setup(MultiFDSendParams *p, Error = **errp) * For no compression this function does nothing. * * @p: Params for the channel that we are using + * @errp: pointer to an error */ static void nocomp_send_cleanup(MultiFDSendParams *p, Error **errp) { --=20 2.33.1 From nobody Fri Apr 26 10:56:37 2024 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 1637749155056325.45510328660225; Wed, 24 Nov 2021 02:19:15 -0800 (PST) Received: from localhost ([::1]:57402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mppMt-0005d7-LU for importer@patchew.org; Wed, 24 Nov 2021 05:19:12 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41394) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppAq-0007hD-A6 for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:06:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:36579) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppAd-0006he-Cu for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:06:33 -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-491-ApO5ZoeWNxGW_bueeJJAkA-1; Wed, 24 Nov 2021 05:06:29 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DD10F1800D41 for ; Wed, 24 Nov 2021 10:06:28 +0000 (UTC) Received: from redhat.mitica.com (unknown [10.39.193.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 84C0560843; Wed, 24 Nov 2021 10:06:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637748390; 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=4wKjbCKx6KWbCQkGZiOp80kwA296KWgFK4fMiq7yOmg=; b=LogosTj92D7kSDTGI69CJ96juZOFRuJ7HrVte+BU0+0eMrki9Xf3SS0Eg1JpxQE4xaIziT 5ihig/I62b61tCHXVIMxVktWeFfdZ7bB9IziB2GKEFL7cGea6SD+0e8gywAGhL4YUCbUN9 5GoOXeVFvujSrvXGBfxppHmNV9eoFto= X-MC-Unique: ApO5ZoeWNxGW_bueeJJAkA-1 From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v3 05/23] multifd: The variable is only used inside the loop Date: Wed, 24 Nov 2021 11:05:59 +0100 Message-Id: <20211124100617.19786-6-quintela@redhat.com> In-Reply-To: <20211124100617.19786-1-quintela@redhat.com> References: <20211124100617.19786-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: Leonardo Bras , "Dr. David Alan Gilbert" , Peter Xu , Juan Quintela 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: 1637749156133100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Juan Quintela --- migration/multifd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/migration/multifd.c b/migration/multifd.c index cdeffdc4c5..ce7101cf9d 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -629,7 +629,6 @@ static void *multifd_send_thread(void *opaque) MultiFDSendParams *p =3D opaque; Error *local_err =3D NULL; int ret =3D 0; - uint32_t flags =3D 0; =20 trace_multifd_send_thread_start(p->id); rcu_register_thread(); @@ -652,7 +651,7 @@ static void *multifd_send_thread(void *opaque) if (p->pending_job) { uint32_t used =3D p->pages->num; uint64_t packet_num =3D p->packet_num; - flags =3D p->flags; + uint32_t flags =3D p->flags; =20 if (used) { ret =3D multifd_send_state->ops->send_prepare(p, used, --=20 2.33.1 From nobody Fri Apr 26 10:56:37 2024 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 1637748578219194.22312489082185; Wed, 24 Nov 2021 02:09:38 -0800 (PST) Received: from localhost ([::1]:59070 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mppDb-0004DH-S2 for importer@patchew.org; Wed, 24 Nov 2021 05:09:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41428) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppAs-0007hW-BV for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:06:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:51686) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppAk-0006it-L7 for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:06:46 -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-422-IPZHOv4iNXy8sUMC8EPqDg-1; Wed, 24 Nov 2021 05:06:31 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9402B81EE60 for ; Wed, 24 Nov 2021 10:06:30 +0000 (UTC) Received: from redhat.mitica.com (unknown [10.39.193.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3F27D60843; Wed, 24 Nov 2021 10:06:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637748392; 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=n7CRvfZiw1Vp4lgs31TMC0mD4+lnWYLJVkK/uekYKw0=; b=HNjfLTmB+xlSAO3D0KYBRlIZlVWCfg9b5tpnuxEavFnSDClIuCwhasLkq10B1IitkZDDXH hUrY8hHc3FJR7nWKazGvwKV5O39mbtHja0uCXrOHDc7N66lOk7uq7i5KA1i0+uTnv493HU pUf0yfaXSFhZ/pAX73/CDhSJpO3wN2o= X-MC-Unique: IPZHOv4iNXy8sUMC8EPqDg-1 From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v3 06/23] multifd: remove used parameter from send_prepare() method Date: Wed, 24 Nov 2021 11:06:00 +0100 Message-Id: <20211124100617.19786-7-quintela@redhat.com> In-Reply-To: <20211124100617.19786-1-quintela@redhat.com> References: <20211124100617.19786-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: , Cc: Leonardo Bras , "Dr. David Alan Gilbert" , Peter Xu , Juan Quintela 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: 1637748578652100001 Content-Type: text/plain; charset="utf-8" It is already there as p->pages->num. Signed-off-by: Juan Quintela --- migration/multifd.h | 2 +- migration/multifd-zlib.c | 7 +++---- migration/multifd-zstd.c | 7 +++---- migration/multifd.c | 9 +++------ 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/migration/multifd.h b/migration/multifd.h index 86820dd028..7968cc5c20 100644 --- a/migration/multifd.h +++ b/migration/multifd.h @@ -159,7 +159,7 @@ typedef struct { /* Cleanup for sending side */ void (*send_cleanup)(MultiFDSendParams *p, Error **errp); /* Prepare the send packet */ - int (*send_prepare)(MultiFDSendParams *p, uint32_t used, Error **errp); + int (*send_prepare)(MultiFDSendParams *p, Error **errp); /* Write the send packet */ int (*send_write)(MultiFDSendParams *p, uint32_t used, Error **errp); /* Setup for receiving side */ diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c index d0437cce2a..28f0ed933b 100644 --- a/migration/multifd-zlib.c +++ b/migration/multifd-zlib.c @@ -94,10 +94,9 @@ static void zlib_send_cleanup(MultiFDSendParams *p, Erro= r **errp) * Returns 0 for success or -1 for error * * @p: Params for the channel that we are using - * @used: number of pages used * @errp: pointer to an error */ -static int zlib_send_prepare(MultiFDSendParams *p, uint32_t used, Error **= errp) +static int zlib_send_prepare(MultiFDSendParams *p, Error **errp) { struct iovec *iov =3D p->pages->iov; struct zlib_data *z =3D p->data; @@ -106,11 +105,11 @@ static int zlib_send_prepare(MultiFDSendParams *p, ui= nt32_t used, Error **errp) int ret; uint32_t i; =20 - for (i =3D 0; i < used; i++) { + for (i =3D 0; i < p->pages->num; i++) { uint32_t available =3D z->zbuff_len - out_size; int flush =3D Z_NO_FLUSH; =20 - if (i =3D=3D used - 1) { + if (i =3D=3D p->pages->num - 1) { flush =3D Z_SYNC_FLUSH; } =20 diff --git a/migration/multifd-zstd.c b/migration/multifd-zstd.c index 09ae1cf91a..4a71e96e06 100644 --- a/migration/multifd-zstd.c +++ b/migration/multifd-zstd.c @@ -107,10 +107,9 @@ static void zstd_send_cleanup(MultiFDSendParams *p, Er= ror **errp) * Returns 0 for success or -1 for error * * @p: Params for the channel that we are using - * @used: number of pages used * @errp: pointer to an error */ -static int zstd_send_prepare(MultiFDSendParams *p, uint32_t used, Error **= errp) +static int zstd_send_prepare(MultiFDSendParams *p, Error **errp) { struct iovec *iov =3D p->pages->iov; struct zstd_data *z =3D p->data; @@ -121,10 +120,10 @@ static int zstd_send_prepare(MultiFDSendParams *p, ui= nt32_t used, Error **errp) z->out.size =3D z->zbuff_len; z->out.pos =3D 0; =20 - for (i =3D 0; i < used; i++) { + for (i =3D 0; i < p->pages->num; i++) { ZSTD_EndDirective flush =3D ZSTD_e_continue; =20 - if (i =3D=3D used - 1) { + if (i =3D=3D p->pages->num - 1) { flush =3D ZSTD_e_flush; } z->in.src =3D iov[i].iov_base; diff --git a/migration/multifd.c b/migration/multifd.c index ce7101cf9d..098ef8842c 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -82,13 +82,11 @@ static void nocomp_send_cleanup(MultiFDSendParams *p, E= rror **errp) * Returns 0 for success or -1 for error * * @p: Params for the channel that we are using - * @used: number of pages used * @errp: pointer to an error */ -static int nocomp_send_prepare(MultiFDSendParams *p, uint32_t used, - Error **errp) +static int nocomp_send_prepare(MultiFDSendParams *p, Error **errp) { - p->next_packet_size =3D used * qemu_target_page_size(); + p->next_packet_size =3D p->pages->num * qemu_target_page_size(); p->flags |=3D MULTIFD_FLAG_NOCOMP; return 0; } @@ -654,8 +652,7 @@ static void *multifd_send_thread(void *opaque) uint32_t flags =3D p->flags; =20 if (used) { - ret =3D multifd_send_state->ops->send_prepare(p, used, - &local_err); + ret =3D multifd_send_state->ops->send_prepare(p, &local_er= r); if (ret !=3D 0) { qemu_mutex_unlock(&p->mutex); break; --=20 2.33.1 From nobody Fri Apr 26 10:56:37 2024 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 163774895055160.969689731759104; Wed, 24 Nov 2021 02:15:50 -0800 (PST) Received: from localhost ([::1]:47648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mppJc-00079i-3K for importer@patchew.org; Wed, 24 Nov 2021 05:15:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41468) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppAu-0007io-9c for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:06:49 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:50168) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppAq-0006kk-19 for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:06:48 -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-237-vfB2o6ZuMBap6q5IqcwtHg-1; Wed, 24 Nov 2021 05:06:33 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 44F3683DD30 for ; Wed, 24 Nov 2021 10:06:32 +0000 (UTC) Received: from redhat.mitica.com (unknown [10.39.193.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA9E260843; Wed, 24 Nov 2021 10:06:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637748394; 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=MOd9dAT2qviKqXWQGE/2MlmDx/uVBf/xMhIb4W/uK3o=; b=NqOqjXjR1/oEowMSBfDi2lhoaH79aHoMeHUyMsw+yNK79o6Q0kjU+jmRuW5o29oxoTgl74 65h4bsb+BlSYhl4l7F5g3XX6iKYMTzGrqjt/3DlZf02RICOZITePAMnEsc8rr5l67l/uCv Tr97JzzfBCTES8rvdtfPpZQ4TNfWLRU= X-MC-Unique: vfB2o6ZuMBap6q5IqcwtHg-1 From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v3 07/23] multifd: remove used parameter from send_recv_pages() method Date: Wed, 24 Nov 2021 11:06:01 +0100 Message-Id: <20211124100617.19786-8-quintela@redhat.com> In-Reply-To: <20211124100617.19786-1-quintela@redhat.com> References: <20211124100617.19786-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: Leonardo Bras , "Dr. David Alan Gilbert" , Peter Xu , Juan Quintela 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: 1637748952225100002 Content-Type: text/plain; charset="utf-8" It is already there as p->pages->num. Signed-off-by: Juan Quintela --- migration/multifd.h | 2 +- migration/multifd-zlib.c | 9 ++++----- migration/multifd-zstd.c | 7 +++---- migration/multifd.c | 7 +++---- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/migration/multifd.h b/migration/multifd.h index 7968cc5c20..e57adc783b 100644 --- a/migration/multifd.h +++ b/migration/multifd.h @@ -167,7 +167,7 @@ typedef struct { /* Cleanup for receiving side */ void (*recv_cleanup)(MultiFDRecvParams *p); /* Read all pages */ - int (*recv_pages)(MultiFDRecvParams *p, uint32_t used, Error **errp); + int (*recv_pages)(MultiFDRecvParams *p, Error **errp); } MultiFDMethods; =20 void multifd_register_ops(int method, MultiFDMethods *ops); diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c index 28f0ed933b..e85ef8824d 100644 --- a/migration/multifd-zlib.c +++ b/migration/multifd-zlib.c @@ -230,17 +230,16 @@ static void zlib_recv_cleanup(MultiFDRecvParams *p) * Returns 0 for success or -1 for error * * @p: Params for the channel that we are using - * @used: number of pages used * @errp: pointer to an error */ -static int zlib_recv_pages(MultiFDRecvParams *p, uint32_t used, Error **er= rp) +static int zlib_recv_pages(MultiFDRecvParams *p, Error **errp) { struct zlib_data *z =3D p->data; z_stream *zs =3D &z->zs; uint32_t in_size =3D p->next_packet_size; /* we measure the change of total_out */ uint32_t out_size =3D zs->total_out; - uint32_t expected_size =3D used * qemu_target_page_size(); + uint32_t expected_size =3D p->pages->num * qemu_target_page_size(); uint32_t flags =3D p->flags & MULTIFD_FLAG_COMPRESSION_MASK; int ret; int i; @@ -259,12 +258,12 @@ static int zlib_recv_pages(MultiFDRecvParams *p, uint= 32_t used, Error **errp) zs->avail_in =3D in_size; zs->next_in =3D z->zbuff; =20 - for (i =3D 0; i < used; i++) { + for (i =3D 0; i < p->pages->num; i++) { struct iovec *iov =3D &p->pages->iov[i]; int flush =3D Z_NO_FLUSH; unsigned long start =3D zs->total_out; =20 - if (i =3D=3D used - 1) { + if (i =3D=3D p->pages->num - 1) { flush =3D Z_SYNC_FLUSH; } =20 diff --git a/migration/multifd-zstd.c b/migration/multifd-zstd.c index 4a71e96e06..a8b104f4ee 100644 --- a/migration/multifd-zstd.c +++ b/migration/multifd-zstd.c @@ -250,14 +250,13 @@ static void zstd_recv_cleanup(MultiFDRecvParams *p) * Returns 0 for success or -1 for error * * @p: Params for the channel that we are using - * @used: number of pages used * @errp: pointer to an error */ -static int zstd_recv_pages(MultiFDRecvParams *p, uint32_t used, Error **er= rp) +static int zstd_recv_pages(MultiFDRecvParams *p, Error **errp) { uint32_t in_size =3D p->next_packet_size; uint32_t out_size =3D 0; - uint32_t expected_size =3D used * qemu_target_page_size(); + uint32_t expected_size =3D p->pages->num * qemu_target_page_size(); uint32_t flags =3D p->flags & MULTIFD_FLAG_COMPRESSION_MASK; struct zstd_data *z =3D p->data; int ret; @@ -278,7 +277,7 @@ static int zstd_recv_pages(MultiFDRecvParams *p, uint32= _t used, Error **errp) z->in.size =3D in_size; z->in.pos =3D 0; =20 - for (i =3D 0; i < used; i++) { + for (i =3D 0; i < p->pages->num; i++) { struct iovec *iov =3D &p->pages->iov[i]; =20 z->out.dst =3D iov->iov_base; diff --git a/migration/multifd.c b/migration/multifd.c index 098ef8842c..55d99a8232 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -141,10 +141,9 @@ static void nocomp_recv_cleanup(MultiFDRecvParams *p) * Returns 0 for success or -1 for error * * @p: Params for the channel that we are using - * @used: number of pages used * @errp: pointer to an error */ -static int nocomp_recv_pages(MultiFDRecvParams *p, uint32_t used, Error **= errp) +static int nocomp_recv_pages(MultiFDRecvParams *p, Error **errp) { uint32_t flags =3D p->flags & MULTIFD_FLAG_COMPRESSION_MASK; =20 @@ -153,7 +152,7 @@ static int nocomp_recv_pages(MultiFDRecvParams *p, uint= 32_t used, Error **errp) p->id, flags, MULTIFD_FLAG_NOCOMP); return -1; } - return qio_channel_readv_all(p->c, p->pages->iov, used, errp); + return qio_channel_readv_all(p->c, p->pages->iov, p->pages->num, errp); } =20 static MultiFDMethods multifd_nocomp_ops =3D { @@ -1099,7 +1098,7 @@ static void *multifd_recv_thread(void *opaque) qemu_mutex_unlock(&p->mutex); =20 if (used) { - ret =3D multifd_recv_state->ops->recv_pages(p, used, &local_er= r); + ret =3D multifd_recv_state->ops->recv_pages(p, &local_err); if (ret !=3D 0) { break; } --=20 2.33.1 From nobody Fri Apr 26 10:56:37 2024 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 1637748807296776.4846812794427; Wed, 24 Nov 2021 02:13:27 -0800 (PST) Received: from localhost ([::1]:42184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mppHI-0003R0-SV for importer@patchew.org; Wed, 24 Nov 2021 05:13:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41470) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppAu-0007ip-CJ for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:06:49 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:59066) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppAq-0006lT-0r for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:06:48 -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-492-dhEseoDuOwC9bcn5KOXWpA-1; Wed, 24 Nov 2021 05:06:34 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EA8A51006AA1 for ; Wed, 24 Nov 2021 10:06:33 +0000 (UTC) Received: from redhat.mitica.com (unknown [10.39.193.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9BE5114104; Wed, 24 Nov 2021 10:06:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637748395; 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=UNFcFs+Y30M5WFnFRQOUK5vwTxuvNJYNEc1+Ka4Kfmg=; b=QEUe2eHlJRu+KVGWTKhTq04Rza4Hri4QBFMlQ9I1gvyt7VAmQXmMTc9V0i1cQsp0rqSB21 ABkLtqnQAMwURirb7VjN6K+bAdO3/VJb/Y4nBVDMuJUpqck+q/rXxkznprv32B5M4bfjRu wywL/mgU34KNQoKHAPNzcROxxryN/1s= X-MC-Unique: dhEseoDuOwC9bcn5KOXWpA-1 From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v3 08/23] multifd: Fill offset and block for reception Date: Wed, 24 Nov 2021 11:06:02 +0100 Message-Id: <20211124100617.19786-9-quintela@redhat.com> In-Reply-To: <20211124100617.19786-1-quintela@redhat.com> References: <20211124100617.19786-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: , Cc: Leonardo Bras , "Dr. David Alan Gilbert" , Peter Xu , Juan Quintela 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: 1637748808006100001 Content-Type: text/plain; charset="utf-8" We were using the iov directly, but we will need this info on the following patch. Signed-off-by: Juan Quintela --- migration/multifd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/migration/multifd.c b/migration/multifd.c index 55d99a8232..0533da154a 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -354,6 +354,7 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams= *p, Error **errp) return -1; } =20 + p->pages->block =3D block; for (i =3D 0; i < p->pages->num; i++) { uint64_t offset =3D be64_to_cpu(packet->offset[i]); =20 @@ -363,6 +364,7 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams= *p, Error **errp) offset, block->used_length); return -1; } + p->pages->offset[i] =3D offset; p->pages->iov[i].iov_base =3D block->host + offset; p->pages->iov[i].iov_len =3D page_size; } --=20 2.33.1 From nobody Fri Apr 26 10:56:37 2024 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 1637748768955474.6572498691852; Wed, 24 Nov 2021 02:12:48 -0800 (PST) Received: from localhost ([::1]:39088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mppGg-0001NA-SL for importer@patchew.org; Wed, 24 Nov 2021 05:12:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41464) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppAu-0007iT-3C for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:06:49 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:29420) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppAn-0006mJ-Aq for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:06:47 -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-350-EvbiIp0vMx2-2il3ShUnjg-1; Wed, 24 Nov 2021 05:06:36 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A076581EE61 for ; Wed, 24 Nov 2021 10:06:35 +0000 (UTC) Received: from redhat.mitica.com (unknown [10.39.193.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D3EA60843; Wed, 24 Nov 2021 10:06:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637748397; 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=JCdDh3ludzQAxMfzS4ktrQ1Cbf8eu31L+AmHakZVN3Q=; b=JDzbVUI6ZbxBKb2qTWV+1h40w6yAB6vEsDE0RILGfnahNBg+fGGud0S1NQzQEGeFQUX0qg PswfcD3dUK3GbtxBlr5dYP2FB8W1ZJWe6V6vrHY7Cepbw9jMH5IKjLFNvaDHU5WQiin3FE 89zm6s4GLqlt/EA/MTrDW93NsV5KDa0= X-MC-Unique: EvbiIp0vMx2-2il3ShUnjg-1 From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v3 09/23] multifd: Make zstd compression method not use iovs Date: Wed, 24 Nov 2021 11:06:03 +0100 Message-Id: <20211124100617.19786-10-quintela@redhat.com> In-Reply-To: <20211124100617.19786-1-quintela@redhat.com> References: <20211124100617.19786-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: , Cc: Leonardo Bras , "Dr. David Alan Gilbert" , Peter Xu , Juan Quintela 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: 1637748769602100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/multifd-zstd.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/migration/multifd-zstd.c b/migration/multifd-zstd.c index a8b104f4ee..2d5b61106c 100644 --- a/migration/multifd-zstd.c +++ b/migration/multifd-zstd.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include #include "qemu/rcu.h" +#include "exec/ramblock.h" #include "exec/target_page.h" #include "qapi/error.h" #include "migration.h" @@ -111,8 +112,8 @@ static void zstd_send_cleanup(MultiFDSendParams *p, Err= or **errp) */ static int zstd_send_prepare(MultiFDSendParams *p, Error **errp) { - struct iovec *iov =3D p->pages->iov; struct zstd_data *z =3D p->data; + size_t page_size =3D qemu_target_page_size(); int ret; uint32_t i; =20 @@ -126,8 +127,8 @@ static int zstd_send_prepare(MultiFDSendParams *p, Erro= r **errp) if (i =3D=3D p->pages->num - 1) { flush =3D ZSTD_e_flush; } - z->in.src =3D iov[i].iov_base; - z->in.size =3D iov[i].iov_len; + z->in.src =3D p->pages->block->host + p->pages->offset[i]; + z->in.size =3D page_size; z->in.pos =3D 0; =20 /* @@ -256,7 +257,8 @@ static int zstd_recv_pages(MultiFDRecvParams *p, Error = **errp) { uint32_t in_size =3D p->next_packet_size; uint32_t out_size =3D 0; - uint32_t expected_size =3D p->pages->num * qemu_target_page_size(); + size_t page_size =3D qemu_target_page_size(); + uint32_t expected_size =3D p->pages->num * page_size; uint32_t flags =3D p->flags & MULTIFD_FLAG_COMPRESSION_MASK; struct zstd_data *z =3D p->data; int ret; @@ -278,10 +280,8 @@ static int zstd_recv_pages(MultiFDRecvParams *p, Error= **errp) z->in.pos =3D 0; =20 for (i =3D 0; i < p->pages->num; i++) { - struct iovec *iov =3D &p->pages->iov[i]; - - z->out.dst =3D iov->iov_base; - z->out.size =3D iov->iov_len; + z->out.dst =3D p->pages->block->host + p->pages->offset[i]; + z->out.size =3D page_size; z->out.pos =3D 0; =20 /* @@ -295,8 +295,8 @@ static int zstd_recv_pages(MultiFDRecvParams *p, Error = **errp) do { ret =3D ZSTD_decompressStream(z->zds, &z->out, &z->in); } while (ret > 0 && (z->in.size - z->in.pos > 0) - && (z->out.pos < iov->iov_len)); - if (ret > 0 && (z->out.pos < iov->iov_len)) { + && (z->out.pos < page_size)); + if (ret > 0 && (z->out.pos < page_size)) { error_setg(errp, "multifd %d: decompressStream buffer too smal= l", p->id); return -1; --=20 2.33.1 From nobody Fri Apr 26 10:56:37 2024 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 1637749711442186.58282400010364; Wed, 24 Nov 2021 02:28:31 -0800 (PST) Received: from localhost ([::1]:49394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mppVt-0002yc-EB for importer@patchew.org; Wed, 24 Nov 2021 05:28:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41466) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppAu-0007im-6y for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:06:49 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:52193) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppAq-0006nV-3k for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:06:47 -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-119-DeldSa_qOTqa3KDQYx8nbQ-1; Wed, 24 Nov 2021 05:06:38 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5E3691006AA5 for ; Wed, 24 Nov 2021 10:06:37 +0000 (UTC) Received: from redhat.mitica.com (unknown [10.39.193.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0542160843; Wed, 24 Nov 2021 10:06:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637748399; 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=OOPs/N6btQ9utuN8+Y/Y/kSvzMd2iTMlpcachHpy1kQ=; b=jVSU2Uyjwf4Of9o7gXiv7DdR9DZ1BSd71R+VmjKfXEMcIfrnppHKe6uL/kSjVp2PTUrYfI +3+eIvZfQtLstuwTQtKVJDC/tCu6OBBsKDjBDQ8+67uZxnY5UMy3b8WwHCnJ4OLV2lOR7Q jzvlQ3dYvoJbAm6c/+6ATjPkA9whl9U= X-MC-Unique: DeldSa_qOTqa3KDQYx8nbQ-1 From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v3 10/23] multifd: Make zlib compression method not use iovs Date: Wed, 24 Nov 2021 11:06:04 +0100 Message-Id: <20211124100617.19786-11-quintela@redhat.com> In-Reply-To: <20211124100617.19786-1-quintela@redhat.com> References: <20211124100617.19786-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: Leonardo Bras , "Dr. David Alan Gilbert" , Peter Xu , Juan Quintela 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: 1637749715300100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/multifd-zlib.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c index e85ef8824d..da6201704c 100644 --- a/migration/multifd-zlib.c +++ b/migration/multifd-zlib.c @@ -13,6 +13,7 @@ #include "qemu/osdep.h" #include #include "qemu/rcu.h" +#include "exec/ramblock.h" #include "exec/target_page.h" #include "qapi/error.h" #include "migration.h" @@ -98,8 +99,8 @@ static void zlib_send_cleanup(MultiFDSendParams *p, Error= **errp) */ static int zlib_send_prepare(MultiFDSendParams *p, Error **errp) { - struct iovec *iov =3D p->pages->iov; struct zlib_data *z =3D p->data; + size_t page_size =3D qemu_target_page_size(); z_stream *zs =3D &z->zs; uint32_t out_size =3D 0; int ret; @@ -113,8 +114,8 @@ static int zlib_send_prepare(MultiFDSendParams *p, Erro= r **errp) flush =3D Z_SYNC_FLUSH; } =20 - zs->avail_in =3D iov[i].iov_len; - zs->next_in =3D iov[i].iov_base; + zs->avail_in =3D page_size; + zs->next_in =3D p->pages->block->host + p->pages->offset[i]; =20 zs->avail_out =3D available; zs->next_out =3D z->zbuff + out_size; @@ -235,6 +236,7 @@ static void zlib_recv_cleanup(MultiFDRecvParams *p) static int zlib_recv_pages(MultiFDRecvParams *p, Error **errp) { struct zlib_data *z =3D p->data; + size_t page_size =3D qemu_target_page_size(); z_stream *zs =3D &z->zs; uint32_t in_size =3D p->next_packet_size; /* we measure the change of total_out */ @@ -259,7 +261,6 @@ static int zlib_recv_pages(MultiFDRecvParams *p, Error = **errp) zs->next_in =3D z->zbuff; =20 for (i =3D 0; i < p->pages->num; i++) { - struct iovec *iov =3D &p->pages->iov[i]; int flush =3D Z_NO_FLUSH; unsigned long start =3D zs->total_out; =20 @@ -267,8 +268,8 @@ static int zlib_recv_pages(MultiFDRecvParams *p, Error = **errp) flush =3D Z_SYNC_FLUSH; } =20 - zs->avail_out =3D iov->iov_len; - zs->next_out =3D iov->iov_base; + zs->avail_out =3D page_size; + zs->next_out =3D p->pages->block->host + p->pages->offset[i]; =20 /* * Welcome to inflate semantics @@ -281,8 +282,8 @@ static int zlib_recv_pages(MultiFDRecvParams *p, Error = **errp) do { ret =3D inflate(zs, flush); } while (ret =3D=3D Z_OK && zs->avail_in - && (zs->total_out - start) < iov->iov_len); - if (ret =3D=3D Z_OK && (zs->total_out - start) < iov->iov_len) { + && (zs->total_out - start) < page_size); + if (ret =3D=3D Z_OK && (zs->total_out - start) < page_size) { error_setg(errp, "multifd %d: inflate generated too few output= ", p->id); return -1; --=20 2.33.1 From nobody Fri Apr 26 10:56:37 2024 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 163774877025620.95161521530042; Wed, 24 Nov 2021 02:12:50 -0800 (PST) Received: from localhost ([::1]:39244 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mppGh-0001Ug-TZ for importer@patchew.org; Wed, 24 Nov 2021 05:12:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41548) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppB3-0007tY-Il for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:06:57 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:60579) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppB1-0006qY-Cd for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:06:57 -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-392-5SF8FXPENwKgsJ9HDhi7ZQ-1; Wed, 24 Nov 2021 05:06:53 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1672183DD20 for ; Wed, 24 Nov 2021 10:06:53 +0000 (UTC) Received: from redhat.mitica.com (unknown [10.39.193.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id B36C060843; Wed, 24 Nov 2021 10:06:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637748414; 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=znJh4Fm0vRykGF819Wl7cMgFSEmqStKYvWRlP5dHCjc=; b=CojoQzjR0Nj1fvYlf7ix+GbYtEe1E58HqviQ/RijEQnW7mUg2JJrFBqxsGMMWjxoDI7ZNO r46W3zeiQO2rkS5s8LmQFV5qJAwMY6LKhuM3z6we1tBBiZXrj1Jta+OE1ZApcjrsz5tatq BXBmVEhj17nHtIq7KeVF2QcanpW36bM= X-MC-Unique: 5SF8FXPENwKgsJ9HDhi7ZQ-1 From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v3 11/23] multifd: Move iov from pages to params Date: Wed, 24 Nov 2021 11:06:05 +0100 Message-Id: <20211124100617.19786-12-quintela@redhat.com> In-Reply-To: <20211124100617.19786-1-quintela@redhat.com> References: <20211124100617.19786-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: , Cc: Leonardo Bras , "Dr. David Alan Gilbert" , Peter Xu , Juan Quintela 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: 1637748771708100001 Content-Type: text/plain; charset="utf-8" This will allow us to reduce the number of system calls on the next patch. Signed-off-by: Juan Quintela --- migration/multifd.h | 8 ++++++-- migration/multifd.c | 34 ++++++++++++++++++++++++---------- 2 files changed, 30 insertions(+), 12 deletions(-) diff --git a/migration/multifd.h b/migration/multifd.h index e57adc783b..c3f18af364 100644 --- a/migration/multifd.h +++ b/migration/multifd.h @@ -62,8 +62,6 @@ typedef struct { uint64_t packet_num; /* offset of each page */ ram_addr_t *offset; - /* pointer to each page */ - struct iovec *iov; RAMBlock *block; } MultiFDPages_t; =20 @@ -110,6 +108,10 @@ typedef struct { uint64_t num_pages; /* syncs main thread and channels */ QemuSemaphore sem_sync; + /* buffers to send */ + struct iovec *iov; + /* number of iovs used */ + uint32_t iovs_num; /* used for compression methods */ void *data; } MultiFDSendParams; @@ -149,6 +151,8 @@ typedef struct { uint64_t num_pages; /* syncs main thread and channels */ QemuSemaphore sem_sync; + /* buffers to recv */ + struct iovec *iov; /* used for de-compression methods */ void *data; } MultiFDRecvParams; diff --git a/migration/multifd.c b/migration/multifd.c index 0533da154a..37487fd01c 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -86,7 +86,16 @@ static void nocomp_send_cleanup(MultiFDSendParams *p, Er= ror **errp) */ static int nocomp_send_prepare(MultiFDSendParams *p, Error **errp) { - p->next_packet_size =3D p->pages->num * qemu_target_page_size(); + MultiFDPages_t *pages =3D p->pages; + size_t page_size =3D qemu_target_page_size(); + + for (int i =3D 0; i < p->pages->num; i++) { + p->iov[p->iovs_num].iov_base =3D pages->block->host + pages->offse= t[i]; + p->iov[p->iovs_num].iov_len =3D page_size; + p->iovs_num++; + } + + p->next_packet_size =3D p->pages->num * page_size; p->flags |=3D MULTIFD_FLAG_NOCOMP; return 0; } @@ -104,7 +113,7 @@ static int nocomp_send_prepare(MultiFDSendParams *p, Er= ror **errp) */ static int nocomp_send_write(MultiFDSendParams *p, uint32_t used, Error **= errp) { - return qio_channel_writev_all(p->c, p->pages->iov, used, errp); + return qio_channel_writev_all(p->c, p->iov, p->iovs_num, errp); } =20 /** @@ -146,13 +155,18 @@ static void nocomp_recv_cleanup(MultiFDRecvParams *p) static int nocomp_recv_pages(MultiFDRecvParams *p, Error **errp) { uint32_t flags =3D p->flags & MULTIFD_FLAG_COMPRESSION_MASK; + size_t page_size =3D qemu_target_page_size(); =20 if (flags !=3D MULTIFD_FLAG_NOCOMP) { error_setg(errp, "multifd %d: flags received %x flags expected %x", p->id, flags, MULTIFD_FLAG_NOCOMP); return -1; } - return qio_channel_readv_all(p->c, p->pages->iov, p->pages->num, errp); + for (int i =3D 0; i < p->pages->num; i++) { + p->iov[i].iov_base =3D p->pages->block->host + p->pages->offset[i]; + p->iov[i].iov_len =3D page_size; + } + return qio_channel_readv_all(p->c, p->iov, p->pages->num, errp); } =20 static MultiFDMethods multifd_nocomp_ops =3D { @@ -242,7 +256,6 @@ static MultiFDPages_t *multifd_pages_init(size_t size) MultiFDPages_t *pages =3D g_new0(MultiFDPages_t, 1); =20 pages->allocated =3D size; - pages->iov =3D g_new0(struct iovec, size); pages->offset =3D g_new0(ram_addr_t, size); =20 return pages; @@ -254,8 +267,6 @@ static void multifd_pages_clear(MultiFDPages_t *pages) pages->allocated =3D 0; pages->packet_num =3D 0; pages->block =3D NULL; - g_free(pages->iov); - pages->iov =3D NULL; g_free(pages->offset); pages->offset =3D NULL; g_free(pages); @@ -365,8 +376,6 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams= *p, Error **errp) return -1; } p->pages->offset[i] =3D offset; - p->pages->iov[i].iov_base =3D block->host + offset; - p->pages->iov[i].iov_len =3D page_size; } =20 return 0; @@ -470,8 +479,6 @@ int multifd_queue_page(QEMUFile *f, RAMBlock *block, ra= m_addr_t offset) =20 if (pages->block =3D=3D block) { pages->offset[pages->num] =3D offset; - pages->iov[pages->num].iov_base =3D block->host + offset; - pages->iov[pages->num].iov_len =3D qemu_target_page_size(); pages->num++; =20 if (pages->num < pages->allocated) { @@ -564,6 +571,8 @@ void multifd_save_cleanup(void) p->packet_len =3D 0; g_free(p->packet); p->packet =3D NULL; + g_free(p->iov); + p->iov =3D NULL; multifd_send_state->ops->send_cleanup(p, &local_err); if (local_err) { migrate_set_error(migrate_get_current(), local_err); @@ -651,6 +660,7 @@ static void *multifd_send_thread(void *opaque) uint32_t used =3D p->pages->num; uint64_t packet_num =3D p->packet_num; uint32_t flags =3D p->flags; + p->iovs_num =3D 0; =20 if (used) { ret =3D multifd_send_state->ops->send_prepare(p, &local_er= r); @@ -919,6 +929,7 @@ int multifd_save_setup(Error **errp) p->packet->version =3D cpu_to_be32(MULTIFD_VERSION); p->name =3D g_strdup_printf("multifdsend_%d", i); p->tls_hostname =3D g_strdup(s->hostname); + p->iov =3D g_new0(struct iovec, page_count); socket_send_channel_create(multifd_new_send_channel_async, p); } =20 @@ -1018,6 +1029,8 @@ int multifd_load_cleanup(Error **errp) p->packet_len =3D 0; g_free(p->packet); p->packet =3D NULL; + g_free(p->iov); + p->iov =3D NULL; multifd_recv_state->ops->recv_cleanup(p); } qemu_sem_destroy(&multifd_recv_state->sem_sync); @@ -1158,6 +1171,7 @@ int multifd_load_setup(Error **errp) + sizeof(uint64_t) * page_count; p->packet =3D g_malloc0(p->packet_len); p->name =3D g_strdup_printf("multifdrecv_%d", i); + p->iov =3D g_new0(struct iovec, page_count); } =20 for (i =3D 0; i < thread_count; i++) { --=20 2.33.1 From nobody Fri Apr 26 10:56:37 2024 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 1637748990213669.8833918383665; Wed, 24 Nov 2021 02:16:30 -0800 (PST) Received: from localhost ([::1]:50498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mppKG-0000nA-26 for importer@patchew.org; Wed, 24 Nov 2021 05:16:28 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41556) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppB4-0007zj-Td for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:06:58 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:33465) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppB3-0006qx-43 for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:06:58 -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-21-HvmJiSRoP7uvnF0kLh33UQ-1; Wed, 24 Nov 2021 05:06:55 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B53699F92B for ; Wed, 24 Nov 2021 10:06:54 +0000 (UTC) Received: from redhat.mitica.com (unknown [10.39.193.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6B9D560843; Wed, 24 Nov 2021 10:06:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637748416; 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=ulUQI87aAwgZRgREGrNbA238jZyNy23cNrEDcHJPeEo=; b=d+tvQrUxhE2lKKqv8mSKnh07hhWUOL/cxlTqCsg3p7AF2YDYRBBqPbHp5W6I7TwTJN8Kdu yR88et99VWYRScERv+4fIyMiTft/4rmZ0PvZowfaN0cDpLanh/z+b9HiiaQOdiZNb+3O13 QqrMmW/PSnakswd8Tq8mYqdIoc7EmgY= X-MC-Unique: HvmJiSRoP7uvnF0kLh33UQ-1 From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v3 12/23] multifd: Make zlib use iov's Date: Wed, 24 Nov 2021 11:06:06 +0100 Message-Id: <20211124100617.19786-13-quintela@redhat.com> In-Reply-To: <20211124100617.19786-1-quintela@redhat.com> References: <20211124100617.19786-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: Leonardo Bras , "Dr. David Alan Gilbert" , Peter Xu , Juan Quintela 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: 1637748991724100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/multifd-zlib.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c index da6201704c..478a4af115 100644 --- a/migration/multifd-zlib.c +++ b/migration/multifd-zlib.c @@ -143,6 +143,9 @@ static int zlib_send_prepare(MultiFDSendParams *p, Erro= r **errp) } out_size +=3D available - zs->avail_out; } + p->iov[p->iovs_num].iov_base =3D z->zbuff; + p->iov[p->iovs_num].iov_len =3D out_size; + p->iovs_num++; p->next_packet_size =3D out_size; p->flags |=3D MULTIFD_FLAG_ZLIB; =20 @@ -162,10 +165,7 @@ static int zlib_send_prepare(MultiFDSendParams *p, Err= or **errp) */ static int zlib_send_write(MultiFDSendParams *p, uint32_t used, Error **er= rp) { - struct zlib_data *z =3D p->data; - - return qio_channel_write_all(p->c, (void *)z->zbuff, p->next_packet_si= ze, - errp); + return qio_channel_writev_all(p->c, p->iov, p->iovs_num, errp); } =20 /** --=20 2.33.1 From nobody Fri Apr 26 10:56:37 2024 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 1637749107717349.47055818610977; Wed, 24 Nov 2021 02:18:27 -0800 (PST) Received: from localhost ([::1]:55888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mppM9-0004bf-Mu for importer@patchew.org; Wed, 24 Nov 2021 05:18:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41664) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppBR-0000T5-BA for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:07:21 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:23213) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppBP-0006sb-5s for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:07:21 -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-186-SVnf71zMOXepzkjXwxbBaA-1; Wed, 24 Nov 2021 05:07:17 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E92899F92C for ; Wed, 24 Nov 2021 10:07:16 +0000 (UTC) Received: from redhat.mitica.com (unknown [10.39.193.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 17F1260843; Wed, 24 Nov 2021 10:06:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637748438; 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=FHo1ecYwtwo0REW0mCQmZS/6gX+5pwE/7n1NlC57ldY=; b=UmQK31ryRoWBOwiePvpsRV/quUCIQpNn1Uqi8EC8nBopaYjgc3jRtYqC4rSLC/n4WHQtod J9IJMXDob59LZRrM9Q5kxt0ZzjusqEu+Ww3ZYrkL+P9SJc4PEnVvhWFaCAF3uBu9Gxpfo/ sfGmRjp3NwXR50R4EroFQyfW2nkbchY= X-MC-Unique: SVnf71zMOXepzkjXwxbBaA-1 From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v3 13/23] multifd: Make zstd use iov's Date: Wed, 24 Nov 2021 11:06:07 +0100 Message-Id: <20211124100617.19786-14-quintela@redhat.com> In-Reply-To: <20211124100617.19786-1-quintela@redhat.com> References: <20211124100617.19786-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: , Cc: Leonardo Bras , "Dr. David Alan Gilbert" , Peter Xu , Juan Quintela 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: 1637749109698100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/multifd-zstd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/migration/multifd-zstd.c b/migration/multifd-zstd.c index 2d5b61106c..259277dc42 100644 --- a/migration/multifd-zstd.c +++ b/migration/multifd-zstd.c @@ -154,6 +154,9 @@ static int zstd_send_prepare(MultiFDSendParams *p, Erro= r **errp) return -1; } } + p->iov[p->iovs_num].iov_base =3D z->zbuff; + p->iov[p->iovs_num].iov_len =3D z->out.pos; + p->iovs_num++; p->next_packet_size =3D z->out.pos; p->flags |=3D MULTIFD_FLAG_ZSTD; =20 @@ -173,10 +176,7 @@ static int zstd_send_prepare(MultiFDSendParams *p, Err= or **errp) */ static int zstd_send_write(MultiFDSendParams *p, uint32_t used, Error **er= rp) { - struct zstd_data *z =3D p->data; - - return qio_channel_write_all(p->c, (void *)z->zbuff, p->next_packet_si= ze, - errp); + return qio_channel_writev_all(p->c, p->iov, p->iovs_num, errp); } =20 /** --=20 2.33.1 From nobody Fri Apr 26 10:56:37 2024 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 1637749481207218.9330980763865; Wed, 24 Nov 2021 02:24:41 -0800 (PST) Received: from localhost ([::1]:42324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mppSA-0006LT-QG for importer@patchew.org; Wed, 24 Nov 2021 05:24:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41972) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppBp-0001HI-3n for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:07:45 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:46209) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppBY-0006vT-Oj for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:07:43 -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-85-wETiwxxhP-yenNdv137-uA-1; Wed, 24 Nov 2021 05:07:27 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2FEAB1800D41 for ; Wed, 24 Nov 2021 10:07:26 +0000 (UTC) Received: from redhat.mitica.com (unknown [10.39.193.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A9D660843; Wed, 24 Nov 2021 10:07:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637748448; 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=ffZrQjVgGHNgunaflrengDVoG/ghaT4oQPjHYo/PfYo=; b=DBxZO6Tu9bgFb2t7P72ffmMcoWjKtCVdVzmujC0Cj08wdNiTyVHAiGZhY+Tu+MLUicAh2u ITYXFtcac+GAMxKfkKQTUApjDP+4HCOVtECAFz852OfzIqRNgHiqEX2xRuWLorhsfecFDm EUaC8WROz8ulTJaxc9UeoQNxQ6/Mwn8= X-MC-Unique: wETiwxxhP-yenNdv137-uA-1 From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v3 14/23] multifd: Remove send_write() method Date: Wed, 24 Nov 2021 11:06:08 +0100 Message-Id: <20211124100617.19786-15-quintela@redhat.com> In-Reply-To: <20211124100617.19786-1-quintela@redhat.com> References: <20211124100617.19786-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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: , Cc: Leonardo Bras , "Dr. David Alan Gilbert" , Peter Xu , Juan Quintela 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: 1637749482842100001 Content-Type: text/plain; charset="utf-8" Everything use now iov's. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/multifd.h | 2 -- migration/multifd-zlib.c | 17 ----------------- migration/multifd-zstd.c | 17 ----------------- migration/multifd.c | 20 ++------------------ 4 files changed, 2 insertions(+), 54 deletions(-) diff --git a/migration/multifd.h b/migration/multifd.h index c3f18af364..7496f951a7 100644 --- a/migration/multifd.h +++ b/migration/multifd.h @@ -164,8 +164,6 @@ typedef struct { void (*send_cleanup)(MultiFDSendParams *p, Error **errp); /* Prepare the send packet */ int (*send_prepare)(MultiFDSendParams *p, Error **errp); - /* Write the send packet */ - int (*send_write)(MultiFDSendParams *p, uint32_t used, Error **errp); /* Setup for receiving side */ int (*recv_setup)(MultiFDRecvParams *p, Error **errp); /* Cleanup for receiving side */ diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c index 478a4af115..f65159392a 100644 --- a/migration/multifd-zlib.c +++ b/migration/multifd-zlib.c @@ -152,22 +152,6 @@ static int zlib_send_prepare(MultiFDSendParams *p, Err= or **errp) return 0; } =20 -/** - * zlib_send_write: do the actual write of the data - * - * Do the actual write of the comprresed buffer. - * - * Returns 0 for success or -1 for error - * - * @p: Params for the channel that we are using - * @used: number of pages used - * @errp: pointer to an error - */ -static int zlib_send_write(MultiFDSendParams *p, uint32_t used, Error **er= rp) -{ - return qio_channel_writev_all(p->c, p->iov, p->iovs_num, errp); -} - /** * zlib_recv_setup: setup receive side * @@ -307,7 +291,6 @@ static MultiFDMethods multifd_zlib_ops =3D { .send_setup =3D zlib_send_setup, .send_cleanup =3D zlib_send_cleanup, .send_prepare =3D zlib_send_prepare, - .send_write =3D zlib_send_write, .recv_setup =3D zlib_recv_setup, .recv_cleanup =3D zlib_recv_cleanup, .recv_pages =3D zlib_recv_pages diff --git a/migration/multifd-zstd.c b/migration/multifd-zstd.c index 259277dc42..6933ba622a 100644 --- a/migration/multifd-zstd.c +++ b/migration/multifd-zstd.c @@ -163,22 +163,6 @@ static int zstd_send_prepare(MultiFDSendParams *p, Err= or **errp) return 0; } =20 -/** - * zstd_send_write: do the actual write of the data - * - * Do the actual write of the comprresed buffer. - * - * Returns 0 for success or -1 for error - * - * @p: Params for the channel that we are using - * @used: number of pages used - * @errp: pointer to an error - */ -static int zstd_send_write(MultiFDSendParams *p, uint32_t used, Error **er= rp) -{ - return qio_channel_writev_all(p->c, p->iov, p->iovs_num, errp); -} - /** * zstd_recv_setup: setup receive side * @@ -320,7 +304,6 @@ static MultiFDMethods multifd_zstd_ops =3D { .send_setup =3D zstd_send_setup, .send_cleanup =3D zstd_send_cleanup, .send_prepare =3D zstd_send_prepare, - .send_write =3D zstd_send_write, .recv_setup =3D zstd_recv_setup, .recv_cleanup =3D zstd_recv_cleanup, .recv_pages =3D zstd_recv_pages diff --git a/migration/multifd.c b/migration/multifd.c index 37487fd01c..71bdef068e 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -100,22 +100,6 @@ static int nocomp_send_prepare(MultiFDSendParams *p, E= rror **errp) return 0; } =20 -/** - * nocomp_send_write: do the actual write of the data - * - * For no compression we just have to write the data. - * - * Returns 0 for success or -1 for error - * - * @p: Params for the channel that we are using - * @used: number of pages used - * @errp: pointer to an error - */ -static int nocomp_send_write(MultiFDSendParams *p, uint32_t used, Error **= errp) -{ - return qio_channel_writev_all(p->c, p->iov, p->iovs_num, errp); -} - /** * nocomp_recv_setup: setup receive side * @@ -173,7 +157,6 @@ static MultiFDMethods multifd_nocomp_ops =3D { .send_setup =3D nocomp_send_setup, .send_cleanup =3D nocomp_send_cleanup, .send_prepare =3D nocomp_send_prepare, - .send_write =3D nocomp_send_write, .recv_setup =3D nocomp_recv_setup, .recv_cleanup =3D nocomp_recv_cleanup, .recv_pages =3D nocomp_recv_pages @@ -687,7 +670,8 @@ static void *multifd_send_thread(void *opaque) } =20 if (used) { - ret =3D multifd_send_state->ops->send_write(p, used, &loca= l_err); + ret =3D qio_channel_writev_all(p->c, p->iov, p->iovs_num, + &local_err); if (ret !=3D 0) { break; } --=20 2.33.1 From nobody Fri Apr 26 10:56:37 2024 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 1637749302869281.564468100205; Wed, 24 Nov 2021 02:21:42 -0800 (PST) Received: from localhost ([::1]:36198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mppPI-00025l-LO for importer@patchew.org; Wed, 24 Nov 2021 05:21:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41828) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppBc-00017l-FW for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:07:32 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:28270) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppBa-0006wX-Bo for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:07:32 -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-274-1iKeyWvuNwqmfoHD8ecZNg-1; Wed, 24 Nov 2021 05:07:28 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D3D961006AA0 for ; Wed, 24 Nov 2021 10:07:27 +0000 (UTC) Received: from redhat.mitica.com (unknown [10.39.193.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8857460843; Wed, 24 Nov 2021 10:07:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637748449; 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=wc/hHgbIzi02f5RiowHdBt1n+v0t3deScK2+D5kW6JI=; b=cqbUVDPyH9DnCO7htOrK8m/T33mrzio1GP5z12cH4k4rrHPkXmJhWDY/IsCRl9MhIIbWpX KGlKNQ/Mt3wu7Ao+g0ed46PPuEA8PoofPEQueJ8herJ2hN4+3XKfOhULxM6STK3aDMDyd1 2hu2uYvFZzRPKcL5vkGLlgGk7F5Vbnk= X-MC-Unique: 1iKeyWvuNwqmfoHD8ecZNg-1 From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v3 15/23] multifd: Use a single writev on the send side Date: Wed, 24 Nov 2021 11:06:09 +0100 Message-Id: <20211124100617.19786-16-quintela@redhat.com> In-Reply-To: <20211124100617.19786-1-quintela@redhat.com> References: <20211124100617.19786-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: , Cc: Leonardo Bras , "Dr. David Alan Gilbert" , Peter Xu , Juan Quintela 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: 1637749304675100001 Content-Type: text/plain; charset="utf-8" Until now, we wrote the packet header with write(), and the rest of the pages with writev(). Just increase the size of the iovec and do a single writev(). Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/multifd.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/migration/multifd.c b/migration/multifd.c index 71bdef068e..65676d56fd 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -643,7 +643,7 @@ static void *multifd_send_thread(void *opaque) uint32_t used =3D p->pages->num; uint64_t packet_num =3D p->packet_num; uint32_t flags =3D p->flags; - p->iovs_num =3D 0; + p->iovs_num =3D 1; =20 if (used) { ret =3D multifd_send_state->ops->send_prepare(p, &local_er= r); @@ -663,20 +663,15 @@ static void *multifd_send_thread(void *opaque) trace_multifd_send(p->id, packet_num, used, flags, p->next_packet_size); =20 - ret =3D qio_channel_write_all(p->c, (void *)p->packet, - p->packet_len, &local_err); + p->iov[0].iov_len =3D p->packet_len; + p->iov[0].iov_base =3D p->packet; + + ret =3D qio_channel_writev_all(p->c, p->iov, p->iovs_num, + &local_err); if (ret !=3D 0) { break; } =20 - if (used) { - ret =3D qio_channel_writev_all(p->c, p->iov, p->iovs_num, - &local_err); - if (ret !=3D 0) { - break; - } - } - qemu_mutex_lock(&p->mutex); p->pending_job--; qemu_mutex_unlock(&p->mutex); @@ -913,7 +908,8 @@ int multifd_save_setup(Error **errp) p->packet->version =3D cpu_to_be32(MULTIFD_VERSION); p->name =3D g_strdup_printf("multifdsend_%d", i); p->tls_hostname =3D g_strdup(s->hostname); - p->iov =3D g_new0(struct iovec, page_count); + /* We need one extra place for the packet header */ + p->iov =3D g_new0(struct iovec, page_count + 1); socket_send_channel_create(multifd_new_send_channel_async, p); } =20 --=20 2.33.1 From nobody Fri Apr 26 10:56:37 2024 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 1637749907227930.2597947705673; Wed, 24 Nov 2021 02:31:47 -0800 (PST) Received: from localhost ([::1]:57652 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mppZ3-00008i-5r for importer@patchew.org; Wed, 24 Nov 2021 05:31:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41858) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppBe-0001By-86 for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:07:35 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:20906) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppBb-0006wu-T7 for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:07:33 -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-72-LvMV7zcoO7eRoCqDNWnagQ-1; Wed, 24 Nov 2021 05:07:30 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7FE3283DD20 for ; Wed, 24 Nov 2021 10:07:29 +0000 (UTC) Received: from redhat.mitica.com (unknown [10.39.193.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3529960843; Wed, 24 Nov 2021 10:07:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637748451; 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=WkhgT9OtfB0bw0bvbITBNcnsQogAWms8/w8iiMp6XA4=; b=HXZUAoRK7WudL03mCcbOf5GYgoLPaOJh5GKUOhlO04wZsZ6fB/w1M6rhhm3vxLqSC2VmpM U8mYIHvo6yWZtjLaj2Gh3alzFSkRgNEeTC2mDivhgjpGeh1eOpPibzagW/65UQfUDcOcTa k7SXqr6OQQBDcwMHNjHQrvnpKWVLquQ= X-MC-Unique: LvMV7zcoO7eRoCqDNWnagQ-1 From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v3 16/23] multifd: Unfold "used" variable by its value Date: Wed, 24 Nov 2021 11:06:10 +0100 Message-Id: <20211124100617.19786-17-quintela@redhat.com> In-Reply-To: <20211124100617.19786-1-quintela@redhat.com> References: <20211124100617.19786-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: , Cc: Leonardo Bras , "Dr. David Alan Gilbert" , Peter Xu , Juan Quintela 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: 1637749908701100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/multifd.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/migration/multifd.c b/migration/multifd.c index 65676d56fd..6983ba3e7c 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -1059,7 +1059,6 @@ static void *multifd_recv_thread(void *opaque) rcu_register_thread(); =20 while (true) { - uint32_t used; uint32_t flags; =20 if (p->quit) { @@ -1082,17 +1081,16 @@ static void *multifd_recv_thread(void *opaque) break; } =20 - used =3D p->pages->num; flags =3D p->flags; /* recv methods don't know how to handle the SYNC flag */ p->flags &=3D ~MULTIFD_FLAG_SYNC; - trace_multifd_recv(p->id, p->packet_num, used, flags, + trace_multifd_recv(p->id, p->packet_num, p->pages->num, flags, p->next_packet_size); p->num_packets++; - p->num_pages +=3D used; + p->num_pages +=3D p->pages->num; qemu_mutex_unlock(&p->mutex); =20 - if (used) { + if (p->pages->num) { ret =3D multifd_recv_state->ops->recv_pages(p, &local_err); if (ret !=3D 0) { break; --=20 2.33.1 From nobody Fri Apr 26 10:56:37 2024 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 1637750104383237.61958166281715; Wed, 24 Nov 2021 02:35:04 -0800 (PST) Received: from localhost ([::1]:35808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mppcE-0004TZ-4t for importer@patchew.org; Wed, 24 Nov 2021 05:35:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppBn-0001H7-7Q for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:07:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:27517) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppBl-0006yV-17 for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:07:42 -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-385-fTOlTtzPM_KALQ6KOui-GQ-1; Wed, 24 Nov 2021 05:07:38 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 795D71006AA0 for ; Wed, 24 Nov 2021 10:07:37 +0000 (UTC) Received: from redhat.mitica.com (unknown [10.39.193.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id D52BB60843; Wed, 24 Nov 2021 10:07:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637748459; 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=QsUNeNLFSLYp4nJ7yL11BiCZE3+fOy2UmxWfLNk/85I=; b=JUuEy+17UhEPA3UQiQqrftcLFoUGa0s49mGsd055jQ+bG63YpaaunoyPOn8nZ7tcJypfr9 XDJoAMEQwMAhFRrf03YYnGWQt32uwIObGHAaWDZTcAiary+iHWfmuhnkY006HQVGgBB+Un VuA7OhSRrsAW/yySGdwjiYOL3te/vUU= X-MC-Unique: fTOlTtzPM_KALQ6KOui-GQ-1 From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v3 17/23] multifd: Use normal pages array on the send side Date: Wed, 24 Nov 2021 11:06:11 +0100 Message-Id: <20211124100617.19786-18-quintela@redhat.com> In-Reply-To: <20211124100617.19786-1-quintela@redhat.com> References: <20211124100617.19786-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: Leonardo Bras , "Dr. David Alan Gilbert" , Peter Xu , Juan Quintela 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: 1637750106690100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Juan Quintela --- migration/multifd.h | 8 ++++++-- migration/multifd-zlib.c | 6 +++--- migration/multifd-zstd.c | 6 +++--- migration/multifd.c | 30 +++++++++++++++++++----------- migration/trace-events | 4 ++-- 5 files changed, 33 insertions(+), 21 deletions(-) diff --git a/migration/multifd.h b/migration/multifd.h index 7496f951a7..78e73df3ec 100644 --- a/migration/multifd.h +++ b/migration/multifd.h @@ -104,14 +104,18 @@ typedef struct { /* thread local variables */ /* packets sent through this channel */ uint64_t num_packets; - /* pages sent through this channel */ - uint64_t num_pages; + /* non zero pages sent through this channel */ + uint64_t num_normal_pages; /* syncs main thread and channels */ QemuSemaphore sem_sync; /* buffers to send */ struct iovec *iov; /* number of iovs used */ uint32_t iovs_num; + /* Pages that are not zero */ + ram_addr_t *normal; + /* num of non zero pages */ + uint32_t normal_num; /* used for compression methods */ void *data; } MultiFDSendParams; diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c index f65159392a..25ef68a548 100644 --- a/migration/multifd-zlib.c +++ b/migration/multifd-zlib.c @@ -106,16 +106,16 @@ static int zlib_send_prepare(MultiFDSendParams *p, Er= ror **errp) int ret; uint32_t i; =20 - for (i =3D 0; i < p->pages->num; i++) { + for (i =3D 0; i < p->normal_num; i++) { uint32_t available =3D z->zbuff_len - out_size; int flush =3D Z_NO_FLUSH; =20 - if (i =3D=3D p->pages->num - 1) { + if (i =3D=3D p->normal_num - 1) { flush =3D Z_SYNC_FLUSH; } =20 zs->avail_in =3D page_size; - zs->next_in =3D p->pages->block->host + p->pages->offset[i]; + zs->next_in =3D p->pages->block->host + p->normal[i]; =20 zs->avail_out =3D available; zs->next_out =3D z->zbuff + out_size; diff --git a/migration/multifd-zstd.c b/migration/multifd-zstd.c index 6933ba622a..61842d713e 100644 --- a/migration/multifd-zstd.c +++ b/migration/multifd-zstd.c @@ -121,13 +121,13 @@ static int zstd_send_prepare(MultiFDSendParams *p, Er= ror **errp) z->out.size =3D z->zbuff_len; z->out.pos =3D 0; =20 - for (i =3D 0; i < p->pages->num; i++) { + for (i =3D 0; i < p->normal_num; i++) { ZSTD_EndDirective flush =3D ZSTD_e_continue; =20 - if (i =3D=3D p->pages->num - 1) { + if (i =3D=3D p->normal_num - 1) { flush =3D ZSTD_e_flush; } - z->in.src =3D p->pages->block->host + p->pages->offset[i]; + z->in.src =3D p->pages->block->host + p->normal[i]; z->in.size =3D page_size; z->in.pos =3D 0; =20 diff --git a/migration/multifd.c b/migration/multifd.c index 6983ba3e7c..dbe919b764 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -89,13 +89,13 @@ static int nocomp_send_prepare(MultiFDSendParams *p, Er= ror **errp) MultiFDPages_t *pages =3D p->pages; size_t page_size =3D qemu_target_page_size(); =20 - for (int i =3D 0; i < p->pages->num; i++) { - p->iov[p->iovs_num].iov_base =3D pages->block->host + pages->offse= t[i]; + for (int i =3D 0; i < p->normal_num; i++) { + p->iov[p->iovs_num].iov_base =3D pages->block->host + p->normal[i]; p->iov[p->iovs_num].iov_len =3D page_size; p->iovs_num++; } =20 - p->next_packet_size =3D p->pages->num * page_size; + p->next_packet_size =3D p->normal_num * page_size; p->flags |=3D MULTIFD_FLAG_NOCOMP; return 0; } @@ -262,7 +262,7 @@ static void multifd_send_fill_packet(MultiFDSendParams = *p) =20 packet->flags =3D cpu_to_be32(p->flags); packet->pages_alloc =3D cpu_to_be32(p->pages->allocated); - packet->pages_used =3D cpu_to_be32(p->pages->num); + packet->pages_used =3D cpu_to_be32(p->normal_num); packet->next_packet_size =3D cpu_to_be32(p->next_packet_size); packet->packet_num =3D cpu_to_be64(p->packet_num); =20 @@ -270,9 +270,9 @@ static void multifd_send_fill_packet(MultiFDSendParams = *p) strncpy(packet->ramblock, p->pages->block->idstr, 256); } =20 - for (i =3D 0; i < p->pages->num; i++) { + for (i =3D 0; i < p->normal_num; i++) { /* there are architectures where ram_addr_t is 32 bit */ - uint64_t temp =3D p->pages->offset[i]; + uint64_t temp =3D p->normal[i]; =20 packet->offset[i] =3D cpu_to_be64(temp); } @@ -556,6 +556,8 @@ void multifd_save_cleanup(void) p->packet =3D NULL; g_free(p->iov); p->iov =3D NULL; + g_free(p->normal); + p->normal =3D NULL; multifd_send_state->ops->send_cleanup(p, &local_err); if (local_err) { migrate_set_error(migrate_get_current(), local_err); @@ -640,12 +642,17 @@ static void *multifd_send_thread(void *opaque) qemu_mutex_lock(&p->mutex); =20 if (p->pending_job) { - uint32_t used =3D p->pages->num; uint64_t packet_num =3D p->packet_num; uint32_t flags =3D p->flags; p->iovs_num =3D 1; + p->normal_num =3D 0; =20 - if (used) { + for (int i =3D 0; i < p->pages->num; i++) { + p->normal[p->normal_num] =3D p->pages->offset[i]; + p->normal_num++; + } + + if (p->normal_num) { ret =3D multifd_send_state->ops->send_prepare(p, &local_er= r); if (ret !=3D 0) { qemu_mutex_unlock(&p->mutex); @@ -655,12 +662,12 @@ static void *multifd_send_thread(void *opaque) multifd_send_fill_packet(p); p->flags =3D 0; p->num_packets++; - p->num_pages +=3D used; + p->num_normal_pages +=3D p->normal_num; p->pages->num =3D 0; p->pages->block =3D NULL; qemu_mutex_unlock(&p->mutex); =20 - trace_multifd_send(p->id, packet_num, used, flags, + trace_multifd_send(p->id, packet_num, p->normal_num, flags, p->next_packet_size); =20 p->iov[0].iov_len =3D p->packet_len; @@ -710,7 +717,7 @@ out: qemu_mutex_unlock(&p->mutex); =20 rcu_unregister_thread(); - trace_multifd_send_thread_end(p->id, p->num_packets, p->num_pages); + trace_multifd_send_thread_end(p->id, p->num_packets, p->num_normal_pag= es); =20 return NULL; } @@ -910,6 +917,7 @@ int multifd_save_setup(Error **errp) p->tls_hostname =3D g_strdup(s->hostname); /* We need one extra place for the packet header */ p->iov =3D g_new0(struct iovec, page_count + 1); + p->normal =3D g_new0(ram_addr_t, page_count); socket_send_channel_create(multifd_new_send_channel_async, p); } =20 diff --git a/migration/trace-events b/migration/trace-events index b48d873b8a..af8dee9af0 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -124,13 +124,13 @@ multifd_recv_sync_main_wait(uint8_t id) "channel %d" multifd_recv_terminate_threads(bool error) "error %d" multifd_recv_thread_end(uint8_t id, uint64_t packets, uint64_t pages) "cha= nnel %d packets %" PRIu64 " pages %" PRIu64 multifd_recv_thread_start(uint8_t id) "%d" -multifd_send(uint8_t id, uint64_t packet_num, uint32_t used, uint32_t flag= s, uint32_t next_packet_size) "channel %d packet_num %" PRIu64 " pages %d f= lags 0x%x next packet size %d" +multifd_send(uint8_t id, uint64_t packet_num, uint32_t normal, uint32_t fl= ags, uint32_t next_packet_size) "channel %d packet_num %" PRIu64 " normal p= ages %d flags 0x%x next packet size %d" multifd_send_error(uint8_t id) "channel %d" multifd_send_sync_main(long packet_num) "packet num %ld" multifd_send_sync_main_signal(uint8_t id) "channel %d" multifd_send_sync_main_wait(uint8_t id) "channel %d" multifd_send_terminate_threads(bool error) "error %d" -multifd_send_thread_end(uint8_t id, uint64_t packets, uint64_t pages) "cha= nnel %d packets %" PRIu64 " pages %" PRIu64 +multifd_send_thread_end(uint8_t id, uint64_t packets, uint64_t normal_page= s) "channel %d packets %" PRIu64 " normal pages %" PRIu64 multifd_send_thread_start(uint8_t id) "%d" multifd_tls_outgoing_handshake_start(void *ioc, void *tioc, const char *ho= stname) "ioc=3D%p tioc=3D%p hostname=3D%s" multifd_tls_outgoing_handshake_error(void *ioc, const char *err) "ioc=3D%p= err=3D%s" --=20 2.33.1 From nobody Fri Apr 26 10:56:37 2024 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 16377502690580.08876481218862864; Wed, 24 Nov 2021 02:37:49 -0800 (PST) Received: from localhost ([::1]:42196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mppes-0000Qd-13 for importer@patchew.org; Wed, 24 Nov 2021 05:37:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42058) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppBy-0001K2-7q for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:07:55 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:23202) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppBv-0006zv-6N for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:07:53 -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-381-Y72aFtxjMdqo0lMfP7Hlzw-1; Wed, 24 Nov 2021 05:07:48 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0687C1006AA1 for ; Wed, 24 Nov 2021 10:07:48 +0000 (UTC) Received: from redhat.mitica.com (unknown [10.39.193.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id D065360843; Wed, 24 Nov 2021 10:07:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637748470; 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=iE3JpOIP7uMPXoQm9brb56/sNBm/pGdYp3k07W9pgO8=; b=NGwdvaZ02jLqJR2t/R5btKtnOLLUDLBLefsfS6ctMaukPWcr3quYn0lcw8DMB6ROg1yTaS 7Cp1Oxac76IvpzbaQgfMZzchIG/DbQtLl1b2cRHeam7on57IbIj7hsJcsbxSyuaNyYB+rs zS1SAOhMrv8xO/nPWMW/jlukX0oeiFw= X-MC-Unique: Y72aFtxjMdqo0lMfP7Hlzw-1 From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v3 18/23] multifd: Use normal pages array on the recv side Date: Wed, 24 Nov 2021 11:06:12 +0100 Message-Id: <20211124100617.19786-19-quintela@redhat.com> In-Reply-To: <20211124100617.19786-1-quintela@redhat.com> References: <20211124100617.19786-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: Leonardo Bras , "Dr. David Alan Gilbert" , Peter Xu , Juan Quintela 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: 1637750270161100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Juan Quintela --- migration/multifd.h | 8 +++++-- migration/multifd-zlib.c | 8 +++---- migration/multifd-zstd.c | 6 +++--- migration/multifd.c | 45 ++++++++++++++++++---------------------- 4 files changed, 33 insertions(+), 34 deletions(-) diff --git a/migration/multifd.h b/migration/multifd.h index 78e73df3ec..9fbcb7bb9a 100644 --- a/migration/multifd.h +++ b/migration/multifd.h @@ -151,12 +151,16 @@ typedef struct { uint32_t next_packet_size; /* packets sent through this channel */ uint64_t num_packets; - /* pages sent through this channel */ - uint64_t num_pages; + /* non zero pages sent through this channel */ + uint64_t num_normal_pages; /* syncs main thread and channels */ QemuSemaphore sem_sync; /* buffers to recv */ struct iovec *iov; + /* Pages that are not zero */ + ram_addr_t *normal; + /* num of non zero pages */ + uint32_t normal_num; /* used for de-compression methods */ void *data; } MultiFDRecvParams; diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c index 25ef68a548..cc143b829d 100644 --- a/migration/multifd-zlib.c +++ b/migration/multifd-zlib.c @@ -225,7 +225,7 @@ static int zlib_recv_pages(MultiFDRecvParams *p, Error = **errp) uint32_t in_size =3D p->next_packet_size; /* we measure the change of total_out */ uint32_t out_size =3D zs->total_out; - uint32_t expected_size =3D p->pages->num * qemu_target_page_size(); + uint32_t expected_size =3D p->normal_num * page_size; uint32_t flags =3D p->flags & MULTIFD_FLAG_COMPRESSION_MASK; int ret; int i; @@ -244,16 +244,16 @@ static int zlib_recv_pages(MultiFDRecvParams *p, Erro= r **errp) zs->avail_in =3D in_size; zs->next_in =3D z->zbuff; =20 - for (i =3D 0; i < p->pages->num; i++) { + for (i =3D 0; i < p->normal_num; i++) { int flush =3D Z_NO_FLUSH; unsigned long start =3D zs->total_out; =20 - if (i =3D=3D p->pages->num - 1) { + if (i =3D=3D p->normal_num - 1) { flush =3D Z_SYNC_FLUSH; } =20 zs->avail_out =3D page_size; - zs->next_out =3D p->pages->block->host + p->pages->offset[i]; + zs->next_out =3D p->pages->block->host + p->normal[i]; =20 /* * Welcome to inflate semantics diff --git a/migration/multifd-zstd.c b/migration/multifd-zstd.c index 61842d713e..93d504ce0f 100644 --- a/migration/multifd-zstd.c +++ b/migration/multifd-zstd.c @@ -242,7 +242,7 @@ static int zstd_recv_pages(MultiFDRecvParams *p, Error = **errp) uint32_t in_size =3D p->next_packet_size; uint32_t out_size =3D 0; size_t page_size =3D qemu_target_page_size(); - uint32_t expected_size =3D p->pages->num * page_size; + uint32_t expected_size =3D p->normal_num * page_size; uint32_t flags =3D p->flags & MULTIFD_FLAG_COMPRESSION_MASK; struct zstd_data *z =3D p->data; int ret; @@ -263,8 +263,8 @@ static int zstd_recv_pages(MultiFDRecvParams *p, Error = **errp) z->in.size =3D in_size; z->in.pos =3D 0; =20 - for (i =3D 0; i < p->pages->num; i++) { - z->out.dst =3D p->pages->block->host + p->pages->offset[i]; + for (i =3D 0; i < p->normal_num; i++) { + z->out.dst =3D p->pages->block->host + p->normal[i]; z->out.size =3D page_size; z->out.pos =3D 0; =20 diff --git a/migration/multifd.c b/migration/multifd.c index dbe919b764..3ffb1aba64 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -146,11 +146,11 @@ static int nocomp_recv_pages(MultiFDRecvParams *p, Er= ror **errp) p->id, flags, MULTIFD_FLAG_NOCOMP); return -1; } - for (int i =3D 0; i < p->pages->num; i++) { - p->iov[i].iov_base =3D p->pages->block->host + p->pages->offset[i]; + for (int i =3D 0; i < p->normal_num; i++) { + p->iov[i].iov_base =3D p->pages->block->host + p->normal[i]; p->iov[i].iov_len =3D page_size; } - return qio_channel_readv_all(p->c, p->iov, p->pages->num, errp); + return qio_channel_readv_all(p->c, p->iov, p->normal_num, errp); } =20 static MultiFDMethods multifd_nocomp_ops =3D { @@ -282,7 +282,7 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams= *p, Error **errp) { MultiFDPacket_t *packet =3D p->packet; size_t page_size =3D qemu_target_page_size(); - uint32_t pages_max =3D MULTIFD_PACKET_SIZE / page_size; + uint32_t page_count =3D MULTIFD_PACKET_SIZE / page_size; RAMBlock *block; int i; =20 @@ -309,33 +309,25 @@ static int multifd_recv_unfill_packet(MultiFDRecvPara= ms *p, Error **errp) * If we received a packet that is 100 times bigger than expected * just stop migration. It is a magic number. */ - if (packet->pages_alloc > pages_max * 100) { + if (packet->pages_alloc > page_count) { error_setg(errp, "multifd: received packet " - "with size %d and expected a maximum size of %d", - packet->pages_alloc, pages_max * 100) ; + "with size %d and expected a size of %d", + packet->pages_alloc, page_count) ; return -1; } - /* - * We received a packet that is bigger than expected but inside - * reasonable limits (see previous comment). Just reallocate. - */ - if (packet->pages_alloc > p->pages->allocated) { - multifd_pages_clear(p->pages); - p->pages =3D multifd_pages_init(packet->pages_alloc); - } =20 - p->pages->num =3D be32_to_cpu(packet->pages_used); - if (p->pages->num > packet->pages_alloc) { + p->normal_num =3D be32_to_cpu(packet->pages_used); + if (p->normal_num > packet->pages_alloc) { error_setg(errp, "multifd: received packet " "with %d pages and expected maximum pages are %d", - p->pages->num, packet->pages_alloc) ; + p->normal_num, packet->pages_alloc) ; return -1; } =20 p->next_packet_size =3D be32_to_cpu(packet->next_packet_size); p->packet_num =3D be64_to_cpu(packet->packet_num); =20 - if (p->pages->num =3D=3D 0) { + if (p->normal_num =3D=3D 0) { return 0; } =20 @@ -349,7 +341,7 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams= *p, Error **errp) } =20 p->pages->block =3D block; - for (i =3D 0; i < p->pages->num; i++) { + for (i =3D 0; i < p->normal_num; i++) { uint64_t offset =3D be64_to_cpu(packet->offset[i]); =20 if (offset > (block->used_length - page_size)) { @@ -358,7 +350,7 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams= *p, Error **errp) offset, block->used_length); return -1; } - p->pages->offset[i] =3D offset; + p->normal[i] =3D offset; } =20 return 0; @@ -1019,6 +1011,8 @@ int multifd_load_cleanup(Error **errp) p->packet =3D NULL; g_free(p->iov); p->iov =3D NULL; + g_free(p->normal); + p->normal =3D NULL; multifd_recv_state->ops->recv_cleanup(p); } qemu_sem_destroy(&multifd_recv_state->sem_sync); @@ -1092,13 +1086,13 @@ static void *multifd_recv_thread(void *opaque) flags =3D p->flags; /* recv methods don't know how to handle the SYNC flag */ p->flags &=3D ~MULTIFD_FLAG_SYNC; - trace_multifd_recv(p->id, p->packet_num, p->pages->num, flags, + trace_multifd_recv(p->id, p->packet_num, p->normal_num, flags, p->next_packet_size); p->num_packets++; - p->num_pages +=3D p->pages->num; + p->num_normal_pages +=3D p->normal_num; qemu_mutex_unlock(&p->mutex); =20 - if (p->pages->num) { + if (p->normal_num) { ret =3D multifd_recv_state->ops->recv_pages(p, &local_err); if (ret !=3D 0) { break; @@ -1120,7 +1114,7 @@ static void *multifd_recv_thread(void *opaque) qemu_mutex_unlock(&p->mutex); =20 rcu_unregister_thread(); - trace_multifd_recv_thread_end(p->id, p->num_packets, p->num_pages); + trace_multifd_recv_thread_end(p->id, p->num_packets, p->num_normal_pag= es); =20 return NULL; } @@ -1158,6 +1152,7 @@ int multifd_load_setup(Error **errp) p->packet =3D g_malloc0(p->packet_len); p->name =3D g_strdup_printf("multifdrecv_%d", i); p->iov =3D g_new0(struct iovec, page_count); + p->normal =3D g_new0(ram_addr_t, page_count); } =20 for (i =3D 0; i < thread_count; i++) { --=20 2.33.1 From nobody Fri Apr 26 10:56:37 2024 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 1637748950461713.937896953325; Wed, 24 Nov 2021 02:15:50 -0800 (PST) Received: from localhost ([::1]:47686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mppJc-0007Bq-09 for importer@patchew.org; Wed, 24 Nov 2021 05:15:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppC8-0001ZC-SQ for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:08:04 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:33909) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppC6-000727-RX for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:08:04 -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-252-7HQDHRSjMvi2wCwcHsmJMw-1; Wed, 24 Nov 2021 05:08:01 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 576D11800D41 for ; Wed, 24 Nov 2021 10:08:00 +0000 (UTC) Received: from redhat.mitica.com (unknown [10.39.193.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E14560843; Wed, 24 Nov 2021 10:07:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637748482; 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=ecGKG2KT/0wE+CS/G8N8mQBoyFf+eL4MejwMzy5o5GQ=; b=VhlsPRsGny2lOicP4GGbGGue2X2dHAMZX9xNGJ8teyGb6KjU5C8w1CGXbxBS9WP/FYzIis SRRRLum9ILk5Jc+uuvrvCgM2fiDsztN9wBOxT5z/1vBlu0DkCSKbbUSuhgRjQ50kmJdboB jeeasyOCGaUwy5AXtBbtQN8dzvOU9rU= X-MC-Unique: 7HQDHRSjMvi2wCwcHsmJMw-1 From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v3 19/23] multifd: recv side only needs the RAMBlock host address Date: Wed, 24 Nov 2021 11:06:13 +0100 Message-Id: <20211124100617.19786-20-quintela@redhat.com> In-Reply-To: <20211124100617.19786-1-quintela@redhat.com> References: <20211124100617.19786-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: , Cc: Leonardo Bras , "Dr. David Alan Gilbert" , Peter Xu , Juan Quintela 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: 1637748952194100001 Content-Type: text/plain; charset="utf-8" So we can remove the MultiFDPages. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/multifd.h | 4 ++-- migration/multifd-zlib.c | 2 +- migration/multifd-zstd.c | 2 +- migration/multifd.c | 7 ++----- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/migration/multifd.h b/migration/multifd.h index 9fbcb7bb9a..ab32baebd7 100644 --- a/migration/multifd.h +++ b/migration/multifd.h @@ -136,8 +136,8 @@ typedef struct { bool running; /* should this thread finish */ bool quit; - /* array of pages to receive */ - MultiFDPages_t *pages; + /* ramblock host address */ + uint8_t *host; /* packet allocated len */ uint32_t packet_len; /* pointer to the packet */ diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c index cc143b829d..bf4d87fa16 100644 --- a/migration/multifd-zlib.c +++ b/migration/multifd-zlib.c @@ -253,7 +253,7 @@ static int zlib_recv_pages(MultiFDRecvParams *p, Error = **errp) } =20 zs->avail_out =3D page_size; - zs->next_out =3D p->pages->block->host + p->normal[i]; + zs->next_out =3D p->host + p->normal[i]; =20 /* * Welcome to inflate semantics diff --git a/migration/multifd-zstd.c b/migration/multifd-zstd.c index 93d504ce0f..dd64ac3227 100644 --- a/migration/multifd-zstd.c +++ b/migration/multifd-zstd.c @@ -264,7 +264,7 @@ static int zstd_recv_pages(MultiFDRecvParams *p, Error = **errp) z->in.pos =3D 0; =20 for (i =3D 0; i < p->normal_num; i++) { - z->out.dst =3D p->pages->block->host + p->normal[i]; + z->out.dst =3D p->host + p->normal[i]; z->out.size =3D page_size; z->out.pos =3D 0; =20 diff --git a/migration/multifd.c b/migration/multifd.c index 3ffb1aba64..dc76322137 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -147,7 +147,7 @@ static int nocomp_recv_pages(MultiFDRecvParams *p, Erro= r **errp) return -1; } for (int i =3D 0; i < p->normal_num; i++) { - p->iov[i].iov_base =3D p->pages->block->host + p->normal[i]; + p->iov[i].iov_base =3D p->host + p->normal[i]; p->iov[i].iov_len =3D page_size; } return qio_channel_readv_all(p->c, p->iov, p->normal_num, errp); @@ -340,7 +340,7 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams= *p, Error **errp) return -1; } =20 - p->pages->block =3D block; + p->host =3D block->host; for (i =3D 0; i < p->normal_num; i++) { uint64_t offset =3D be64_to_cpu(packet->offset[i]); =20 @@ -1004,8 +1004,6 @@ int multifd_load_cleanup(Error **errp) qemu_sem_destroy(&p->sem_sync); g_free(p->name); p->name =3D NULL; - multifd_pages_clear(p->pages); - p->pages =3D NULL; p->packet_len =3D 0; g_free(p->packet); p->packet =3D NULL; @@ -1146,7 +1144,6 @@ int multifd_load_setup(Error **errp) qemu_sem_init(&p->sem_sync, 0); p->quit =3D false; p->id =3D i; - p->pages =3D multifd_pages_init(page_count); p->packet_len =3D sizeof(MultiFDPacket_t) + sizeof(uint64_t) * page_count; p->packet =3D g_malloc0(p->packet_len); --=20 2.33.1 From nobody Fri Apr 26 10:56:37 2024 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 1637749688380622.9021380532596; Wed, 24 Nov 2021 02:28:08 -0800 (PST) Received: from localhost ([::1]:48362 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mppVW-0002Iw-4d for importer@patchew.org; Wed, 24 Nov 2021 05:28:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42444) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppCc-0002rV-LT for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:08:34 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:20345) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppCa-0007D2-FW for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:08:34 -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-95-Pb8QUOV_OsmKP1493F7_eg-1; Wed, 24 Nov 2021 05:08:30 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A4FA51023F4D for ; Wed, 24 Nov 2021 10:08:29 +0000 (UTC) Received: from redhat.mitica.com (unknown [10.39.193.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id ADA1F60843; Wed, 24 Nov 2021 10:08:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637748511; 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=fWLu1gDUHJoczILbqPDLLwc9AxRBP9TW0JEGRBMzOFU=; b=CugBLEdxR3+PTc3ZmIVZI3tS6RrJIJ+WC+t/IFLfxwOCIQ02TpbD2+1Mg7/WLWPNO9l0Ur j1DjFh6J8P+MD8sifoo53XwAIQWK41e/F7bVh3vr9nnu1r3N/AJhuPxS7DGo8Q5NsdAiZ0 wuxl3xlVAsu8FZETe6nCHN52KfZhV1o= X-MC-Unique: Pb8QUOV_OsmKP1493F7_eg-1 From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v3 20/23] multifd: Rename pages_used to normal_pages Date: Wed, 24 Nov 2021 11:06:14 +0100 Message-Id: <20211124100617.19786-21-quintela@redhat.com> In-Reply-To: <20211124100617.19786-1-quintela@redhat.com> References: <20211124100617.19786-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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=216.205.24.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: , Cc: Leonardo Bras , "Dr. David Alan Gilbert" , Peter Xu , Juan Quintela 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: 1637749689455100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/multifd.h | 3 ++- migration/multifd.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/migration/multifd.h b/migration/multifd.h index ab32baebd7..39e55d7f05 100644 --- a/migration/multifd.h +++ b/migration/multifd.h @@ -44,7 +44,8 @@ typedef struct { uint32_t flags; /* maximum number of allocated pages */ uint32_t pages_alloc; - uint32_t pages_used; + /* non zero pages */ + uint32_t normal_pages; /* size of the next packet that contains pages */ uint32_t next_packet_size; uint64_t packet_num; diff --git a/migration/multifd.c b/migration/multifd.c index dc76322137..d1ab823f98 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -262,7 +262,7 @@ static void multifd_send_fill_packet(MultiFDSendParams = *p) =20 packet->flags =3D cpu_to_be32(p->flags); packet->pages_alloc =3D cpu_to_be32(p->pages->allocated); - packet->pages_used =3D cpu_to_be32(p->normal_num); + packet->normal_pages =3D cpu_to_be32(p->normal_num); packet->next_packet_size =3D cpu_to_be32(p->next_packet_size); packet->packet_num =3D cpu_to_be64(p->packet_num); =20 @@ -316,7 +316,7 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams= *p, Error **errp) return -1; } =20 - p->normal_num =3D be32_to_cpu(packet->pages_used); + p->normal_num =3D be32_to_cpu(packet->normal_pages); if (p->normal_num > packet->pages_alloc) { error_setg(errp, "multifd: received packet " "with %d pages and expected maximum pages are %d", --=20 2.33.1 From nobody Fri Apr 26 10:56:37 2024 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 1637749105859747.9063890291684; Wed, 24 Nov 2021 02:18:25 -0800 (PST) Received: from localhost ([::1]:55818 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mppM7-0004YX-S2 for importer@patchew.org; Wed, 24 Nov 2021 05:18:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42546) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppCm-0003Ut-TK for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:08:44 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:40236) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppCk-0007Tr-O2 for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:08:44 -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-216-EPXivX0TOsSbhXVxzbKwrg-1; Wed, 24 Nov 2021 05:08:41 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4AC5F81EE60 for ; Wed, 24 Nov 2021 10:08:40 +0000 (UTC) Received: from redhat.mitica.com (unknown [10.39.193.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0799260843; Wed, 24 Nov 2021 10:08:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637748522; 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=tDJkui5JmkZ6oURN1/ZfphfLz0OL30FdAU8Jz3ql+Uc=; b=MjxnR7NxlX7eVZfTGYgce8gQ8kn4qAokFh+fBt2fM15PvxhO+y11X8KfTyb5U6ciJuoAOx 0NeMm0QKRjTJCRlN/2cDo2d711jfx3d1OIHVQTt49LhweZ1nWjfuaZh0dgcdCS08URT2VN ti9euhJrvRqblifLvY/gfZw1ta7KWZY= X-MC-Unique: EPXivX0TOsSbhXVxzbKwrg-1 From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v3 21/23] multifd: Support for zero pages transmission Date: Wed, 24 Nov 2021 11:06:15 +0100 Message-Id: <20211124100617.19786-22-quintela@redhat.com> In-Reply-To: <20211124100617.19786-1-quintela@redhat.com> References: <20211124100617.19786-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: , Cc: Leonardo Bras , "Dr. David Alan Gilbert" , Peter Xu , Juan Quintela 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: 1637749107916100001 Content-Type: text/plain; charset="utf-8" This patch adds counters and similar. Logic will be added on the following patch. Signed-off-by: Juan Quintela --- migration/multifd.h | 13 ++++++++++++- migration/multifd.c | 22 +++++++++++++++++++--- migration/trace-events | 2 +- 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/migration/multifd.h b/migration/multifd.h index 39e55d7f05..973315b545 100644 --- a/migration/multifd.h +++ b/migration/multifd.h @@ -49,7 +49,10 @@ typedef struct { /* size of the next packet that contains pages */ uint32_t next_packet_size; uint64_t packet_num; - uint64_t unused[4]; /* Reserved for future use */ + /* zero pages */ + uint32_t zero_pages; + uint32_t unused32[1]; /* Reserved for future use */ + uint64_t unused64[3]; /* Reserved for future use */ char ramblock[256]; uint64_t offset[]; } __attribute__((packed)) MultiFDPacket_t; @@ -117,6 +120,10 @@ typedef struct { ram_addr_t *normal; /* num of non zero pages */ uint32_t normal_num; + /* Pages that are zero */ + ram_addr_t *zero; + /* num of zero pages */ + uint32_t zero_num; /* used for compression methods */ void *data; } MultiFDSendParams; @@ -162,6 +169,10 @@ typedef struct { ram_addr_t *normal; /* num of non zero pages */ uint32_t normal_num; + /* Pages that are zero */ + ram_addr_t *zero; + /* num of zero pages */ + uint32_t zero_num; /* used for de-compression methods */ void *data; } MultiFDRecvParams; diff --git a/migration/multifd.c b/migration/multifd.c index d1ab823f98..2e4dffd6c6 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -265,6 +265,7 @@ static void multifd_send_fill_packet(MultiFDSendParams = *p) packet->normal_pages =3D cpu_to_be32(p->normal_num); packet->next_packet_size =3D cpu_to_be32(p->next_packet_size); packet->packet_num =3D cpu_to_be64(p->packet_num); + packet->zero_pages =3D cpu_to_be32(p->zero_num); =20 if (p->pages->block) { strncpy(packet->ramblock, p->pages->block->idstr, 256); @@ -327,7 +328,15 @@ static int multifd_recv_unfill_packet(MultiFDRecvParam= s *p, Error **errp) p->next_packet_size =3D be32_to_cpu(packet->next_packet_size); p->packet_num =3D be64_to_cpu(packet->packet_num); =20 - if (p->normal_num =3D=3D 0) { + p->zero_num =3D be32_to_cpu(packet->zero_pages); + if (p->zero_num > packet->pages_alloc - p->normal_num) { + error_setg(errp, "multifd: received packet " + "with %d zero pages and expected maximum pages are %d", + p->normal_num, packet->pages_alloc - p->zero_num) ; + return -1; + } + + if (p->normal_num =3D=3D 0 && p->zero_num =3D=3D 0) { return 0; } =20 @@ -550,6 +559,8 @@ void multifd_save_cleanup(void) p->iov =3D NULL; g_free(p->normal); p->normal =3D NULL; + g_free(p->zero); + p->zero =3D NULL; multifd_send_state->ops->send_cleanup(p, &local_err); if (local_err) { migrate_set_error(migrate_get_current(), local_err); @@ -638,6 +649,7 @@ static void *multifd_send_thread(void *opaque) uint32_t flags =3D p->flags; p->iovs_num =3D 1; p->normal_num =3D 0; + p->zero_num =3D 0; =20 for (int i =3D 0; i < p->pages->num; i++) { p->normal[p->normal_num] =3D p->pages->offset[i]; @@ -659,8 +671,8 @@ static void *multifd_send_thread(void *opaque) p->pages->block =3D NULL; qemu_mutex_unlock(&p->mutex); =20 - trace_multifd_send(p->id, packet_num, p->normal_num, flags, - p->next_packet_size); + trace_multifd_send(p->id, packet_num, p->normal_num, p->zero_n= um, + flags, p->next_packet_size); =20 p->iov[0].iov_len =3D p->packet_len; p->iov[0].iov_base =3D p->packet; @@ -910,6 +922,7 @@ int multifd_save_setup(Error **errp) /* We need one extra place for the packet header */ p->iov =3D g_new0(struct iovec, page_count + 1); p->normal =3D g_new0(ram_addr_t, page_count); + p->zero =3D g_new0(ram_addr_t, page_count); socket_send_channel_create(multifd_new_send_channel_async, p); } =20 @@ -1011,6 +1024,8 @@ int multifd_load_cleanup(Error **errp) p->iov =3D NULL; g_free(p->normal); p->normal =3D NULL; + g_free(p->zero); + p->zero =3D NULL; multifd_recv_state->ops->recv_cleanup(p); } qemu_sem_destroy(&multifd_recv_state->sem_sync); @@ -1150,6 +1165,7 @@ int multifd_load_setup(Error **errp) p->name =3D g_strdup_printf("multifdrecv_%d", i); p->iov =3D g_new0(struct iovec, page_count); p->normal =3D g_new0(ram_addr_t, page_count); + p->zero =3D g_new0(ram_addr_t, page_count); } =20 for (i =3D 0; i < thread_count; i++) { diff --git a/migration/trace-events b/migration/trace-events index af8dee9af0..608decbdcc 100644 --- a/migration/trace-events +++ b/migration/trace-events @@ -124,7 +124,7 @@ multifd_recv_sync_main_wait(uint8_t id) "channel %d" multifd_recv_terminate_threads(bool error) "error %d" multifd_recv_thread_end(uint8_t id, uint64_t packets, uint64_t pages) "cha= nnel %d packets %" PRIu64 " pages %" PRIu64 multifd_recv_thread_start(uint8_t id) "%d" -multifd_send(uint8_t id, uint64_t packet_num, uint32_t normal, uint32_t fl= ags, uint32_t next_packet_size) "channel %d packet_num %" PRIu64 " normal p= ages %d flags 0x%x next packet size %d" +multifd_send(uint8_t id, uint64_t packet_num, uint32_t normal, uint32_t ze= ro, uint32_t flags, uint32_t next_packet_size) "channel %d packet_num %" PR= Iu64 " normal pages %d zero pages %d flags 0x%x next packet size %d" multifd_send_error(uint8_t id) "channel %d" multifd_send_sync_main(long packet_num) "packet num %ld" multifd_send_sync_main_signal(uint8_t id) "channel %d" --=20 2.33.1 From nobody Fri Apr 26 10:56:37 2024 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 1637749817738302.77442170481595; Wed, 24 Nov 2021 02:30:17 -0800 (PST) Received: from localhost ([::1]:54618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mppXb-0006TU-DD for importer@patchew.org; Wed, 24 Nov 2021 05:30:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42586) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppCo-0003bQ-Rj for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:08:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:39923) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppCm-0007US-ME for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:08:46 -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-597-8bcAsEgYNCmCFEBJqMUJzg-1; Wed, 24 Nov 2021 05:08:42 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0CA8F192AB6D for ; Wed, 24 Nov 2021 10:08:42 +0000 (UTC) Received: from redhat.mitica.com (unknown [10.39.193.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id A2BAB60843; Wed, 24 Nov 2021 10:08:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637748524; 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=KHmXpk+ZVRbhpA6PDwrLC0W/S4sg8OR0VfUtrYBV4JY=; b=W4au+Q/N7iAnVRue18PVnr6s5WvwQwnIAjb0CHxQ/+kE+R5Moertv+FYC96eOB59NVUK3N CW7Wwcxpd7jTE8rod/pbg/JAnCdwjC0AlBDJGBBntKSaDLIqZTwFz/P++XVQ0FZuc3PgvY W4zsRf7C8N0iMaMsX4Jhj+BTHFLb/Bs= X-MC-Unique: 8bcAsEgYNCmCFEBJqMUJzg-1 From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v3 22/23] multifd: Zero pages transmission Date: Wed, 24 Nov 2021 11:06:16 +0100 Message-Id: <20211124100617.19786-23-quintela@redhat.com> In-Reply-To: <20211124100617.19786-1-quintela@redhat.com> References: <20211124100617.19786-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=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: , Cc: Leonardo Bras , "Dr. David Alan Gilbert" , Peter Xu , Juan Quintela 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: 1637749819689100001 Content-Type: text/plain; charset="utf-8" This implements the zero page dection and handling. Signed-off-by: Juan Quintela Reviewed-by: Dr. David Alan Gilbert --- migration/multifd.c | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/migration/multifd.c b/migration/multifd.c index 2e4dffd6c6..5c1fc70ce3 100644 --- a/migration/multifd.c +++ b/migration/multifd.c @@ -11,6 +11,7 @@ */ =20 #include "qemu/osdep.h" +#include "qemu/cutils.h" #include "qemu/rcu.h" #include "exec/target_page.h" #include "sysemu/sysemu.h" @@ -277,6 +278,12 @@ static void multifd_send_fill_packet(MultiFDSendParams= *p) =20 packet->offset[i] =3D cpu_to_be64(temp); } + for (i =3D 0; i < p->zero_num; i++) { + /* there are architectures where ram_addr_t is 32 bit */ + uint64_t temp =3D p->zero[i]; + + packet->offset[p->normal_num + i] =3D cpu_to_be64(temp); + } } =20 static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp) @@ -362,6 +369,18 @@ static int multifd_recv_unfill_packet(MultiFDRecvParam= s *p, Error **errp) p->normal[i] =3D offset; } =20 + for (i =3D 0; i < p->zero_num; i++) { + uint64_t offset =3D be64_to_cpu(packet->offset[p->normal_num + i]); + + if (offset > (block->used_length - page_size)) { + error_setg(errp, "multifd: offset too long %" PRIu64 + " (max " RAM_ADDR_FMT ")", + offset, block->used_length); + return -1; + } + p->zero[i] =3D offset; + } + return 0; } =20 @@ -652,8 +671,14 @@ static void *multifd_send_thread(void *opaque) p->zero_num =3D 0; =20 for (int i =3D 0; i < p->pages->num; i++) { - p->normal[p->normal_num] =3D p->pages->offset[i]; - p->normal_num++; + if (buffer_is_zero(p->pages->block->host + p->pages->offse= t[i], + qemu_target_page_size())) { + p->zero[p->zero_num] =3D p->pages->offset[i]; + p->zero_num++; + } else { + p->normal[p->normal_num] =3D p->pages->offset[i]; + p->normal_num++; + } } =20 if (p->normal_num) { @@ -1112,6 +1137,10 @@ static void *multifd_recv_thread(void *opaque) } } =20 + for (int i =3D 0; i < p->zero_num; i++) { + memset(p->host + p->zero[i], 0, qemu_target_page_size()); + } + if (flags & MULTIFD_FLAG_SYNC) { qemu_sem_post(&multifd_recv_state->sem_sync); qemu_sem_wait(&p->sem_sync); --=20 2.33.1 From nobody Fri Apr 26 10:56:37 2024 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 1637749971382949.8749160464364; Wed, 24 Nov 2021 02:32:51 -0800 (PST) Received: from localhost ([::1]:60934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mppa3-0002Nr-9g for importer@patchew.org; Wed, 24 Nov 2021 05:32:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42614) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppCq-0003i3-Hb for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:08:48 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:57509) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mppCo-0007Um-JV for qemu-devel@nongnu.org; Wed, 24 Nov 2021 05:08:48 -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-18-S5v_mbb2ORGNm4JXOx1Kzw-1; Wed, 24 Nov 2021 05:08:44 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A1EC81800D41 for ; Wed, 24 Nov 2021 10:08:43 +0000 (UTC) Received: from redhat.mitica.com (unknown [10.39.193.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5584160843; Wed, 24 Nov 2021 10:08:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637748526; 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=zyaQbhI47239XzYkHuhr8Uht1Kvjv6WMJJcRmjTcEG8=; b=GlV7X3fEIZn4HDICDPMn80Jg3Ds8HjZhSDtDltx1MCJRwmeuGeHwiHg6ZjNjqcmah2hWSO gnywLHUovt2ZzUYPvyeIAQ7P0RD1RuutEBgvfUyPPjGdfIJL0pvqoYmfCU8DWeHTHcTrfa 8wfVe7y25HhtesBr+frvdhg/Htzogy4= X-MC-Unique: S5v_mbb2ORGNm4JXOx1Kzw-1 From: Juan Quintela To: qemu-devel@nongnu.org Subject: [PATCH v3 23/23] migration: Use multifd before we check for the zero page Date: Wed, 24 Nov 2021 11:06:17 +0100 Message-Id: <20211124100617.19786-24-quintela@redhat.com> In-Reply-To: <20211124100617.19786-1-quintela@redhat.com> References: <20211124100617.19786-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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.133.124; envelope-from=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.7, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, 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: , Cc: Leonardo Bras , "Dr. David Alan Gilbert" , Peter Xu , Juan Quintela 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: 1637749972974100001 Content-Type: text/plain; charset="utf-8" So we use multifd to transmit zero pages. Signed-off-by: Juan Quintela --- migration/ram.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 57efa67f20..3ae094f653 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2138,6 +2138,17 @@ static int ram_save_target_page(RAMState *rs, PageSe= archStatus *pss, ram_addr_t offset =3D ((ram_addr_t)pss->page) << TARGET_PAGE_BITS; int res; =20 + /* + * Do not use multifd for: + * 1. Compression as the first page in the new block should be posted = out + * before sending the compressed page + * 2. In postcopy as one whole host page should be placed + */ + if (!save_page_use_compression(rs) && migrate_use_multifd() + && !migration_in_postcopy()) { + return ram_save_multifd_page(rs, block, offset); + } + if (control_save_page(rs, block, offset, &res)) { return res; } @@ -2160,17 +2171,6 @@ static int ram_save_target_page(RAMState *rs, PageSe= archStatus *pss, return res; } =20 - /* - * Do not use multifd for: - * 1. Compression as the first page in the new block should be posted = out - * before sending the compressed page - * 2. In postcopy as one whole host page should be placed - */ - if (!save_page_use_compression(rs) && migrate_use_multifd() - && !migration_in_postcopy()) { - return ram_save_multifd_page(rs, block, offset); - } - return ram_save_page(rs, pss, last_stage); } =20 --=20 2.33.1