From nobody Sun May 5 05:16:26 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1660137949; cv=none; d=zohomail.com; s=zohoarc; b=cK2iMuRqQ//9xeQgyUCqqca1KKEIvjkGjMlG+Hibfa5xi75Cu6A+jAyAMcYOj5wzpwK8h+VxwQ1KdzkYg5N+ddnbTLGmvKJF6vpCpvFnMqfB4iyfzeLpIPlCMpF5FJoygGQn9uAh5us3EbNQxHmn1C+IyBN+rqC3FNR/3DdtWmU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660137949; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=UCkJ7yySUg6YGvhIA6XI6MAo1fIwAUPY4sF/1p3bo6k=; b=Ii++EpE5oAScElG5GlOgF1obQ2q160iEe9SnGgP+0CYFvoByMqwf9ZS7E6LXNq11f4LI1Aym1+dtu7B0GTg/rhXQZfPyhxQeCc/mUFRy2Vuzx4PLACDorL5JlMu1K6O0XZA/BpaGdZld8EVKqnW+bnJR6wJf+qWDdHDHvWSwyOQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1660137949730926.628143023451; Wed, 10 Aug 2022 06:25:49 -0700 (PDT) Received: from localhost ([::1]:58722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oLliV-000586-I9 for importer@patchew.org; Wed, 10 Aug 2022 09:25:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41820) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLj7t-0007mt-4K for qemu-devel@nongnu.org; Wed, 10 Aug 2022 06:39:50 -0400 Received: from smtp-out1.suse.de ([195.135.220.28]:58420) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oLj7q-0006T9-GY for qemu-devel@nongnu.org; Wed, 10 Aug 2022 06:39:48 -0400 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 34B09371AB; Wed, 10 Aug 2022 10:39:44 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id EE3FF13A7E; Wed, 10 Aug 2022 10:39:43 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 1/3VNu+K82K2QAAAMHmgww (envelope-from ); Wed, 10 Aug 2022 10:39:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1660127984; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=UCkJ7yySUg6YGvhIA6XI6MAo1fIwAUPY4sF/1p3bo6k=; b=JzNB0UoK09sOFS7nO62gEThSbN1CqzUOhn1hx2OHhbK4vvXDyNiGwdZZ+y0yNVpWHGPKkQ hD/57LIVVNgOB/XwwZRUJhDl6CQEhP/6P4EjgAKxPctGplCRvUryo4FiqEZYSPTIdvP4kl BpcsqeGEXJQ20Fc9eoakP++bEWDKdpo= From: Nikolay Borisov To: qemu-devel@nongnu.org Cc: Nikolay Borisov Subject: [PATCH] migration/multifd: Remove redundant copy of page offsets during send Date: Wed, 10 Aug 2022 13:39:42 +0300 Message-Id: <20220810103942.580784-1-nborisov@suse.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 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=195.135.220.28; envelope-from=nborisov@suse.com; helo=smtp-out1.suse.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Wed, 10 Aug 2022 09:09:25 -0400 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1660137952024100001 Content-Type: text/plain; charset="utf-8" All pages which are going to be migrated are first added to MultiFDSendParams::MultiFDPages_t::offset array by the main migration thread and are subsequently copied to MultiFDSendParams::normal by the multifd thread. This is really unnecessary as the MultiFDPages_t is guaranteed to be stable since its mutex is being held. Additionally, this somewhat simplifies the code as the migration pages are now kept in only 1 place during send, also the name 'offset' coupled with the context it's being used - usually added to the host pages makes it obvious that this is an offset. With this change normal/normal_num are no longer used in the multifd send path. Signed-off-by: Nikolay Borisov --- migration/multifd-zlib.c | 6 +++--- migration/multifd-zstd.c | 6 +++--- migration/multifd.c | 25 ++++++++++--------------- 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/migration/multifd-zlib.c b/migration/multifd-zlib.c index 18213a951302..363b64e95922 100644 --- a/migration/multifd-zlib.c +++ b/migration/multifd-zlib.c @@ -122,11 +122,11 @@ static int zlib_send_prepare(MultiFDSendParams *p, Er= ror **errp) int ret; uint32_t i; - for (i =3D 0; i < p->normal_num; 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; - if (i =3D=3D p->normal_num - 1) { + if (i =3D=3D p->pages->num - 1) { flush =3D Z_SYNC_FLUSH; } @@ -135,7 +135,7 @@ static int zlib_send_prepare(MultiFDSendParams *p, Erro= r **errp) * with compression. zlib does not guarantee that this is safe, * therefore copy the page before calling deflate(). */ - memcpy(z->buf, p->pages->block->host + p->normal[i], page_size); + memcpy(z->buf, p->pages->block->host + p->pages->offset[i], page_s= ize); zs->avail_in =3D page_size; zs->next_in =3D z->buf; diff --git a/migration/multifd-zstd.c b/migration/multifd-zstd.c index d788d309f22e..4daec8366727 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; - for (i =3D 0; i < p->normal_num; i++) { + for (i =3D 0; i < p->pages->num; i++) { ZSTD_EndDirective flush =3D ZSTD_e_continue; - if (i =3D=3D p->normal_num - 1) { + if (i =3D=3D p->pages->num - 1) { flush =3D ZSTD_e_flush; } - z->in.src =3D p->pages->block->host + p->normal[i]; + z->in.src =3D p->pages->block->host + p->pages->offset[i]; z->in.size =3D page_size; z->in.pos =3D 0; diff --git a/migration/multifd.c b/migration/multifd.c index 586ddc9d657a..d70662406490 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(); - for (int i =3D 0; i < p->normal_num; i++) { - p->iov[p->iovs_num].iov_base =3D pages->block->host + p->normal[i]; + for (int i =3D 0; i < 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->normal_num * page_size; + p->next_packet_size =3D pages->num * page_size; p->flags |=3D MULTIFD_FLAG_NOCOMP; return 0; } @@ -262,7 +262,7 @@ static void multifd_send_fill_packet(MultiFDSendParams = *p) packet->flags =3D cpu_to_be32(p->flags); packet->pages_alloc =3D cpu_to_be32(p->pages->allocated); - packet->normal_pages =3D cpu_to_be32(p->normal_num); + packet->normal_pages =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); @@ -270,9 +270,9 @@ static void multifd_send_fill_packet(MultiFDSendParams = *p) strncpy(packet->ramblock, p->pages->block->idstr, 256); } - for (i =3D 0; i < p->normal_num; 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->normal[i]; + uint64_t temp =3D p->pages->offset[i]; packet->offset[i] =3D cpu_to_be64(temp); } @@ -668,7 +668,7 @@ static void *multifd_send_thread(void *opaque) if (p->pending_job) { uint64_t packet_num =3D p->packet_num; uint32_t flags =3D p->flags; - p->normal_num =3D 0; + uint32_t num_pages =3D p->pages->num; if (use_zero_copy_send) { p->iovs_num =3D 0; @@ -676,12 +676,7 @@ static void *multifd_send_thread(void *opaque) p->iovs_num =3D 1; } - 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) { + if (num_pages) { ret =3D multifd_send_state->ops->send_prepare(p, &local_er= r); if (ret !=3D 0) { qemu_mutex_unlock(&p->mutex); @@ -691,12 +686,12 @@ static void *multifd_send_thread(void *opaque) multifd_send_fill_packet(p); p->flags =3D 0; p->num_packets++; - p->total_normal_pages +=3D p->normal_num; + p->total_normal_pages +=3D num_pages; p->pages->num =3D 0; p->pages->block =3D NULL; qemu_mutex_unlock(&p->mutex); - trace_multifd_send(p->id, packet_num, p->normal_num, flags, + trace_multifd_send(p->id, packet_num, num_pages, flags, p->next_packet_size); if (use_zero_copy_send) { -- 2.25.1